From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::242; helo=mail-pl0-x242.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id B39BF210E1288 for ; Wed, 8 Aug 2018 05:22:45 -0700 (PDT) Received: by mail-pl0-x242.google.com with SMTP id ba4-v6so954917plb.11 for ; Wed, 08 Aug 2018 05:22:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=rKS7gM/xhEiAZtggiBOosLmr86EkZFBiYx+zHucRaVI=; b=NpCugMrk5LzfA1p82LcbqkiWVHjrUOIqvqSxl6rh0Azh6ghx2BCyp3fJfsjgx3Bgr+ AQrG0Lbg01ApN1ZpwB2FoQ3t8qK6T75uofpHqDy1PS2w2N2InPgu3VaMEeAAmSLl/tpc JOeZPf6Nyi228eQH//yN4hYLZ9eJAMulVU9cQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=rKS7gM/xhEiAZtggiBOosLmr86EkZFBiYx+zHucRaVI=; b=El+a40icx0LXsNu2X1gmk0lA7LcTs0ZO7deEe+9ZgduIdss3CbG+51s8sqRZ4kcGpz Qm6HYddTzO8RL5YVceIEhxQL8IWnWTFuTwSbloiA8jS6EpKQPCB3ZXBfoN6xnJ/OZFSe FxwJIt9PNlSYevKmHAfCx7HpBOIQwDjUMto+HdxKT5JzhOGxshDJutA+DqPdw12IixAa HjdE+abUXDxiPbyZF0nTs7F0+rwuVFSmCbqS/C3Agd5pumHyzmcI9jB0gLFC0g2yogF4 kbegHZ7+i1ivtdfwGM0s7T28NyAqG4+SFwfNNOQm/PwJd2f/PpmsBCoQXUpD2hdQhHVy ji2A== X-Gm-Message-State: AOUpUlFRh7hA9iF77JpBSW63pWKHKCZldxxEKDuHky2dIJhsIY4IQTrx czudcp3LGeVkxWVcqL7esRGTlw== X-Google-Smtp-Source: AA+uWPyUmk/2r38jr830w+t7RSQKYQ2qRBe/llbuQBTZk6bReDhzZwKR3tuZZ0it5aH6IrbiGWZuWg== X-Received: by 2002:a17:902:6b0b:: with SMTP id o11-v6mr2387273plk.214.1533730965154; Wed, 08 Aug 2018 05:22:45 -0700 (PDT) Received: from [10.199.0.182] ([64.64.108.224]) by smtp.gmail.com with ESMTPSA id 75-v6sm8520093pfr.115.2018.08.08.05.22.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Aug 2018 05:22:44 -0700 (PDT) To: Leif Lindholm Cc: linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org, ard.biesheuvel@linaro.org, guoheyi@huawei.com, wanghuiqiang@huawei.com, huangming23@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, john.garry@huawei.com, xinliang.liu@linaro.org, Sun Yuanchen , Heyi Guo References: <20180724070922.63362-1-ming.huang@linaro.org> <20180724070922.63362-14-ming.huang@linaro.org> <20180803103715.ep6dquwyzx5xytqm@bivouac.eciton.net> From: Ming Message-ID: Date: Wed, 8 Aug 2018 20:22:27 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180803103715.ep6dquwyzx5xytqm@bivouac.eciton.net> Subject: Re: [PATCH edk2-platforms v1 13/38] Silicon/Hisilicon/Acpi: Move some macro to PlatformArch.h X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2018 12:22:45 -0000 Content-Type: text/plain; charset=gbk Content-Transfer-Encoding: 8bit ÔÚ 8/3/2018 6:37 PM, Leif Lindholm дµÀ: > On Tue, Jul 24, 2018 at 03:08:57PM +0800, Ming Huang wrote: >> From: Sun Yuanchen >> >> ARM_ACPI_HEADER is used by a unify module in other Pkg, > > What other Pkg? > HwPkg >> so move some macro to PlatformArch.h for unify D0x. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Sun Yuanchen >> Signed-off-by: Ming Huang >> Signed-off-by: Heyi Guo > > On the whole, I think this should be implemented for 1610/1616 > separately, and then introduced in the first version of the 1620 > header. > do it in v2. >> --- >> 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 +++++++++++++++++ >> Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h | 25 ++---------------- >> Silicon/Hisilicon/Hi1620/Include/PlatformArch.h | 23 +++++++++++++++++ >> 6 files changed, 76 insertions(+), 70 deletions(-) >> >> diff --git a/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h b/Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/Hi1610Platform.h >> index 5a95b02055..28546bea99 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 <../Include/PlatformArch.h> > > No relative #includes. > >> >> #define HI1610_WATCHDOG_COUNT 2 >> >> diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> index f2e931f30b..03e96cfd31 100644 >> --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> @@ -37,5 +37,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') > > I realise this is just moving, but ... why are we claiming that Intel > is the creator of these tables? > I don't know the reason. I think this is a history mistake. CREATEOR_ID should be change to 'HISI' for 1620? >> +#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..04f9e34a14 100644 >> --- a/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h >> +++ b/Silicon/Hisilicon/Hi1616/D05AcpiTables/Hi1616Platform.h >> @@ -21,29 +21,7 @@ >> #define _HI1610_PLATFORM_H_ >> >> #include >> - >> -// >> -// 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 <../Include/PlatformArch.h> > > No relative includes. > >> >> #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 f2e931f30b..14e9b483af 100644 >> --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> @@ -37,5 +37,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 >> >> diff --git a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h >> index 676d91fa49..5a6aa9a876 100644 >> --- a/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h >> +++ b/Silicon/Hisilicon/Hi1620/Hi1620AcpiTables/Hi1620Platform.h >> @@ -2,7 +2,7 @@ >> * >> * Copyright (c) 2011-2015, ARM Limited. All rights reserved. >> * Copyright (c) 2018, Hisilicon Limited. All rights reserved. >> -* Copyright (c) 2015, Linaro 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 _HI1620_PLATFORM_H_ >> #define _HI1620_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','8',' ',' ',' ') // 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 <../Include/PlatformArch.h> > > No relative includes. > Modify it in v2. Thanks. Ming > / > Leif > >> >> #define HI1620_WATCHDOG_COUNT 2 >> >> diff --git a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h >> index 2fc1b9219d..ac90e9dfb5 100644 >> --- a/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h >> +++ b/Silicon/Hisilicon/Hi1620/Include/PlatformArch.h >> @@ -36,5 +36,28 @@ >> #define EFI_ACPI_MEMORY_AFFINITY_STRUCTURE_COUNT 16 >> #define EFI_ACPI_6_2_ITS_AFFINITY_STRUCTURE_COUNT 1 >> >> +// >> +// 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','8',' ',' ',' ') // 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.17.0 >>