From patchwork Thu Jul 28 03:13:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary guo X-Patchwork-Id: 72918 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp624071qga; Wed, 27 Jul 2016 20:17:26 -0700 (PDT) X-Received: by 10.237.38.35 with SMTP id z32mr53290347qtc.69.1469675846196; Wed, 27 Jul 2016 20:17:26 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id t7si6581459qtc.39.2016.07.27.20.17.25; Wed, 27 Jul 2016 20:17:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E1C24684F1; Thu, 28 Jul 2016 03:17:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7F1C9684F3; Thu, 28 Jul 2016 03:14:55 +0000 (UTC) X-Original-To: Linaro-uefi@lists.linaro.org Delivered-To: Linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id BA483684F3; Thu, 28 Jul 2016 03:14:42 +0000 (UTC) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by lists.linaro.org (Postfix) with ESMTPS id DF7B468477 for ; Thu, 28 Jul 2016 03:14:33 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id iw10so16185948pac.2 for ; Wed, 27 Jul 2016 20:14:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aXIRxcRa4Pns0fwfUfAQAY18V6BYy1X16xx3u4ktRPY=; b=DvsoCzLeEZWQm+9ZNdedkF1oyAPkCGF7QCOlkMSLyAS9f2gLIYqbFmTaFQ/An55dLh 6bhwzMeLJsnBF9Q6MuRVfS4p1wk4O7lb3wJxfo979dDs+wxabcdmQ7/LZItOLUMK0RID xJc1WvhEl8bjNRZYJobIp3ex6CNyaisnbS6kViDrj/+UnV4B230ry8HUAQudMIpxaz6v rFZ/uOqSYG5XwGzjLIrS5tjg93r/ShIo+O1UireuH+NhRYD40y5Qwz2Hxr1xwRlDX0pl ebv6F4t/k99a8qdvkQxbmezEohFpM1zoB8vscrLXmtt06mMoO1E6ke66aRzQ3oDNQCAS WX7A== X-Gm-Message-State: AEkoouswAKsCXeWum6k/J03/OTvPkcfnPOWH9tQkFTwHlqGM8dEBYzYYwkGywSrs8X4/8wmK6fs= X-Received: by 10.66.160.136 with SMTP id xk8mr56270456pab.28.1469675673132; Wed, 27 Jul 2016 20:14:33 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.232]) by smtp.gmail.com with ESMTPSA id d3sm12339246pfk.37.2016.07.27.20.14.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jul 2016 20:14:32 -0700 (PDT) From: Heyi Guo To: Linaro-uefi@lists.linaro.org Date: Thu, 28 Jul 2016 11:13:24 +0800 Message-Id: <1469675605-14588-8-git-send-email-heyi.guo@linaro.org> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1469675605-14588-1-git-send-email-heyi.guo@linaro.org> References: <1469675605-14588-1-git-send-email-heyi.guo@linaro.org> Cc: Chenhui Sun Subject: [Linaro-uefi] [PATCH 8/9] Chips/Pv660: Unify ACPI table header X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" 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 Signed-off-by: Heyi Guo --- 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(-) 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.