Commit d7d43321 authored by Sudeep Holla's avatar Sudeep Holla Committed by Rafael J. Wysocki
Browse files

ACPI: bus: Fix the _OSC capability check for FFH OpRegion 



As per the ACPI specification(vide section Platform-Wide OSPM Capabilities)
the OSPM must set this bit to indicate support for the usage of Functional
Fixed Hardware (FFixedHW) Operation Regions rather than the firmware as
expected in the code.

Update the check accordingly to reflect the requirement as stated in the
specification.

Reported-by: default avatarJose Marinho <jose.marinho@arm.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 1d280ce0

drivers/acpi/bus.c

+3 −6
Original line number Diff line number Diff line
@@ -300,8 +300,6 @@ EXPORT_SYMBOL_GPL(osc_sb_native_usb4_support_confirmed); 


bool osc_sb_cppc2_support_acked;



bool osc_sb_ffh_opregion_support_confirmed;



static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";

static void acpi_bus_osc_negotiate_platform_control(void)

{
@@ -325,6 +323,8 @@ static void acpi_bus_osc_negotiate_platform_control(void) 
	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;

	if (IS_ENABLED(CONFIG_ACPI_PRMT))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;

	if (IS_ENABLED(CONFIG_ACPI_FFH))

		capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_FFH_OPR_SUPPORT;



#ifdef CONFIG_ARM64

	capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT;
@@ -385,8 +385,6 @@ static void acpi_bus_osc_negotiate_platform_control(void) 
			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;

		osc_cpc_flexible_adr_space_confirmed =

			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_CPC_FLEXIBLE_ADR_SPACE;

		osc_sb_ffh_opregion_support_confirmed =

			capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_FFH_OPR_SUPPORT;

	}



	kfree(context.ret.pointer);
@@ -1412,7 +1410,6 @@ static int __init acpi_init(void) 
		disable_acpi();

		return result;

	}

	if (osc_sb_ffh_opregion_support_confirmed)

	acpi_init_ffh();



	pci_mmcfg_late_init();