Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e95891 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Rafael J. Wysocki
Browse files

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: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 139aee73

drivers/acpi/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/processor_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -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)