From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mx.groups.io with SMTP id smtpd.web12.20355.1628498546305548555 for ; Mon, 09 Aug 2021 01:42:27 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: huawei.com, ip: 45.249.212.187, mailfrom: xiewenyi2@huawei.com) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.57]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4GjqHS30Vmzb02h; Mon, 9 Aug 2021 16:38:44 +0800 (CST) Received: from dggpemm000003.china.huawei.com (7.185.36.128) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 16:42:21 +0800 Received: from [10.174.253.58] (10.174.253.58) by dggpemm000003.china.huawei.com (7.185.36.128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Mon, 9 Aug 2021 16:42:21 +0800 Subject: Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues To: Leif Lindholm , CC: , , References: <1624365205-126648-1-git-send-email-xiewenyi2@huawei.com> <1624365205-126648-2-git-send-email-xiewenyi2@huawei.com> <20210804122442.xh6r3vpguwy3lazq@leviathan> From: "wenyi,xie" Message-ID: Date: Mon, 9 Aug 2021 16:42:17 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.0.1 MIME-Version: 1.0 In-Reply-To: <20210804122442.xh6r3vpguwy3lazq@leviathan> X-Originating-IP: [10.174.253.58] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemm000003.china.huawei.com (7.185.36.128) X-CFilter-Loop: Reflected Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: quoted-printable Hi Leif=EF=BC=8C According to your advice, I have changed the name of header to OemHisiMiscL= ib and snet the v2 patch to you. Please help reviewing it when you are free= . Thanks Wenyi On 2021/8/4 20:24, Leif Lindholm wrote: > +Rebecca >=20 > Apologies for slow response, this arrived while I was on holiday. >=20 > On Tue, Jun 22, 2021 at 20:33:25 +0800, wenyi,xie via groups.io wrote: >> EDK2 has removed header file ArmLibPrivate.h, so need to >> use ArmLib.h instead. A new file OemMiscLib.h is added >> to EDK2, its name is same with the header file in >> Hisilicon\Include and it will being included first. So >> some undefined issue occured and need to change the order >> of header files. >=20 > Ugh, oops. Yes. So, we used the Hisilicon Smbios implementation to > create what is intended to become a fully generic module, > ArmPkg/Universal/Smbios/, and ended up keeping that header name. > Sorry about that. >=20 > However, moving around packages to make one identically named file be > picked over another is not the right solution. Could you possibly > rename your existing header? OemMiscHisi.h? >=20 > Best Regards, >=20 > Leif >=20 >> Cc: Leif Lindholm >> Cc: Ard Biesheuvel >> Signed-off-by: Wenyi Xie >> --- >> Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf = | 2 +- >> Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf = | 2 +- >> Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf = | 2 +- >> Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf = | 2 +- >> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass= Dxe.inf | 2 +- >> Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf = | 2 +- >> Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf = | 2 +- >> Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass= .h | 13 ------------- >> Silicon/Hisilicon/Hi1616/Pptt/Pptt.h = | 2 +- >> Silicon/Hisilicon/Hi1620/Pptt/Pptt.h = | 2 +- >> 10 files changed, 9 insertions(+), 22 deletions(-) >> >> diff --git a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.i= nf b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> index 1f992024acc2..f1b21ae80f3c 100644 >> --- a/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> +++ b/Platform/Hisilicon/D03/EarlyConfigPeim/EarlyConfigPeimD03.inf >> @@ -20,12 +20,12 @@ >> EarlyConfigPeimD03.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> =20 >> ArmPkg/ArmPkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> PeimEntryPoint >> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1= 610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.in= f >> index ab14597d8b75..728b33e85030 100644 >> --- a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> +++ b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> @@ -21,11 +21,11 @@ >> BoardFeature2PHi1610Strings.uni >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> ArmPkg/ArmPkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> BaseMemoryLib >> diff --git a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.= inf b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> index d471102199ee..8a605b417be8 100644 >> --- a/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> +++ b/Platform/Hisilicon/D05/Library/OemMiscLibD05/OemMiscLibD05.inf >> @@ -21,11 +21,11 @@ >> OemMiscLibD05.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdeModulePkg/MdeModulePkg.dec >> MdePkg/MdePkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> BaseMemoryLib >> diff --git a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.= inf b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> index 59373a968523..1121550b40c4 100644 >> --- a/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> +++ b/Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf >> @@ -21,12 +21,12 @@ >> OemMiscLibD06.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdeModulePkg/MdeModulePkg.dec >> MdePkg/MdePkg.dec >> Platform/Hisilicon/D06/D06.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> BaseMemoryLib >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Proce= ssorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe= /ProcessorSubClassDxe.inf >> index 99eea93b7988..2c3c1ff51408 100644 >> --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSub= ClassDxe.inf >> +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSub= ClassDxe.inf >> @@ -21,12 +21,12 @@ >> ProcessorSubClass.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> =20 >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> UefiDriverEntryPoint >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDx= e.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf >> index 9c795b5fd401..99cc8fc4c14e 100644 >> --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf >> +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf >> @@ -48,11 +48,11 @@ >> ./Type09/MiscSystemSlotDesignationFunction.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> PcdLib >> diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.i= nf b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf >> index 25d301f210ba..921dae6dd80a 100644 >> --- a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf >> +++ b/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf >> @@ -21,10 +21,10 @@ >> PcieInitLib.c >> =20 >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> ArmPkg/ArmPkg.dec >> - Silicon/Hisilicon/HisiPkg.dec >> =20 >> [LibraryClasses] >> UefiDriverEntryPoint >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Proce= ssorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/Proc= essorSubClass.h >> index 3ce180d21df3..3a51199e924b 100644 >> --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSub= Class.h >> +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSub= Class.h >> @@ -68,19 +68,6 @@ typedef union { >> UINT16 Data; >> }CACHE_CONFIGURATION; >> =20 >> -// >> -// Processor Status >> -// >> -typedef union { >> - struct { >> - UINT8 CpuStatus :3; // Indicates the status of the processor. >> - UINT8 Reserved1 :3; // Reserved for future use. Should be set= to zero. >> - UINT8 SocketPopulated :1; // Indicates if the processor socket is p= opulated or not. >> - UINT8 Reserved2 :1; // Reserved for future use. Should be set= to zero. >> - } Bits; >> - UINT8 Data; >> -}PROCESSOR_STATUS_DATA; >> - >> // >> // Processor Characteristics >> // >> diff --git a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h b/Silicon/Hisilicon/Hi= 1616/Pptt/Pptt.h >> index a0ad31a990db..0cb9a6e31e65 100644 >> --- a/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h >> +++ b/Silicon/Hisilicon/Hi1616/Pptt/Pptt.h >> @@ -13,7 +13,7 @@ >> #define _PPTT_H_ >> =20 >> #include >> -#include >> +#include >> #include >> #include >> #include >> diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi= 1620/Pptt/Pptt.h >> index 30ba5fff65ce..7d8228503dba 100644 >> --- a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h >> +++ b/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h >> @@ -14,7 +14,7 @@ >> =20 >> #include >> #include >> -#include >> +#include >> #include >> #include >> #include >> --=20 >> 2.20.1.windows.1 >> >> >> >>=20 >> >> > . >=20