diff options
| author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2016-09-01 13:37:08 -0700 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-09-08 23:02:14 +0200 |
| commit | 65e958910a0342c2d802dea05eaf0de16c1b872a (patch) | |
| tree | 6c1f7592d530415f6186e9f5a5e6b397bc2e9609 | |
| parent | 139aee73f0c23b95a7e919b8f7e51ccf2d221181 (diff) | |
| download | linux-stable-65e958910a0342c2d802dea05eaf0de16c1b872a.tar.gz linux-stable-65e958910a0342c2d802dea05eaf0de16c1b872a.tar.bz2 linux-stable-65e958910a0342c2d802dea05eaf0de16c1b872a.zip | |
ACPI / CPPC: Allow build with ACPI_CPU_FREQ_PSS config
Some newer x86 platforms have support for both _CPC and _PSS object. So
kernel config can have both ACPI_CPU_FREQ_PSS and ACPI_CPPC_LIB. So remove
restriction for ACPI_CPPC_LIB to build only when ACPI_CPU_FREQ_PSS is not
defined.
Also for legacy systems with only _PSS, we shouldn't bail out if
acpi_cppc_processor_probe() fails, if ACPI_CPU_FREQ_PSS is also defined.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/acpi/processor_driver.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 445ce28475b3..c6bb6aa5ac4b 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -227,7 +227,6 @@ config ACPI_MCFG config ACPI_CPPC_LIB bool depends on ACPI_PROCESSOR - depends on !ACPI_CPU_FREQ_PSS select MAILBOX select PCC help diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index 0553aeebb228..f5c92be72987 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c @@ -245,7 +245,7 @@ static int __acpi_processor_start(struct acpi_device *device) return 0; result = acpi_cppc_processor_probe(pr); - if (result) + if (result && !IS_ENABLED(CONFIG_ACPI_CPU_FREQ_PSS)) return -ENODEV; if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver) |