Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/42033 )
Change subject: ACPI: Move redundant FADT reserved entry ......................................................................
ACPI: Move redundant FADT reserved entry
Change-Id: I35f66cdad6b8bedf4337aa8e5af7b0f1b53fe674 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/acpi/acpi.c M src/southbridge/intel/bd82x6x/lpc.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/i82801jx/lpc.c M src/southbridge/intel/ibexpeak/lpc.c 5 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/33/42033/1
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index 81a36fe..47f03c8 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -1240,13 +1240,16 @@ header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (unsigned long) facs; - fadt->dsdt = (unsigned long) dsdt; - fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; + + fadt->dsdt = (unsigned long) dsdt; fadt->x_dsdt_l = (unsigned long)dsdt; fadt->x_dsdt_h = 0;
+ /* should be 0 ACPI 3.0 */ + fadt->reserved = 0; + if (CONFIG(SYSTEM_TYPE_CONVERTIBLE) || CONFIG(SYSTEM_TYPE_LAPTOP)) fadt->preferred_pm_profile = PM_MOBILE; diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 170f4b4..11211c2 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -685,7 +685,6 @@ u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency;
- fadt->reserved = 0;
fadt->sci_int = 0x9;
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 4231cc7..23c391c 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -505,7 +505,6 @@ fadt->mon_alrm = 0x00; fadt->century = 0x32;
- fadt->reserved = 0; fadt->sci_int = 0x9;
if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index 7fd0954..c704015 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -516,7 +516,6 @@ fadt->mon_alrm = 0x00; fadt->century = 0x32;
- fadt->reserved = 0; fadt->sci_int = 0x9;
if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index bdfd8e0..51db1f2 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -579,7 +579,6 @@ u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency;
- fadt->reserved = 0;
fadt->sci_int = 0x9;
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42033 )
Change subject: ACPI: Move redundant FADT reserved entry ......................................................................
Patch Set 2: Code-Review+2
Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/42033 )
Change subject: ACPI: Move redundant FADT reserved entry ......................................................................
ACPI: Move redundant FADT reserved entry
Change-Id: I35f66cdad6b8bedf4337aa8e5af7b0f1b53fe674 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/42033 Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/acpi/acpi.c M src/southbridge/intel/bd82x6x/lpc.c M src/southbridge/intel/i82801gx/lpc.c M src/southbridge/intel/i82801jx/lpc.c M src/southbridge/intel/ibexpeak/lpc.c 5 files changed, 5 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified HAOUAS Elyes: Looks good to me, approved
diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c index fefa7bf..a69cdb6 100644 --- a/src/acpi/acpi.c +++ b/src/acpi/acpi.c @@ -1242,13 +1242,16 @@ header->asl_compiler_revision = asl_revision;
fadt->firmware_ctrl = (unsigned long) facs; - fadt->dsdt = (unsigned long) dsdt; - fadt->x_firmware_ctl_l = (unsigned long)facs; fadt->x_firmware_ctl_h = 0; + + fadt->dsdt = (unsigned long) dsdt; fadt->x_dsdt_l = (unsigned long)dsdt; fadt->x_dsdt_h = 0;
+ /* should be 0 ACPI 3.0 */ + fadt->reserved = 0; + if (CONFIG(SYSTEM_TYPE_CONVERTIBLE) || CONFIG(SYSTEM_TYPE_LAPTOP)) fadt->preferred_pm_profile = PM_MOBILE; diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c index 691db62..bdaca57 100644 --- a/src/southbridge/intel/bd82x6x/lpc.c +++ b/src/southbridge/intel/bd82x6x/lpc.c @@ -694,7 +694,6 @@ u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency;
- fadt->reserved = 0;
fadt->sci_int = 0x9;
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 0bfe8eb..58f93bd 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -519,7 +519,6 @@ fadt->mon_alrm = 0x00; fadt->century = 0x32;
- fadt->reserved = 0; fadt->sci_int = 0x9;
if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c index f2c9afa..3be492d 100644 --- a/src/southbridge/intel/i82801jx/lpc.c +++ b/src/southbridge/intel/i82801jx/lpc.c @@ -530,7 +530,6 @@ fadt->mon_alrm = 0x00; fadt->century = 0x32;
- fadt->reserved = 0; fadt->sci_int = 0x9;
if (permanent_smi_handler()) { diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index f8926dc..e741fcf 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -588,7 +588,6 @@ u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe; int c2_latency;
- fadt->reserved = 0;
fadt->sci_int = 0x9;
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/42033 )
Change subject: ACPI: Move redundant FADT reserved entry ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/c/coreboot/+/42033/3/src/acpi/acpi.c File src/acpi/acpi.c:
https://review.coreboot.org/c/coreboot/+/42033/3/src/acpi/acpi.c@1246 PS3, Line 1246: fadt->x_firmware_ctl_h = 0; Stumbled across a comment:
fadt->x_firmware_ctl_l = 0; /* Set X_FIRMWARE_CTRL only if FACS is */ fadt->x_firmware_ctl_h = 0; /* above 4GB. If X_FIRMWARE_CTRL is set, */ /* then FIRMWARE_CTRL must be zero. */
Elyes, care to review the specs?
-
Felix Held (Code Review) -
HAOUAS Elyes (Code Review)
-
Kyösti Mälkki (Code Review)