Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6556306 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: FADT: Favor 32-bit FACS and DSDT addresses 



If both the 32-bit and 64-bit addresses are non-null, use the
32-bit address. Provides Windows compatibility.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 31fbc073

drivers/acpi/acpica/tbfadt.c

+6 −2
Original line number Diff line number Diff line
@@ -483,18 +483,22 @@ static void acpi_tb_validate_fadt(void) 
	    (acpi_gbl_FADT.Xfacs != (u64) acpi_gbl_FADT.facs)) {

		ACPI_WARNING((AE_INFO,

			      "32/64X FACS address mismatch in FADT - "

			      "two FACS tables! %8.8X/%8.8X%8.8X",

			      "%8.8X/%8.8X%8.8X, using 32",

			      acpi_gbl_FADT.facs,

			      ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xfacs)));



		acpi_gbl_FADT.Xfacs = (u64) acpi_gbl_FADT.facs;

	}



	if (acpi_gbl_FADT.dsdt &&

	    (acpi_gbl_FADT.Xdsdt != (u64) acpi_gbl_FADT.dsdt)) {

		ACPI_WARNING((AE_INFO,

			      "32/64X DSDT address mismatch in FADT - "

			      "two DSDT tables! %8.8X/%8.8X%8.8X",

			      "%8.8X/%8.8X%8.8X, using 32",

			      acpi_gbl_FADT.dsdt,

			      ACPI_FORMAT_UINT64(acpi_gbl_FADT.Xdsdt)));



		acpi_gbl_FADT.Xdsdt = (u64) acpi_gbl_FADT.dsdt;

	}



	/* Examine all of the 64-bit extended address fields (X fields) */