Commit 72f2ecb7 authored by Pierre Gondois's avatar Pierre Gondois Committed by Rafael J. Wysocki
Browse files

ACPI: bus: Set CPPC _OSC bits for all and when CPPC_LIB is supported 



The _OSC method allows the OS and firmware to communicate about
supported features/capabitlities. It also allows the OS to take
control of some features.

In ACPI 6.4, s6.2.11.2 Platform-Wide OSPM Capabilities, the CPPC
(resp. v2) bit should be set by the OS if it 'supports controlling
processor performance via the interfaces described in the _CPC
object'.

The OS supports CPPC and parses the _CPC object only if
CONFIG_ACPI_CPPC_LIB is set. Replace the x86 specific
boot_cpu_has(X86_FEATURE_HWP) dynamic check with an arch
generic CONFIG_ACPI_CPPC_LIB build-time check.

Note:
CONFIG_X86_INTEL_PSTATE selects CONFIG_ACPI_CPPC_LIB.

Signed-off-by: default avatarPierre Gondois <pierre.gondois@arm.com>
Reviewed-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0651ab90

drivers/acpi/bus.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -329,10 +329,11 @@ static void acpi_bus_osc_negotiate_platform_control(void) 
#endif

#endif

#ifdef CONFIG_X86

#ifdef CONFIG_X86

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT;

	if (boot_cpu_has(X86_FEATURE_HWP)) {

#endif



#ifdef CONFIG_ACPI_CPPC_LIB

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPCV2_SUPPORT;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPCV2_SUPPORT;

	}

#endif

#endif





	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_FLEXIBLE_ADR_SPACE;

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_CPC_FLEXIBLE_ADR_SPACE;
@@ -357,8 +358,7 @@ static void acpi_bus_osc_negotiate_platform_control(void) 
		return;

		return;

	}

	}





#ifdef CONFIG_X86

#ifdef CONFIG_ACPI_CPPC_LIB

	if (boot_cpu_has(X86_FEATURE_HWP))

	osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD] &

	osc_sb_cppc_not_supported = !(capbuf_ret[OSC_SUPPORT_DWORD] &

			(OSC_SB_CPC_SUPPORT | OSC_SB_CPCV2_SUPPORT));

			(OSC_SB_CPC_SUPPORT | OSC_SB_CPCV2_SUPPORT));

#endif

#endif