* [PATCH edk2-Platform v1 0/1] Hisilicon:Fix header file issues @ 2021-06-22 12:33 wenyi,xie 2021-06-22 12:33 ` [PATCH edk2-Platform v1 1/1] " wenyi,xie 0 siblings, 1 reply; 4+ messages in thread From: wenyi,xie @ 2021-06-22 12:33 UTC (permalink / raw) To: devel, leif, ard.biesheuvel; +Cc: songdongkuang, xiewenyi2 Main Changes : 1.Replace ArmLibPrivate.h with ArmLib.h 2.Cahnge order of dec in some inf file since there are same name header files 3.Remove redundant declaration of union PROCESSOR_STATUS_DATA Wenyi Xie (1): Hisilicon:Fix header file issues 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/ProcessorSubClassDxe.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(-) -- 2.20.1.windows.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues 2021-06-22 12:33 [PATCH edk2-Platform v1 0/1] Hisilicon:Fix header file issues wenyi,xie @ 2021-06-22 12:33 ` wenyi,xie 2021-08-04 12:24 ` [edk2-devel] " Leif Lindholm 0 siblings, 1 reply; 4+ messages in thread From: wenyi,xie @ 2021-06-22 12:33 UTC (permalink / raw) To: devel, leif, ard.biesheuvel; +Cc: songdongkuang, xiewenyi2 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. Cc: Leif Lindholm <leif@nuviainc.com> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com> Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com> --- 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/ProcessorSubClassDxe.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.inf 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 [Packages] + Silicon/Hisilicon/HisiPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] PeimEntryPoint diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf 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 [Packages] + Silicon/Hisilicon/HisiPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [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 [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [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 [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 [LibraryClasses] BaseMemoryLib diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf index 99eea93b7988..2c3c1ff51408 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf @@ -21,12 +21,12 @@ ProcessorSubClass.c [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.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 [Packages] + Silicon/Hisilicon/HisiPkg.dec ArmPkg/ArmPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec Silicon/Hisilicon/HisiliconNonOsi.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] PcdLib diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf 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 [Packages] + Silicon/Hisilicon/HisiPkg.dec MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec ArmPkg/ArmPkg.dec - Silicon/Hisilicon/HisiPkg.dec [LibraryClasses] UefiDriverEntryPoint diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h index 3ce180d21df3..3a51199e924b 100644 --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h @@ -68,19 +68,6 @@ typedef union { UINT16 Data; }CACHE_CONFIGURATION; -// -// 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 populated 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/Hi1616/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_ #include <IndustryStandard/Acpi.h> -#include <Library/ArmLib/ArmLibPrivate.h> +#include <Library/ArmLib.h> #include <Library/BaseMemoryLib.h> #include <Library/DebugLib.h> #include <Library/MemoryAllocationLib.h> diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi1620/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 @@ #include <PlatformArch.h> #include <IndustryStandard/Acpi.h> -#include <Library/ArmLib/ArmLibPrivate.h> +#include <Library/ArmLib.h> #include <Library/BaseMemoryLib.h> #include <Library/DebugLib.h> #include <Library/MemoryAllocationLib.h> -- 2.20.1.windows.1 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues 2021-06-22 12:33 ` [PATCH edk2-Platform v1 1/1] " wenyi,xie @ 2021-08-04 12:24 ` Leif Lindholm 2021-08-09 8:42 ` wenyi,xie 0 siblings, 1 reply; 4+ messages in thread From: Leif Lindholm @ 2021-08-04 12:24 UTC (permalink / raw) To: devel, xiewenyi2; +Cc: ard.biesheuvel, songdongkuang, rebecca +Rebecca Apologies for slow response, this arrived while I was on holiday. 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. 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. 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? Best Regards, Leif > Cc: Leif Lindholm <leif@nuviainc.com> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com> > Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com> > --- > 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/ProcessorSubClassDxe.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.inf 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 > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > > ArmPkg/ArmPkg.dec > Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] > PeimEntryPoint > diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf > 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 > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > ArmPkg/ArmPkg.dec > Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [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 > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > ArmPkg/ArmPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [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 > > [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 > > [LibraryClasses] > BaseMemoryLib > diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > index 99eea93b7988..2c3c1ff51408 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > @@ -21,12 +21,12 @@ > ProcessorSubClass.c > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > > Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] > UefiDriverEntryPoint > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.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 > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > Silicon/Hisilicon/HisiliconNonOsi.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] > PcdLib > diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf 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 > > [Packages] > + Silicon/Hisilicon/HisiPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > ArmPkg/ArmPkg.dec > - Silicon/Hisilicon/HisiPkg.dec > > [LibraryClasses] > UefiDriverEntryPoint > diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h > index 3ce180d21df3..3a51199e924b 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h > +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h > @@ -68,19 +68,6 @@ typedef union { > UINT16 Data; > }CACHE_CONFIGURATION; > > -// > -// 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 populated 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/Hi1616/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_ > > #include <IndustryStandard/Acpi.h> > -#include <Library/ArmLib/ArmLibPrivate.h> > +#include <Library/ArmLib.h> > #include <Library/BaseMemoryLib.h> > #include <Library/DebugLib.h> > #include <Library/MemoryAllocationLib.h> > diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi1620/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 @@ > > #include <PlatformArch.h> > #include <IndustryStandard/Acpi.h> > -#include <Library/ArmLib/ArmLibPrivate.h> > +#include <Library/ArmLib.h> > #include <Library/BaseMemoryLib.h> > #include <Library/DebugLib.h> > #include <Library/MemoryAllocationLib.h> > -- > 2.20.1.windows.1 > > > > > > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues 2021-08-04 12:24 ` [edk2-devel] " Leif Lindholm @ 2021-08-09 8:42 ` wenyi,xie 0 siblings, 0 replies; 4+ messages in thread From: wenyi,xie @ 2021-08-09 8:42 UTC (permalink / raw) To: Leif Lindholm, devel; +Cc: ard.biesheuvel, songdongkuang, rebecca Hi Leif， According to your advice, I have changed the name of header to OemHisiMiscLib 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 > > Apologies for slow response, this arrived while I was on holiday. > > 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. > > 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. > > 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? > > Best Regards, > > Leif > >> Cc: Leif Lindholm <leif@nuviainc.com> >> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com> >> Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com> >> --- >> 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/ProcessorSubClassDxe.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.inf 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 >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> >> ArmPkg/ArmPkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >> PeimEntryPoint >> diff --git a/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf b/Platform/Hisilicon/D03/Library/OemMiscLib2P/OemMiscLib2PHi1610.inf >> 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 >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> ArmPkg/ArmPkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [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 >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdeModulePkg/MdeModulePkg.dec >> MdePkg/MdePkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [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 >> >> [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 >> >> [LibraryClasses] >> BaseMemoryLib >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf >> index 99eea93b7988..2c3c1ff51408 100644 >> --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf >> +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf >> @@ -21,12 +21,12 @@ >> ProcessorSubClass.c >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >> UefiDriverEntryPoint >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.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 >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> ArmPkg/ArmPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> Silicon/Hisilicon/HisiliconNonOsi.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >> PcdLib >> diff --git a/Silicon/Hisilicon/Hi1610/Drivers/PcieInit1610/PcieInitDxe.inf 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 >> >> [Packages] >> + Silicon/Hisilicon/HisiPkg.dec >> MdePkg/MdePkg.dec >> MdeModulePkg/MdeModulePkg.dec >> ArmPkg/ArmPkg.dec >> - Silicon/Hisilicon/HisiPkg.dec >> >> [LibraryClasses] >> UefiDriverEntryPoint >> diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h >> index 3ce180d21df3..3a51199e924b 100644 >> --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h >> +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.h >> @@ -68,19 +68,6 @@ typedef union { >> UINT16 Data; >> }CACHE_CONFIGURATION; >> >> -// >> -// 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 populated 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/Hi1616/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_ >> >> #include <IndustryStandard/Acpi.h> >> -#include <Library/ArmLib/ArmLibPrivate.h> >> +#include <Library/ArmLib.h> >> #include <Library/BaseMemoryLib.h> >> #include <Library/DebugLib.h> >> #include <Library/MemoryAllocationLib.h> >> diff --git a/Silicon/Hisilicon/Hi1620/Pptt/Pptt.h b/Silicon/Hisilicon/Hi1620/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 @@ >> >> #include <PlatformArch.h> >> #include <IndustryStandard/Acpi.h> >> -#include <Library/ArmLib/ArmLibPrivate.h> >> +#include <Library/ArmLib.h> >> #include <Library/BaseMemoryLib.h> >> #include <Library/DebugLib.h> >> #include <Library/MemoryAllocationLib.h> >> -- >> 2.20.1.windows.1 >> >> >> >> >> >> > . > ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-09 8:42 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-06-22 12:33 [PATCH edk2-Platform v1 0/1] Hisilicon:Fix header file issues wenyi,xie 2021-06-22 12:33 ` [PATCH edk2-Platform v1 1/1] " wenyi,xie 2021-08-04 12:24 ` [edk2-devel] " Leif Lindholm 2021-08-09 8:42 ` wenyi,xie
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox