Commit b2b7cc6d authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/acpi' into for-next/core 

* for-next/acpi:
  arm64: acpi: Honour firmware_signature field of FACS, if it exists
  ACPICA: Detect FACS even for hardware reduced platforms
parents fec50db7 fbaad243

arch/arm64/kernel/acpi.c

+10 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/libfdt.h>

#include <linux/smp.h>

#include <linux/serial_core.h>

#include <linux/suspend.h>

#include <linux/pgtable.h>



#include <acpi/ghes.h>
@@ -227,6 +228,15 @@ void __init acpi_boot_table_init(void) 
		if (earlycon_acpi_spcr_enable)

			early_init_dt_scan_chosen_stdout();

	} else {

#ifdef CONFIG_HIBERNATION

		struct acpi_table_header *facs = NULL;

		acpi_get_table(ACPI_SIG_FACS, 1, &facs);

		if (facs) {

			swsusp_hardware_signature =

				((struct acpi_table_facs *)facs)->hardware_signature;

			acpi_put_table(facs);

		}

#endif

		acpi_parse_spcr(earlycon_acpi_spcr_enable, true);

		if (IS_ENABLED(CONFIG_ACPI_BGRT))

			acpi_table_parse(ACPI_SIG_BGRT, acpi_parse_bgrt);

drivers/acpi/acpica/tbfadt.c

+13 −17
Original line number Diff line number Diff line
@@ -315,9 +315,6 @@ void acpi_tb_parse_fadt(void) 
				       ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL,

				       NULL, FALSE, TRUE, &acpi_gbl_dsdt_index);



	/* If Hardware Reduced flag is set, there is no FACS */



	if (!acpi_gbl_reduced_hardware) {

	if (acpi_gbl_FADT.facs) {

		acpi_tb_install_standard_table((acpi_physical_address)

					       acpi_gbl_FADT.facs,
@@ -333,7 +330,6 @@ void acpi_tb_parse_fadt(void) 
					       &acpi_gbl_xfacs_index);

	}

}

}



/*******************************************************************************

 *

drivers/acpi/acpica/tbutils.c

+1 −6
Original line number Diff line number Diff line
@@ -36,12 +36,7 @@ acpi_status acpi_tb_initialize_facs(void) 
{

	struct acpi_table_facs *facs;



	/* If Hardware Reduced flag is set, there is no FACS */



	if (acpi_gbl_reduced_hardware) {

		acpi_gbl_FACS = NULL;

		return (AE_OK);

	} else if (acpi_gbl_FADT.Xfacs &&

	if (acpi_gbl_FADT.Xfacs &&

		   (!acpi_gbl_FADT.facs

		    || !acpi_gbl_use32_bit_facs_addresses)) {

		(void)acpi_get_table_by_index(acpi_gbl_xfacs_index,