HAOUAS Elyes has uploaded this change for review.
ACPI: Rename FADT model and set it to zero
INT_MODEL defined in ACPI 1.0 and renamed to reserved in upper
versions.
The value for this field is zero but 1 is allowed to maintain
compatibility with ACPI 1.0.
So set this value to zero as we are using ACPI upper than 1.0
Change-Id: I910ead4e5618c958a7989f4c309a3a4bb938e31a
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
---
M src/arch/x86/include/arch/acpi.h
M src/mainboard/aopen/dxplplusu/fadt.c
M src/mainboard/emulation/qemu-q35/acpi_tables.c
M src/mainboard/google/auron/fadt.c
M src/mainboard/google/cyan/fadt.c
M src/mainboard/google/jecht/fadt.c
M src/mainboard/google/rambi/fadt.c
M src/mainboard/intel/harcuvar/fadt.c
M src/mainboard/intel/strago/fadt.c
M src/mainboard/intel/wtm2/fadt.c
M src/mainboard/lenovo/t400/fadt.c
M src/mainboard/lenovo/x200/fadt.c
M src/mainboard/purism/librem_bdw/fadt.c
M src/mainboard/roda/rk9/fadt.c
M src/mainboard/scaleway/tagada/fadt.c
M src/soc/amd/stoneyridge/acpi.c
M src/soc/intel/fsp_baytrail/acpi.c
M src/soc/intel/fsp_broadwell_de/acpi.c
M src/southbridge/amd/agesa/hudson/fadt.c
M src/southbridge/amd/cimx/sb800/fadt.c
M src/southbridge/amd/pi/hudson/fadt.c
M src/southbridge/intel/bd82x6x/lpc.c
M src/southbridge/intel/fsp_rangeley/acpi.c
M src/southbridge/intel/i82801gx/lpc.c
M src/southbridge/intel/i82801jx/lpc.c
M src/southbridge/intel/ibexpeak/lpc.c
26 files changed, 26 insertions(+), 26 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/29986/1
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index cd86e83..b766465 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -489,7 +489,7 @@
struct acpi_table_header header;
u32 firmware_ctrl;
u32 dsdt;
- u8 model; /* Eliminated in ACPI 2.0. Platforms should set
+ u8 reserved; /* Eliminated in ACPI 2.0. Platforms should set
* this field to zero but field values of one
* are also allowed to maintain compatibility
* with ACPI 1.0.
diff --git a/src/mainboard/aopen/dxplplusu/fadt.c b/src/mainboard/aopen/dxplplusu/fadt.c
index b78a3ed..b6c3d9e 100644
--- a/src/mainboard/aopen/dxplplusu/fadt.c
+++ b/src/mainboard/aopen/dxplplusu/fadt.c
@@ -45,7 +45,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = 0; /* PM_MOBILE; */
fadt->sci_int = 0x9;
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 5a36cb1..736b0db 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -57,7 +57,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0x00;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->sci_int = 0x9;
fadt->smi_cmd = 0;
diff --git a/src/mainboard/google/auron/fadt.c b/src/mainboard/google/auron/fadt.c
index 9ee5c95..e614ce4 100644
--- a/src/mainboard/google/auron/fadt.c
+++ b/src/mainboard/google/auron/fadt.c
@@ -32,7 +32,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/google/cyan/fadt.c b/src/mainboard/google/cyan/fadt.c
index 7455d4b..3087dd9 100644
--- a/src/mainboard/google/cyan/fadt.c
+++ b/src/mainboard/google/cyan/fadt.c
@@ -32,7 +32,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/google/jecht/fadt.c b/src/mainboard/google/jecht/fadt.c
index 9ee5c95..e614ce4 100644
--- a/src/mainboard/google/jecht/fadt.c
+++ b/src/mainboard/google/jecht/fadt.c
@@ -32,7 +32,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/google/rambi/fadt.c b/src/mainboard/google/rambi/fadt.c
index d02609b..01b6add 100644
--- a/src/mainboard/google/rambi/fadt.c
+++ b/src/mainboard/google/rambi/fadt.c
@@ -31,7 +31,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/intel/harcuvar/fadt.c b/src/mainboard/intel/harcuvar/fadt.c
index 9f41f64..bc47c59 100644
--- a/src/mainboard/intel/harcuvar/fadt.c
+++ b/src/mainboard/intel/harcuvar/fadt.c
@@ -36,7 +36,7 @@
fadt->firmware_ctrl = (unsigned long)facs;
fadt->dsdt = (unsigned long)dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/intel/strago/fadt.c b/src/mainboard/intel/strago/fadt.c
index e0e7d44..a8ed861 100644
--- a/src/mainboard/intel/strago/fadt.c
+++ b/src/mainboard/intel/strago/fadt.c
@@ -32,7 +32,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/intel/wtm2/fadt.c b/src/mainboard/intel/wtm2/fadt.c
index 6f1553c..b3351d9 100644
--- a/src/mainboard/intel/wtm2/fadt.c
+++ b/src/mainboard/intel/wtm2/fadt.c
@@ -31,7 +31,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/mainboard/lenovo/t400/fadt.c b/src/mainboard/lenovo/t400/fadt.c
index 5596115..3175c7d 100644
--- a/src/mainboard/lenovo/t400/fadt.c
+++ b/src/mainboard/lenovo/t400/fadt.c
@@ -35,7 +35,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0x00;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
diff --git a/src/mainboard/lenovo/x200/fadt.c b/src/mainboard/lenovo/x200/fadt.c
index 5596115..3175c7d 100644
--- a/src/mainboard/lenovo/x200/fadt.c
+++ b/src/mainboard/lenovo/x200/fadt.c
@@ -35,7 +35,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0x00;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
diff --git a/src/mainboard/purism/librem_bdw/fadt.c b/src/mainboard/purism/librem_bdw/fadt.c
index fbce9d7..147937b 100644
--- a/src/mainboard/purism/librem_bdw/fadt.c
+++ b/src/mainboard/purism/librem_bdw/fadt.c
@@ -31,7 +31,7 @@
fadt->firmware_ctrl = (u32)facs;
fadt->dsdt = (u32)dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->x_firmware_ctl_l = (u32)facs;
diff --git a/src/mainboard/roda/rk9/fadt.c b/src/mainboard/roda/rk9/fadt.c
index 5596115..3175c7d 100644
--- a/src/mainboard/roda/rk9/fadt.c
+++ b/src/mainboard/roda/rk9/fadt.c
@@ -35,7 +35,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0x00;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_MOBILE;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
diff --git a/src/mainboard/scaleway/tagada/fadt.c b/src/mainboard/scaleway/tagada/fadt.c
index 9f41f64..bc47c59 100644
--- a/src/mainboard/scaleway/tagada/fadt.c
+++ b/src/mainboard/scaleway/tagada/fadt.c
@@ -36,7 +36,7 @@
fadt->firmware_ctrl = (unsigned long)facs;
fadt->dsdt = (unsigned long)dsdt;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->preferred_pm_profile = PM_ENTERPRISE_SERVER;
fadt->x_firmware_ctl_l = (unsigned long)facs;
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 645aff4..cb4f95d 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -86,7 +86,7 @@
fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = FADT_PM_PROFILE;
fadt->sci_int = 9; /* IRQ 09 - ACPI SCI */
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index 2640a80..2abc7ca 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -198,7 +198,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = config->fadt_pm_profile; /* unknown is default */
/* System Management */
diff --git a/src/soc/intel/fsp_broadwell_de/acpi.c b/src/soc/intel/fsp_broadwell_de/acpi.c
index d5bee64..370279c 100644
--- a/src/soc/intel/fsp_broadwell_de/acpi.c
+++ b/src/soc/intel/fsp_broadwell_de/acpi.c
@@ -176,7 +176,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = 0;
fadt->sci_int = acpi_sci_irq();
diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c
index e8483a0..20af86e 100644
--- a/src/southbridge/amd/agesa/hudson/fadt.c
+++ b/src/southbridge/amd/agesa/hudson/fadt.c
@@ -65,7 +65,7 @@
else
fadt->dsdt = (uintptr_t)dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = FADT_PM_PROFILE;
fadt->sci_int = 9; /* HUDSON - IRQ 09 - ACPI SCI */
diff --git a/src/southbridge/amd/cimx/sb800/fadt.c b/src/southbridge/amd/cimx/sb800/fadt.c
index 15e05c3..5313b7d 100644
--- a/src/southbridge/amd/cimx/sb800/fadt.c
+++ b/src/southbridge/amd/cimx/sb800/fadt.c
@@ -69,7 +69,7 @@
else
fadt->dsdt = (uintptr_t)dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = FADT_PM_PROFILE;
fadt->sci_int = 9; /* HUDSON 1 - IRQ 09 - ACPI SCI */
fadt->smi_cmd = 0; /* disable system management mode */
diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c
index c2d5d19..0a6bc77 100644
--- a/src/southbridge/amd/pi/hudson/fadt.c
+++ b/src/southbridge/amd/pi/hudson/fadt.c
@@ -57,7 +57,7 @@
fadt->firmware_ctrl = (u32) facs;
fadt->dsdt = (u32) dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = FADT_PM_PROFILE;
fadt->sci_int = 9; /* HUDSON - IRQ 09 - ACPI SCI */
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 7ae538e..efbe688 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -743,7 +743,7 @@
u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe;
int c2_latency;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
diff --git a/src/southbridge/intel/fsp_rangeley/acpi.c b/src/southbridge/intel/fsp_rangeley/acpi.c
index efe5412..be5595d 100644
--- a/src/southbridge/intel/fsp_rangeley/acpi.c
+++ b/src/southbridge/intel/fsp_rangeley/acpi.c
@@ -58,7 +58,7 @@
fadt->firmware_ctrl = (unsigned long) facs;
fadt->dsdt = (unsigned long) dsdt;
- fadt->model = 0; /* reserved, should be 0 ACPI 3.0 */
+ fadt->reserved = 0; /* reserved, should be 0 ACPI 3.0 */
fadt->preferred_pm_profile = config->fadt_pm_profile; /* unknown is default */
/* System Management */
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 7dcec50..db49180 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -576,7 +576,7 @@
fadt->mon_alrm = 0x00;
fadt->century = 0x32;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
fadt->acpi_enable = APM_CNT_ACPI_ENABLE;
diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c
index ba79e73..6ad6929 100644
--- a/src/southbridge/intel/i82801jx/lpc.c
+++ b/src/southbridge/intel/i82801jx/lpc.c
@@ -589,7 +589,7 @@
fadt->mon_alrm = 0x00;
fadt->century = 0x32;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
fadt->acpi_enable = APM_CNT_ACPI_ENABLE;
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index e5cbc59..455c785 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -652,7 +652,7 @@
u16 pmbase = pci_read_config16(dev, 0x40) & 0xfffe;
int c2_latency;
- fadt->model = 1;
+ fadt->reserved = 0;
fadt->sci_int = 0x9;
fadt->smi_cmd = APM_CNT;
To view, visit change 29986. To unsubscribe, or for help writing mail filters, visit settings.