From: Leif Lindholm <leif.lindholm@linaro.org>
To: Ming Huang <ming.huang@linaro.org>
Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org,
graeme.gregory@linaro.org, ard.biesheuvel@linaro.org,
michael.d.kinney@intel.com, lersek@redhat.com,
guoheyi@huawei.com, wanghuiqiang@huawei.com,
huangming23@huawei.com, zhangjinsong2@huawei.com,
huangdaode@hisilicon.com, john.garry@huawei.com,
xinliang.liu@linaro.org
Subject: Re: [PATCH edk2-platforms v4 01/31] Silicon/Hisilicon/Acpi: Move some macro to PlatformArch.h
Date: Thu, 30 Aug 2018 19:29:46 +0100 [thread overview]
Message-ID: <20180830182946.s6l4dvevdoojlesa@bivouac.eciton.net> (raw)
In-Reply-To: <20180823160743.45638-2-ming.huang@linaro.org>
On Fri, Aug 24, 2018 at 12:07:13AM +0800, Ming Huang wrote:
> ARM_ACPI_HEADER is used by a unify module in HwPkg,
> so move some macro to PlatformArch.h for unify D0x.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ming Huang <ming.huang@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
1,3-5/31 pushed as:
342330470f..1d331a2eaa
/
Leif
> ---
> Silicon/Hisilicon/Hi1610/Hi1610.dec | 23 +++++++++++++++++
> Silicon/Hisilicon/Hi1616/Hi1616.dec | 23 +++++++++++++++++
> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf | 2 +-
> Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf | 2 +-
> Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h | 27 +++-----------------
> Silicon/Hisilicon/Hi1610/Include/PlatformArch.h | 24 +++++++++++++++++
> Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h | 24 +----------------
> Silicon/Hisilicon/Hi1616/Include/PlatformArch.h | 23 +++++++++++++++++
> 8 files changed, 99 insertions(+), 49 deletions(-)
>
> diff --git a/Silicon/Hisilicon/Hi1610/Hi1610.dec b/Silicon/Hisilicon/Hi1610/Hi1610.dec
> new file mode 100644
> index 0000000000..6ea4867662
> --- /dev/null
> +++ b/Silicon/Hisilicon/Hi1610/Hi1610.dec
> @@ -0,0 +1,23 @@
> +#/** @file
> +#
> +# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> +# Copyright (c) 2018, Linaro Limited. All rights reserved.
> +#
> +# This program and the accompanying materials
> +# are licensed and made available under the terms and conditions of the BSD License
> +# which accompanies this distribution. The full text of the license may be found at
> +# http://opensource.org/licenses/bsd-license.php
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#
> +#**/
> +
> +[Defines]
> + DEC_SPECIFICATION = 0x0001001A
> + PACKAGE_NAME = Hi1610Pkg
> + PACKAGE_GUID = 0063d37d-adab-47b4-9926-af83539ea167
> + PACKAGE_VERSION = 0.1
> +
> +[Includes]
> + Include
> diff --git a/Silicon/Hisilicon/Hi1616/Hi1616.dec b/Silicon/Hisilicon/Hi1616/Hi1616.dec
> new file mode 100644
> index 0000000000..7dad0ab91a
> --- /dev/null
> +++ b/Silicon/Hisilicon/Hi1616/Hi1616.dec
> @@ -0,0 +1,23 @@
> +#/** @file
> +#
> +# Copyright (c) 2018, Hisilicon Limited. All rights reserved.
> +# Copyright (c) 2018, Linaro Limited. All rights reserved.
> +#
> +# This program and the accompanying materials
> +# are licensed and made available under the terms and conditions of the BSD License
> +# which accompanies this distribution. The full text of the license may be found at
> +# http://opensource.org/licenses/bsd-license.php
> +#
> +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
> +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> +#
> +#**/
> +
> +[Defines]
> + DEC_SPECIFICATION = 0x0001001A
> + PACKAGE_NAME = Hi1616Pkg
> + PACKAGE_GUID = 8a64c436-bcd6-4850-9de3-f9c922bb815a
> + PACKAGE_VERSION = 0.1
> +
> +[Includes]
> + Include
> diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
> index 9577d96b23..caef3da460 100644
> --- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
> +++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf
> @@ -40,7 +40,7 @@
> EmbeddedPkg/EmbeddedPkg.dec
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> -
> + Silicon/Hisilicon/Hi1610/Hi1610.dec
> Silicon/Hisilicon/HisiPkg.dec
>
> [FixedPcd]
> diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
> index bb279c8e42..d313936b89 100644
> --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
> +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/AcpiTablesHi1616.inf
> @@ -43,7 +43,7 @@
> EmbeddedPkg/EmbeddedPkg.dec
> MdePkg/MdePkg.dec
> MdeModulePkg/MdeModulePkg.dec
> -
> + Silicon/Hisilicon/Hi1616/Hi1616.dec
> Silicon/Hisilicon/HisiPkg.dec
>
> [FixedPcd]
> diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
> index 5a95b02055..4b1e4d3aad 100644
> --- a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
> +++ b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h
> @@ -1,8 +1,8 @@
> /** @file
> *
> * Copyright (c) 2011-2015, ARM Limited. All rights reserved.
> -* Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> -* Copyright (c) 2015, Linaro Limited. All rights reserved.
> +* Copyright (c) 2015-2018, Hisilicon Limited. All rights reserved.
> +* Copyright (c) 2015-2018, Linaro Limited. All rights reserved.
> *
> * This program and the accompanying materials
> * are licensed and made available under the terms and conditions of the BSD License
> @@ -20,28 +20,7 @@
> #ifndef _HI1610_PLATFORM_H_
> #define _HI1610_PLATFORM_H_
>
> -//
> -// 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','P','0','6',' ',' ',' ') // 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.
> -#define ARM_ACPI_HEADER(Signature, Type, Revision) { \
> - Signature, /* UINT32 Signature */ \
> - sizeof (Type), /* UINT32 Length */ \
> - Revision, /* UINT8 Revision */ \
> - 0, /* UINT8 Checksum */ \
> - { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \
> - EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \
> - EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \
> - EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \
> - EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
> - }
> +#include <PlatformArch.h>
>
> #define HI1610_WATCHDOG_COUNT 2
>
> diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> index 4bd3a85584..2ff076901e 100644
> --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h
> @@ -32,5 +32,29 @@
>
> #define S1_BASE 0x40000000000
>
> +
> +//
> +// 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','P','0','6',' ',' ',' ') // 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.
> +#define ARM_ACPI_HEADER(Signature, Type, Revision) { \
> + Signature, /* UINT32 Signature */ \
> + sizeof (Type), /* UINT32 Length */ \
> + Revision, /* UINT8 Revision */ \
> + 0, /* UINT8 Checksum */ \
> + { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \
> + EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \
> + EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \
> + EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \
> + EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
> + }
> +
> #endif
>
> diff --git a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
> index ad73aa2668..455cc191f0 100644
> --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
> +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h
> @@ -21,29 +21,7 @@
> #define _HI1610_PLATFORM_H_
>
> #include <IndustryStandard/Acpi.h>
> -
> -//
> -// 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','P','0','7',' ',' ',' ') // 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.
> -#define ARM_ACPI_HEADER(Signature, Type, Revision) { \
> - Signature, /* UINT32 Signature */ \
> - sizeof (Type), /* UINT32 Length */ \
> - Revision, /* UINT8 Revision */ \
> - 0, /* UINT8 Checksum */ \
> - { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \
> - EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \
> - EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \
> - EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \
> - EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
> - }
> +#include <PlatformArch.h>
>
> #define HI1616_WATCHDOG_COUNT 2
> #define HI1616_GIC_STRUCTURE_COUNT 64
> diff --git a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> index 6105749b15..60a60593be 100644
> --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h
> @@ -32,5 +32,28 @@
>
> #define S1_BASE 0x40000000000
>
> +//
> +// 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','P','0','7',' ',' ',' ') // 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.
> +#define ARM_ACPI_HEADER(Signature, Type, Revision) { \
> + Signature, /* UINT32 Signature */ \
> + sizeof (Type), /* UINT32 Length */ \
> + Revision, /* UINT8 Revision */ \
> + 0, /* UINT8 Checksum */ \
> + { EFI_ACPI_ARM_OEM_ID }, /* UINT8 OemId[6] */ \
> + EFI_ACPI_ARM_OEM_TABLE_ID, /* UINT64 OemTableId */ \
> + EFI_ACPI_ARM_OEM_REVISION, /* UINT32 OemRevision */ \
> + EFI_ACPI_ARM_CREATOR_ID, /* UINT32 CreatorId */ \
> + EFI_ACPI_ARM_CREATOR_REVISION /* UINT32 CreatorRevision */ \
> + }
> +
> #endif
>
> --
> 2.18.0
>
next prev parent reply other threads:[~2018-08-30 18:29 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-23 16:07 [PATCH edk2-platforms v4 00/31] Upload for D06 platform Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 01/31] Silicon/Hisilicon/Acpi: Move some macro to PlatformArch.h Ming Huang
2018-08-30 18:29 ` Leif Lindholm [this message]
2018-08-23 16:07 ` [PATCH edk2-platforms v4 02/31] Silicon/Hisilicon/D0x: Move RAS " Ming Huang
2018-08-30 18:29 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 03/31] Silicon/Hisilicon: Fix I2CLib enable fail issue Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 04/31] Silicon/Hisilicon: Add I2CLib delay for HNS auto config Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 05/31] Silicon/Hisilicon: Optimize I2CLib for HNS config CDR time Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 06/31] Hisilicon/D06: Add several base file for D06 Ming Huang
2018-08-30 18:14 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 07/31] Platform/Hisilicon/D06: Add M41T83RealTimeClockLib Ming Huang
2018-08-30 19:00 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 08/31] Platform/Hisilicon/D06: Add edk2-non-osi components for D06 Ming Huang
2018-08-30 18:59 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 09/31] Hisilicon/D06: Add OemMiscLibD06 Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 10/31] Silicon/Hisilicon/D06: Wait for all disk ready Ming Huang
2018-08-30 16:51 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 11/31] Silicon/Hisilicon/Acpi: Unify HisiAcpiPlatformDxe Ming Huang
2018-08-30 18:39 ` Leif Lindholm
2018-08-31 2:12 ` Ming
2018-08-23 16:07 ` [PATCH edk2-platforms v4 12/31] Hisilicon/D06: Add Debug Serial Port Init Driver Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 13/31] Hisilicon/D06: Add ACPI Tables for D06 Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 14/31] Hisilicon/D06: Add Hi1620OemConfigUiLib Ming Huang
2018-08-30 18:58 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 15/31] Silicon/Hisilicon/D06: Stop watchdog Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 16/31] Silicon/Hisilicon/Setup: Add Setup Item "EnableGOP" Ming Huang
2018-08-30 18:41 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 17/31] Hisilicon/Hi1620: Add ACPI PPTT table Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 18/31] Platform/Hisilicon/D06: Enable ACPI PPTT Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 19/31] Platform/Hisilicon/D06: Add OemNicLib Ming Huang
2018-08-30 18:45 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 20/31] Platform/Hisilicon/D06: Add OemNicConfig2P Driver Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 21/31] Hisilicon/D0x: Update SMBIOS type9 info Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 22/31] Platform/Hisilicon/D06: Add EarlyConfigPeim peim Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 23/31] Platform/Hisilicon/D06: Add PciHostBridgeLib Ming Huang
2018-08-23 16:07 ` [PATCH edk2-platforms v4 24/31] Hisilicon/D06: add apei driver Ming Huang
2018-08-30 18:47 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 25/31] Platform/Hisilicon/D06: Add capsule upgrade support Ming Huang
2018-08-30 18:49 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 26/31] Silicon/Hisilicon: Modify for close slave core clock Ming Huang
2018-08-30 18:50 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 27/31] Silicon/Hisilicon: Add I2C Bus Exception handle function Ming Huang
2018-08-30 18:51 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 28/31] Silicon/Hisilicon/Setup: Support SPCR table switch Ming Huang
2018-08-30 18:52 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 29/31] Silicon/Hisilicon/setup: Enable/disable SMMU Ming Huang
2018-08-30 18:55 ` Leif Lindholm
2018-08-23 16:07 ` [PATCH edk2-platforms v4 30/31] Hisilicon/D06: Add PciPlatformLib Ming Huang
2018-08-30 16:15 ` Leif Lindholm
2018-08-31 6:17 ` Ming
2018-08-23 16:07 ` [PATCH edk2-platforms v4 31/31] Platform/Hisilicon/D0x: Update version string to 18.08 Ming Huang
2018-08-30 20:20 ` [PATCH edk2-platforms v4 00/31] Upload for D06 platform Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180830182946.s6l4dvevdoojlesa@bivouac.eciton.net \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox