Skip to content

Commit d7d4332

Browse files
sudeep-hollarafaeljw
authored andcommitted
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: Jose Marinho <[email protected]> Signed-off-by: Sudeep Holla <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent 1d280ce commit d7d4332

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

drivers/acpi/bus.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,8 +300,6 @@ EXPORT_SYMBOL_GPL(osc_sb_native_usb4_support_confirmed);
300300

301301
bool osc_sb_cppc2_support_acked;
302302

303-
bool osc_sb_ffh_opregion_support_confirmed;
304-
305303
static u8 sb_uuid_str[] = "0811B06E-4A27-44F9-8D60-3CBBC22E7B48";
306304
static void acpi_bus_osc_negotiate_platform_control(void)
307305
{
@@ -325,6 +323,8 @@ static void acpi_bus_osc_negotiate_platform_control(void)
325323
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PCLPI_SUPPORT;
326324
if (IS_ENABLED(CONFIG_ACPI_PRMT))
327325
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_PRM_SUPPORT;
326+
if (IS_ENABLED(CONFIG_ACPI_FFH))
327+
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_FFH_OPR_SUPPORT;
328328

329329
#ifdef CONFIG_ARM64
330330
capbuf[OSC_SUPPORT_DWORD] |= OSC_SB_GENERIC_INITIATOR_SUPPORT;
@@ -385,8 +385,6 @@ static void acpi_bus_osc_negotiate_platform_control(void)
385385
capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_NATIVE_USB4_SUPPORT;
386386
osc_cpc_flexible_adr_space_confirmed =
387387
capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_CPC_FLEXIBLE_ADR_SPACE;
388-
osc_sb_ffh_opregion_support_confirmed =
389-
capbuf_ret[OSC_SUPPORT_DWORD] & OSC_SB_FFH_OPR_SUPPORT;
390388
}
391389

392390
kfree(context.ret.pointer);
@@ -1412,8 +1410,7 @@ static int __init acpi_init(void)
14121410
disable_acpi();
14131411
return result;
14141412
}
1415-
if (osc_sb_ffh_opregion_support_confirmed)
1416-
acpi_init_ffh();
1413+
acpi_init_ffh();
14171414

14181415
pci_mmcfg_late_init();
14191416
acpi_iort_init();

0 commit comments

Comments
 (0)