On Fri, 22 Sep 2023, David E. Box wrote:
> From: Xi Pardee <xi.pardee@xxxxxxxxx>
>
> Some platforms will have a need to retrieve the low power modes as part of
> their driver initialization. As such, make the function global and call it
> from the platform specific init code.
What is the real justification for this change, I don't think it's clearly
stated above?
--
i.
> Signed-off-by: Xi Pardee <xi.pardee@xxxxxxxxx>
> Signed-off-by: David E. Box <david.e.box@xxxxxxxxxxxxxxx>
> ---
> drivers/platform/x86/intel/pmc/adl.c | 2 ++
> drivers/platform/x86/intel/pmc/cnp.c | 2 ++
> drivers/platform/x86/intel/pmc/core.c | 7 +++----
> drivers/platform/x86/intel/pmc/core.h | 1 +
> drivers/platform/x86/intel/pmc/icl.c | 10 +++++++++-
> drivers/platform/x86/intel/pmc/mtl.c | 4 +++-
> drivers/platform/x86/intel/pmc/spt.c | 10 +++++++++-
> drivers/platform/x86/intel/pmc/tgl.c | 1 +
> 8 files changed, 30 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/pmc/adl.c b/drivers/platform/x86/intel/pmc/adl.c
> index 5006008e01be..64c492391ede 100644
> --- a/drivers/platform/x86/intel/pmc/adl.c
> +++ b/drivers/platform/x86/intel/pmc/adl.c
> @@ -319,6 +319,8 @@ int adl_core_init(struct pmc_dev *pmcdev)
> if (ret)
> return ret;
>
> + pmc_core_get_low_power_modes(pmcdev);
> +
> /* Due to a hardware limitation, the GBE LTR blocks PC10
> * when a cable is attached. Tell the PMC to ignore it.
> */
> diff --git a/drivers/platform/x86/intel/pmc/cnp.c b/drivers/platform/x86/intel/pmc/cnp.c
> index 420aaa1d7c76..59298f184d0e 100644
> --- a/drivers/platform/x86/intel/pmc/cnp.c
> +++ b/drivers/platform/x86/intel/pmc/cnp.c
> @@ -214,6 +214,8 @@ int cnp_core_init(struct pmc_dev *pmcdev)
> if (ret)
> return ret;
>
> + pmc_core_get_low_power_modes(pmcdev);
> +
> /* Due to a hardware limitation, the GBE LTR blocks PC10
> * when a cable is attached. Tell the PMC to ignore it.
> */
> diff --git a/drivers/platform/x86/intel/pmc/core.c b/drivers/platform/x86/intel/pmc/core.c
> index 5a36b3f77bc5..e58c8cc286a3 100644
> --- a/drivers/platform/x86/intel/pmc/core.c
> +++ b/drivers/platform/x86/intel/pmc/core.c
> @@ -966,9 +966,8 @@ static bool pmc_core_pri_verify(u32 lpm_pri, u8 *mode_order)
> return true;
> }
>
> -static void pmc_core_get_low_power_modes(struct platform_device *pdev)
> +void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev)
> {
> - struct pmc_dev *pmcdev = platform_get_drvdata(pdev);
> struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
> u8 pri_order[LPM_MAX_NUM_MODES] = LPM_DEFAULT_PRI;
> u8 mode_order[LPM_MAX_NUM_MODES];
> @@ -1000,7 +999,8 @@ static void pmc_core_get_low_power_modes(struct platform_device *pdev)
> for (mode = 0; mode < LPM_MAX_NUM_MODES; mode++)
> pri_order[mode_order[mode]] = mode;
> else
> - dev_warn(&pdev->dev, "Assuming a default substate order for this platform\n");
> + dev_warn(&pmcdev->pdev->dev,
> + "Assuming a default substate order for this platform\n");
>
> /*
> * Loop through all modes from lowest to highest priority,
> @@ -1250,7 +1250,6 @@ static int pmc_core_probe(struct platform_device *pdev)
> }
>
> pmcdev->pmc_xram_read_bit = pmc_core_check_read_lock_bit(primary_pmc);
> - pmc_core_get_low_power_modes(pdev);
> pmc_core_do_dmi_quirks(primary_pmc);
>
> pmc_core_dbgfs_register(pmcdev);
> diff --git a/drivers/platform/x86/intel/pmc/core.h b/drivers/platform/x86/intel/pmc/core.h
> index 0729f593c6a7..ccf24e0f5e50 100644
> --- a/drivers/platform/x86/intel/pmc/core.h
> +++ b/drivers/platform/x86/intel/pmc/core.h
> @@ -490,6 +490,7 @@ extern int pmc_core_send_ltr_ignore(struct pmc_dev *pmcdev, u32 value);
>
> int pmc_core_resume_common(struct pmc_dev *pmcdev);
> int get_primary_reg_base(struct pmc *pmc);
> +extern void pmc_core_get_low_power_modes(struct pmc_dev *pmcdev);
>
> extern void pmc_core_ssram_init(struct pmc_dev *pmcdev);
>
> diff --git a/drivers/platform/x86/intel/pmc/icl.c b/drivers/platform/x86/intel/pmc/icl.c
> index d08e3174230d..71b0fd6cb7d8 100644
> --- a/drivers/platform/x86/intel/pmc/icl.c
> +++ b/drivers/platform/x86/intel/pmc/icl.c
> @@ -53,7 +53,15 @@ const struct pmc_reg_map icl_reg_map = {
> int icl_core_init(struct pmc_dev *pmcdev)
> {
> struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
> + int ret;
>
> pmc->map = &icl_reg_map;
> - return get_primary_reg_base(pmc);
> +
> + ret = get_primary_reg_base(pmc);
> + if (ret)
> + return ret;
> +
> + pmc_core_get_low_power_modes(pmcdev);
> +
> + return ret;
> }
> diff --git a/drivers/platform/x86/intel/pmc/mtl.c b/drivers/platform/x86/intel/pmc/mtl.c
> index 2204bc666980..c3b5f4fe01d1 100644
> --- a/drivers/platform/x86/intel/pmc/mtl.c
> +++ b/drivers/platform/x86/intel/pmc/mtl.c
> @@ -985,7 +985,7 @@ static int mtl_resume(struct pmc_dev *pmcdev)
> int mtl_core_init(struct pmc_dev *pmcdev)
> {
> struct pmc *pmc = pmcdev->pmcs[PMC_IDX_SOC];
> - int ret = 0;
> + int ret;
>
> mtl_d3_fixup();
>
> @@ -1002,6 +1002,8 @@ int mtl_core_init(struct pmc_dev *pmcdev)
> return ret;
> }
>
> + pmc_core_get_low_power_modes(pmcdev);
> +
> /* Due to a hardware limitation, the GBE LTR blocks PC10
> * when a cable is attached. Tell the PMC to ignore it.
> */
> diff --git a/drivers/platform/x86/intel/pmc/spt.c b/drivers/platform/x86/intel/pmc/spt.c
> index 4b6f5cbda16c..ab993a69e33e 100644
> --- a/drivers/platform/x86/intel/pmc/spt.c
> +++ b/drivers/platform/x86/intel/pmc/spt.c
> @@ -137,7 +137,15 @@ const struct pmc_reg_map spt_reg_map = {
> int spt_core_init(struct pmc_dev *pmcdev)
> {
> struct pmc *pmc = pmcdev->pmcs[PMC_IDX_MAIN];
> + int ret;
>
> pmc->map = &spt_reg_map;
> - return get_primary_reg_base(pmc);
> +
> + ret = get_primary_reg_base(pmc);
> + if (ret)
> + return ret;
> +
> + pmc_core_get_low_power_modes(pmcdev);
> +
> + return ret;
> }
> diff --git a/drivers/platform/x86/intel/pmc/tgl.c b/drivers/platform/x86/intel/pmc/tgl.c
> index 2449940102db..d5f1d2223c5a 100644
> --- a/drivers/platform/x86/intel/pmc/tgl.c
> +++ b/drivers/platform/x86/intel/pmc/tgl.c
> @@ -263,6 +263,7 @@ int tgl_core_init(struct pmc_dev *pmcdev)
> if (ret)
> return ret;
>
> + pmc_core_get_low_power_modes(pmcdev);
> pmc_core_get_tgl_lpm_reqs(pmcdev->pdev);
> /* Due to a hardware limitation, the GBE LTR blocks PC10
> * when a cable is attached. Tell the PMC to ignore it.
>
