From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.groups.io with SMTP id smtpd.web11.8080.1628079886762251262 for ; Wed, 04 Aug 2021 05:24:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=XWIAeihK; spf=pass (domain: nuviainc.com, ip: 209.85.128.42, mailfrom: leif@nuviainc.com) Received: by mail-wm1-f42.google.com with SMTP id b128so1093217wmb.4 for ; Wed, 04 Aug 2021 05:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=13NHmGDomOKiK+eYNM3xMaoJAzXf5LYG9bgParNoPrs=; b=XWIAeihKjXDK27kCgC76MyZ1dx773QbWoa4s/hH+h66uh7tB/VB4vil0/eIkBe78tp 7BPdOyQdIlqY/XnrnDwxOvwsav/WTKhuOPTk7wct6kKpdtybnq39Fo8kcjnpeIlXqCbr OudU19b4cwR53G2hyLg4ULV293FYcwPhOI/wyRA71XzIIqABNXV98b++a7lIvjPr9hwP nmhReDe3Y94zueAdimTVzAFYZSdbVcOVJ1Nnx82AMR/1uRKTaNjeTgpEf54zA6CdCHra bc/Cn4lhkNP4n7tlh0ue9YLMKsyuhLv4TiO+5R+VQKEuz0Zs6cRXy0w9NRoDoQE5cvuN iBng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=13NHmGDomOKiK+eYNM3xMaoJAzXf5LYG9bgParNoPrs=; b=DFZBqC02fkSTZOzkJGACWjjdG1XyOJFvBozDtyaCa5YyLh/0UubYEm8W8HbChx7gp7 EHHfWpFsyH7zz1RFTpnIB3Lyflsb8EfRGjms67t6RSLdla4N2Ypp2D4/D1YtIC5frNQm QW1dchqo65MAp0gTEo1JyVJec3ChvxSjfGmpFbo9PqN+TeIg1PQBuapgxJ3e43R6sEwg YWw8mNxuJGF7ER1NG78mUKdg8FyQlY+Ong9VwwGQZBYbVeV4Q5mArsHYstgjzA74qMg/ vCzMVNOv+TpRTWPbcEqQapZSJkjoh6ssCe0+CwGu8pxSMpmmmp/59Cs/YUThJR+OBrSL x9tw== X-Gm-Message-State: AOAM531qOK8q/C3RcxUPANxyTJb5BYpaGfBppdAQ9Suk7UaudVm5xKJw 5FLGlpAv/QczwJm2EPjTLN541DRI/lmzWCs9DF2ys9PS/W/IMd67jDjw+xbeJi9HOKiOosI6paa 2kR3qqojdm4r9v2+QUgLNE0yAfDW1JqKp6LG4VlD36wrglAzZ5hxYqQ8VRyt++03U1hVL X-Google-Smtp-Source: ABdhPJzZarzobVWvKHykv4N4MUNnDggVmhMPQfbapELG06C/UuUymWerZgaGTZpgqRwOu5U75Um1Pg== X-Received: by 2002:a05:600c:3782:: with SMTP id o2mr9596430wmr.137.1628079884973; Wed, 04 Aug 2021 05:24:44 -0700 (PDT) Return-Path: Received: from leviathan (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id p15sm2123572wmi.29.2021.08.04.05.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 05:24:44 -0700 (PDT) Date: Wed, 4 Aug 2021 13:24:42 +0100 From: "Leif Lindholm" To: devel@edk2.groups.io, xiewenyi2@huawei.com Cc: ard.biesheuvel@arm.com, songdongkuang@huawei.com, rebecca@nuviainc.com Subject: Re: [edk2-devel] [PATCH edk2-Platform v1 1/1] Hisilicon:Fix header file issues Message-ID: <20210804122442.xh6r3vpguwy3lazq@leviathan> References: <1624365205-126648-1-git-send-email-xiewenyi2@huawei.com> <1624365205-126648-2-git-send-email-xiewenyi2@huawei.com> MIME-Version: 1.0 In-Reply-To: <1624365205-126648-2-git-send-email-xiewenyi2@huawei.com> Content-Type: text/plain; charset=us-ascii Content-Disposition: inline +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 > 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/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 > -#include > +#include > #include > #include > #include > 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 > #include > -#include > +#include > #include > #include > #include > -- > 2.20.1.windows.1 > > > > > >