diff options
| author |   Perry Yuan <Perry.Yuan@amd.com> | 2022-08-15 00:35:48 +0800 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-25 13:55:17 +0200 |
| commit | a2a9d1850060e5d995136561d76e81d61414f076 (patch) | |
| tree | 673e97afcb75551e6285adda9855c39cd078b81b /drivers/acpi/cppc_acpi.c | |
| parent | Linux 6.0-rc2 (diff) | |
| download | linux-dev-a2a9d1850060e5d995136561d76e81d61414f076.tar.xz linux-dev-a2a9d1850060e5d995136561d76e81d61414f076.zip | |
ACPI: CPPC: Add ACPI disabled check to acpi_cpc_valid()
Make acpi_cpc_valid() check if ACPI is disabled, so that its callers
don't need to check that separately. This will also cause the AMD
pstate driver to refuse to load right away when ACPI is disabled.
Also update the warning message in amd_pstate_init() to mention the
ACPI disabled case for completeness.
Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
[ rjw: Subject edits, new changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/cppc_acpi.c')
| -rw-r--r-- | drivers/acpi/cppc_acpi.c | 3 |
1 files changed, 3 insertions, 0 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) |