[Linaro-uefi,8/9] Chips/Pv660: Unify ACPI table header

Message ID 1469675605-14588-8-git-send-email-heyi.guo@linaro.org
State New
Headers show

Commit Message

gary guo July 28, 2016, 3:13 a.m.
ACPI spec suggests to have CREATOR_ID and CREATOR_REVISION to indicate
ASL compiler information. OEM_ID, OEM_TABLE_ID and OEM_REVISION are
sometimes used for OS quirks. So we unify fields of ACPI table header
for Pv660 as below:

OEM_ID           HISI
OEM_TABLE_ID     HISI0660
OEM_REVISION     0x00000000
CREATOR_ID       INTL
CREATOR_REVISION 0x20151124

Note that SATASSDT/SASSSDT tables are not updated because we need
different SSDT OEM TABLE ID to check whether it is for SAS or SATA.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chenhui Sun <sunchenhui@huawei.com>
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
---
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl   | 2 +-
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl        | 6 +++---
 Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

Patch

diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
index ce5a085..f156e1b 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Dsdt/Dsdt.asl
@@ -18,7 +18,7 @@ 
 
 #include "Pv660Platform.h"
 
-DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI-D02", EFI_ACPI_ARM_OEM_REVISION) {
+DefinitionBlock("DsdtTable.aml", "DSDT", 1, "HISI", "HISI0660", EFI_ACPI_ARM_OEM_REVISION) {
   include ("Mbig.asl")
   include ("CPU.asl")
   include ("Com.asl")
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
index 44056b5..9ba3d55 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Iort.asl
@@ -10,11 +10,11 @@ 
 [0004]                       Table Length : 0000010C
 [0001]                           Revision : 00
 [0001]                           Checksum : BC
-[0006]                             Oem ID : "INTEL "
-[0008]                       Oem Table ID : "TEMPLATE"
+[0006]                             Oem ID : "HISI  "
+[0008]                       Oem Table ID : "HISI0660"
 [0004]                       Oem Revision : 00000000
 [0004]                    Asl Compiler ID : "INTL"
-[0004]              Asl Compiler Revision : 20150410
+[0004]              Asl Compiler Revision : 20151124
 
 [0004]                         Node Count : 0000000A
 [0004]                        Node Offset : 00000034
diff --git a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
index 5af8f1a..3d69d96 100644
--- a/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
+++ b/Chips/Hisilicon/Pv660/Pv660AcpiTables/Pv660Platform.h
@@ -24,10 +24,10 @@ 
 // ACPI table information used to initialize tables.
 //
 #define EFI_ACPI_ARM_OEM_ID           'H','I','S','I'   // OEMID 6 bytes long
-#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('H','I','S','I','-','D','0','2') // OEM table id 8 bytes long
-#define EFI_ACPI_ARM_OEM_REVISION     0x20140727
-#define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('H','I','S','I')
-#define EFI_ACPI_ARM_CREATOR_REVISION 0x00000099
+#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('H','I','S','I','0','6','6','0') // OEM table id 8 bytes long
+#define EFI_ACPI_ARM_OEM_REVISION     0x00000000
+#define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('I','N','T','L')
+#define EFI_ACPI_ARM_CREATOR_REVISION 0x20151124
 
 // A macro to initialise the common header part of EFI ACPI tables as defined by
 // EFI_ACPI_DESCRIPTION_HEADER structure.