Skip to content

Commit bc5b492

Browse files
dwmw2willdeacon
authored andcommitted
ACPICA: Detect FACS even for hardware reduced platforms
ACPICA commit 44fc328a1a14b097d92b8be83989e4bf69b6e6cb The FACS is optional even on hardware reduced platforms, and may exist for the purpose of communicating the hardware_signature field to provoke a clean reboot instead of a resume from hibernation. Signed-off-by: David Woodhouse <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Will Deacon <[email protected]>
1 parent fec50db commit bc5b492

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

drivers/acpi/acpica/tbfadt.c

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -315,23 +315,19 @@ void acpi_tb_parse_fadt(void)
315315
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
316316
NULL, FALSE, TRUE, &acpi_gbl_dsdt_index);
317317

318-
/* If Hardware Reduced flag is set, there is no FACS */
319-
320-
if (!acpi_gbl_reduced_hardware) {
321-
if (acpi_gbl_FADT.facs) {
322-
acpi_tb_install_standard_table((acpi_physical_address)
323-
acpi_gbl_FADT.facs,
324-
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
325-
NULL, FALSE, TRUE,
326-
&acpi_gbl_facs_index);
327-
}
328-
if (acpi_gbl_FADT.Xfacs) {
329-
acpi_tb_install_standard_table((acpi_physical_address)
330-
acpi_gbl_FADT.Xfacs,
331-
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
332-
NULL, FALSE, TRUE,
333-
&acpi_gbl_xfacs_index);
334-
}
318+
if (acpi_gbl_FADT.facs) {
319+
acpi_tb_install_standard_table((acpi_physical_address)
320+
acpi_gbl_FADT.facs,
321+
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
322+
NULL, FALSE, TRUE,
323+
&acpi_gbl_facs_index);
324+
}
325+
if (acpi_gbl_FADT.Xfacs) {
326+
acpi_tb_install_standard_table((acpi_physical_address)
327+
acpi_gbl_FADT.Xfacs,
328+
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,
329+
NULL, FALSE, TRUE,
330+
&acpi_gbl_xfacs_index);
335331
}
336332
}
337333

drivers/acpi/acpica/tbutils.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,7 @@ acpi_status acpi_tb_initialize_facs(void)
3636
{
3737
struct acpi_table_facs *facs;
3838

39-
/* If Hardware Reduced flag is set, there is no FACS */
40-
41-
if (acpi_gbl_reduced_hardware) {
42-
acpi_gbl_FACS = NULL;
43-
return (AE_OK);
44-
} else if (acpi_gbl_FADT.Xfacs &&
39+
if (acpi_gbl_FADT.Xfacs &&
4540
(!acpi_gbl_FADT.facs
4641
|| !acpi_gbl_use32_bit_facs_addresses)) {
4742
(void)acpi_get_table_by_index(acpi_gbl_xfacs_index,

0 commit comments

Comments
 (0)