| Message ID | 20220814163548.326686-8-Perry.Yuan@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | AMD Pstate Enhancement And Issue Fixs | expand |
On Sun, Aug 14, 2022 at 6:53 PM Perry Yuan <Perry.Yuan@amd.com> wrote: > > Add acpi function check in case ACPI is not enabled, that will cause > pstate driver failed to call cppc acpi to change perf or update epp > value for shared memory solution processors. > > When CPPC or ACPI is invalid, warning log will be needed to tell > user that AMD pstate driver failed to load and what is wrong. > > Signed-off-by: Perry Yuan <Perry.Yuan@amd.com> > --- > drivers/acpi/cppc_acpi.c | 3 +++ > drivers/base/arch_topology.c | 2 +- > drivers/cpufreq/amd-pstate.c | 2 +- > drivers/cpufreq/cppc_cpufreq.c | 2 +- > 4 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c > index 1e15a9f25ae9..c2309429146f 100644 > --- a/drivers/acpi/cppc_acpi.c > +++ b/drivers/acpi/cppc_acpi.c > @@ -424,6 +424,9 @@ bool acpi_cpc_valid(void) > struct cpc_desc *cpc_ptr; > int cpu; > > + if (acpi_disabled) > + return false; > + > for_each_present_cpu(cpu) { > cpc_ptr = per_cpu(cpc_desc_ptr, cpu); > if (!cpc_ptr) > diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c > index 579c851a2bd7..73a8cb31529d 100644 > --- a/drivers/base/arch_topology.c > +++ b/drivers/base/arch_topology.c > @@ -352,7 +352,7 @@ void topology_init_cpu_capacity_cppc(void) > struct cppc_perf_caps perf_caps; > int cpu; > > - if (likely(acpi_disabled || !acpi_cpc_valid())) > + if (likely(!acpi_cpc_valid())) > return; > > raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity), > diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c > index 9cb051d61422..96e4ecddf3f6 100644 > --- a/drivers/cpufreq/amd-pstate.c > +++ b/drivers/cpufreq/amd-pstate.c > @@ -661,7 +661,7 @@ static int __init amd_pstate_init(void) > return -ENODEV; > > if (!acpi_cpc_valid()) { > - pr_debug("the _CPC object is not present in SBIOS\n"); > + pr_warn_once("the _CPC object is not present in SBIOS or ACPI disabled\n"); > return -ENODEV; > } > > diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c > index 24eaf0ec344d..9adb7612993e 100644 > --- a/drivers/cpufreq/cppc_cpufreq.c > +++ b/drivers/cpufreq/cppc_cpufreq.c > @@ -947,7 +947,7 @@ static int __init cppc_cpufreq_init(void) > { > int ret; > > - if ((acpi_disabled) || !acpi_cpc_valid()) > + if (!acpi_cpc_valid()) > return -ENODEV; > > cppc_check_hisi_workaround(); > -- Applied as 6.1 material with modified subject and changelog, thanks!
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 1e15a9f25ae9..c2309429146f 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -424,6 +424,9 @@ bool acpi_cpc_valid(void) struct cpc_desc *cpc_ptr; int cpu; + if (acpi_disabled) + return false; + for_each_present_cpu(cpu) { cpc_ptr = per_cpu(cpc_desc_ptr, cpu); if (!cpc_ptr) diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index 579c851a2bd7..73a8cb31529d 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -352,7 +352,7 @@ void topology_init_cpu_capacity_cppc(void) struct cppc_perf_caps perf_caps; int cpu; - if (likely(acpi_disabled || !acpi_cpc_valid())) + if (likely(!acpi_cpc_valid())) return; raw_capacity = kcalloc(num_possible_cpus(), sizeof(*raw_capacity), diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c index 9cb051d61422..96e4ecddf3f6 100644 --- a/drivers/cpufreq/amd-pstate.c +++ b/drivers/cpufreq/amd-pstate.c @@ -661,7 +661,7 @@ static int __init amd_pstate_init(void) return -ENODEV; if (!acpi_cpc_valid()) { - pr_debug("the _CPC object is not present in SBIOS\n"); + pr_warn_once("the _CPC object is not present in SBIOS or ACPI disabled\n"); return -ENODEV; } diff --git a/drivers/cpufreq/cppc_cpufreq.c b/drivers/cpufreq/cppc_cpufreq.c index 24eaf0ec344d..9adb7612993e 100644 --- a/drivers/cpufreq/cppc_cpufreq.c +++ b/drivers/cpufreq/cppc_cpufreq.c @@ -947,7 +947,7 @@ static int __init cppc_cpufreq_init(void) { int ret; - if ((acpi_disabled) || !acpi_cpc_valid()) + if (!acpi_cpc_valid()) return -ENODEV; cppc_check_hisi_workaround();
Add acpi function check in case ACPI is not enabled, that will cause pstate driver failed to call cppc acpi to change perf or update epp value for shared memory solution processors. When CPPC or ACPI is invalid, warning log will be needed to tell user that AMD pstate driver failed to load and what is wrong. Signed-off-by: Perry Yuan <Perry.Yuan@amd.com> --- drivers/acpi/cppc_acpi.c | 3 +++ drivers/base/arch_topology.c | 2 +- drivers/cpufreq/amd-pstate.c | 2 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-)