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::244; helo=mail-pl0-x244.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl0-x244.google.com (mail-pl0-x244.google.com [IPv6:2607:f8b0:400e:c01::244]) (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 A1905210D83CE for ; Sat, 18 Aug 2018 00:26:46 -0700 (PDT) Received: by mail-pl0-x244.google.com with SMTP id x6-v6so4698933plv.10 for ; Sat, 18 Aug 2018 00:26:46 -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=FZdBdGZfQM1rKeFJz92+1AWS6wHZPNdGOBKH6nbwxrg=; b=TZ2hbN5zlpXgtW5rQQEI4hWW+92PEHfmiehxg1ivrQ2/SVoncSNvaXJDBzk9OmORZB cGOrOO3L+/nmONZbtkO27RDkKdROpTuf1XzleTdl0Il8K7Gv9jEHw4Sx0KI9x1dF+OYl cgOEWzc7YuSlNc42D97p/Q2TFRe8VBRDbrntQ= 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=FZdBdGZfQM1rKeFJz92+1AWS6wHZPNdGOBKH6nbwxrg=; b=K5A8pM2MpDcRCxJkhqZ9xLEQLDDuHsR9JXJJeSy/rSGv48akUFBbWGCavJnBJqDJR/ gpqN7yyEveFlUdzIHaB4hWhkg+TNp7RbMfTN29l1Apxn2bkakVyQGjqu347RTpmUSLRf vIfMzT0jfE8EVXx5o2uAI0XOvKWtPB3+GM9i7CjZBgj8vT4Gi1uDck8+OXcE6+OL4PyV q2W6EsSRg/+rM0SS+kXRL0fcWEiNA0IUSYWoZvhCNuq6mUZtaWO+m5SibND1wMDSjzk9 yIn0cxneZbsPXsFbzKIoeL4MBP8pPsvvU5/fmUbPKsc5a71Sdb29NYgr8dWgqZXhodCg 05jg== X-Gm-Message-State: AOUpUlFZwb8/bDnYR+yYn1EnfHhX2N/mts2GX8COF0RIDi2P/MWr36U0 18XYPfL3f7xylx+lCsFGt7bn6A== X-Google-Smtp-Source: AA+uWPx8hxZLQS0wAkWDoSXYMlOQ5DFQr5c05h5qblqp4Z8C2owoQfkKUrTfrf+sbK5/WxWAbkbFdw== X-Received: by 2002:a17:902:44a4:: with SMTP id l33-v6mr36644566pld.134.1534577206260; Sat, 18 Aug 2018 00:26:46 -0700 (PDT) Received: from [10.18.1.58] ([64.64.108.136]) by smtp.gmail.com with ESMTPSA id j27-v6sm6124006pfj.91.2018.08.18.00.26.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Aug 2018 00:26:45 -0700 (PDT) To: Leif Lindholm 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 References: <20180814080903.50466-1-ming.huang@linaro.org> <20180814080903.50466-4-ming.huang@linaro.org> <20180817132346.5uzduw33oaftecmd@bivouac.eciton.net> From: Ming Message-ID: Date: Sat, 18 Aug 2018 15:26:21 +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: <20180817132346.5uzduw33oaftecmd@bivouac.eciton.net> Subject: Re: [PATCH edk2-platforms v2 03/43] Silicon/Hisilicon/Acpi: Move some macro to PlatformArch.h X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Aug 2018 07:26:47 -0000 Content-Type: text/plain; charset=gbk Content-Transfer-Encoding: 8bit ÔÚ 8/17/2018 9:23 PM, Leif Lindholm дµÀ: > > On Tue, Aug 14, 2018 at 04:08:23PM +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 >> --- >> 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 +++++++++++++++++ >> 4 files changed, 51 insertions(+), 47 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> > > I pointed out in review of v1: no relative include paths. > > Cleanest way of resolving this is by adding a > Silicon/Hisilicon/Hi1610/Hi1610.dec, much like > Platform/Hisilicon/D03/D03.dec, and add a dependency on that in the > [Packages] section of > Silicon/Hisilicon/Hi1610/Hi1610AcpiTables/AcpiTablesHi1610.inf. > >> >> #define HI1610_WATCHDOG_COUNT 2 >> >> diff --git a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> index 45995c5893..8e5913447c 100644 >> --- a/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> +++ b/Silicon/Hisilicon/Hi1610/Include/PlatformArch.h >> @@ -31,5 +31,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..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> > > Same comment, no relative includes. > But here a Silicon/Hisilicon/Hi1616/Hi1616.dec. Apology for miss the comments in v2 and thank for providing the way. Modify it in v4. > > / > Leif > >> >> #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 bf0994a5e9..24167d1633 100644 >> --- a/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> +++ b/Silicon/Hisilicon/Hi1616/Include/PlatformArch.h >> @@ -31,5 +31,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.17.0 >>