From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=j9otF6xl; spf=pass (domain: linaro.org, ip: 209.85.166.195, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by groups.io with SMTP; Fri, 17 May 2019 08:43:14 -0700 Received: by mail-it1-f195.google.com with SMTP id i63so12706538ita.3 for ; Fri, 17 May 2019 08:43:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wi9UDMu0Ro+cpcyb07fBUnZL/pn0iJhLLBH+pzoAn6U=; b=j9otF6xl5ArKWcIqRoW1Yc2nMJrl3aKP/NNG/mgaKP30uPVCq7TC7fXL6PX3kOLmf1 pUeFl4wdYPLiqnWenvfJ7g85bR/nhd4vNGf11Uy1t9N1fMSfNm8sCeCkFAIZmSNYz/+x 0Ce0w3boDkQ5Lhv5j3WvoEMkriSDLtELEptVJ9J8Qvx/gzSodj53rAI+8ZC5Ug0iSuUf +McDly1O0g1ea5r8n39UFaUkFzG+qA3APuWrpkoM3VZbjz+ilcQyY1ZX7WstJJJ0+Qn3 FvoTdDJvGMbsBwB/R54fHKY2FsuAjlHKb3m8QNDJSNqardax3U7u1vkJDxXPJvtaaGJJ KWoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wi9UDMu0Ro+cpcyb07fBUnZL/pn0iJhLLBH+pzoAn6U=; b=eDzJ+HrbqmDWZLHnaoo9fFyZT0pzwWkcMMVfuH282EvEcc/E/bWat2dBnUsvRom/aY x9u4UEYiJsIPPmJBo1HebfvUW6i2Xf7HD0VuPYCWMnEOWZaVDRPA18wp2zD6dk8uXYzv c3Yze8mFUs39GaJynsAKkB2GXsED0d/ObCfJmoIwdf81hiaXaeJoJ7uHV/3XWlhS+pra joeukxszXqlMpwtK4KFjgBpK9HNz/v1/880ysPnivUv6hIOQXGKu1/pqnoUkRcdHUqtr lg8kLrwqogajUDR5+LGlNkhT7Hg9HzxPTDgwpXRPP9MapGeWQ42O5kfyCaxLdfA0wc5C a7AA== X-Gm-Message-State: APjAAAW8qRxzVSoVPY0VHGupsdkdUrUu5DMaPP5xkGNQMHV6cQ4GlT/z 3soYAVSrb9bGT/5pFnIKtrqP5PnMXAAkl11rjPdOgg== X-Google-Smtp-Source: APXvYqw7m+9s7kQwF8FMfVM+tKAEqL2aqFUVrmLtbOkf4wy7JMk8OaWCDNbx5Tp8PEAiBjKVK0qCSfkGE+aG36ARMio= X-Received: by 2002:a24:d00e:: with SMTP id m14mr17150463itg.153.1558107793744; Fri, 17 May 2019 08:43:13 -0700 (PDT) MIME-Version: 1.0 References: <20190514020831.7728-1-hao.a.wu@intel.com> <20190514020831.7728-14-hao.a.wu@intel.com> In-Reply-To: <20190514020831.7728-14-hao.a.wu@intel.com> From: "Ard Biesheuvel" Date: Fri, 17 May 2019 17:43:00 +0200 Message-ID: Subject: Re: [edk2-platforms][PATCH v1 11/16] Silicon/Hisilicon/Smbios: Drop IntelFramework[Module]Pkg dependency To: Hao A Wu Cc: edk2-devel-groups-io , Leif Lindholm , Michael D Kinney Content-Type: text/plain; charset="UTF-8" On Tue, 14 May 2019 at 04:08, Hao A Wu wrote: > > REF:https://bugzilla.tianocore.org/show_bug.cgi?id=1800 > > The below 3 Smbios drivers have dependency on IntelFramework[Module]Pkg: > * MemorySubClassDxe > * ProcessorSubClassDxe > * SmbiosMiscDxe > > Their dependency is on the header file: > IntelFrameworkPkg/Include/FrameworkDxe.h > > for definition 'STRING_REF'. This definition can be replaced by > 'EFI_STRING_ID', which is defined within MdePkg. > > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Cc: Michael D Kinney > Signed-off-by: Hao A Wu Reviewed-by: Ard Biesheuvel > --- > Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf | 2 -- > Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf | 1 - > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 2 -- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h | 1 - > Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c | 4 +--- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 4 ++-- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 4 ++-- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 4 ++-- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c | 2 +- > Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c | 4 ++-- > 10 files changed, 10 insertions(+), 18 deletions(-) > > diff --git a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf > index 94f6fe404c..a4e2a255f5 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf > +++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClassDxe.inf > @@ -28,8 +28,6 @@ > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - IntelFrameworkPkg/IntelFrameworkPkg.dec > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > > Silicon/Hisilicon/HisiliconNonOsi.dec > Silicon/Hisilicon/HisiPkg.dec > diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > index 808da65cd4..9dfa3f879f 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf > @@ -30,7 +30,6 @@ > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - IntelFrameworkPkg/IntelFrameworkPkg.dec > > Silicon/Hisilicon/HisiliconNonOsi.dec > Silicon/Hisilicon/HisiPkg.dec > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf > index 0c37b53af9..e38d2ac1e9 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf > @@ -56,8 +56,6 @@ > ArmPkg/ArmPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > - IntelFrameworkPkg/IntelFrameworkPkg.dec > - IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec > Silicon/Hisilicon/HisiliconNonOsi.dec > Silicon/Hisilicon/HisiPkg.dec > > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h > index 66f9db9665..3bf3cbdd1c 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/SmbiosMisc.h > @@ -25,7 +25,6 @@ Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ > #ifndef _SMBIOS_MISC_DRIVER_H > #define _SMBIOS_MISC_DRIVER_H > > -#include > #include > #include > #include > diff --git a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > index c9903ba535..f2f88e7d86 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c > @@ -15,8 +15,6 @@ > > #include "ProcessorSubClass.h" > > -#include > - > EFI_HII_HANDLE mHiiHandle; > > EFI_SMBIOS_PROTOCOL *mSmbios; > @@ -487,7 +485,7 @@ AddSmbiosProcessorTypeTable ( > PROCESSOR_CHARACTERISTICS_DATA ProcessorCharacteristics = {{0}}; > > CHAR16 *CpuVersion; > - STRING_REF TokenToUpdate; > + EFI_STRING_ID TokenToUpdate; > > UINT64 *ProcessorId; > Type4Record = NULL; > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > index 9a42f04085..6c15a804c2 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > @@ -128,8 +128,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor) > CHAR16 *ReleaseDate; > CHAR16 *Char16String; > EFI_STATUS Status; > - STRING_REF TokenToUpdate; > - STRING_REF TokenToGet; > + EFI_STRING_ID TokenToUpdate; > + EFI_STRING_ID TokenToGet; > SMBIOS_TABLE_TYPE0 *SmbiosRecord; > EFI_SMBIOS_HANDLE SmbiosHandle; > SMBIOS_TABLE_TYPE0 *InputData; > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > index 5e965c996c..8baf0bbc67 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > @@ -52,12 +52,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer) > EFI_STRING SerialNumber; > EFI_STRING SKUNumber; > EFI_STRING Family; > - STRING_REF TokenToGet; > + EFI_STRING_ID TokenToGet; > EFI_SMBIOS_HANDLE SmbiosHandle; > SMBIOS_TABLE_TYPE1 *SmbiosRecord; > SMBIOS_TABLE_TYPE1 *InputData; > EFI_STATUS Status; > - STRING_REF TokenToUpdate; > + EFI_STRING_ID TokenToUpdate; > CHAR16 *Product; > CHAR16 *pVersion; > > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > index a141f9e7d7..cef6887d3f 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > @@ -54,13 +54,13 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > EFI_STRING SerialNumber; > EFI_STRING AssetTag; > EFI_STRING ChassisLocation; > - STRING_REF TokenToGet; > + EFI_STRING_ID TokenToGet; > EFI_SMBIOS_HANDLE SmbiosHandle; > SMBIOS_TABLE_TYPE2 *SmbiosRecord; > SMBIOS_TABLE_TYPE2 *InputData = NULL; > EFI_STATUS Status; > > - STRING_REF TokenToUpdate; > + EFI_STRING_ID TokenToUpdate; > //CHAR16 *ProductName; > //CHAR16 *pVersion; > //uniBIOS_y00216284_018_end 2015-1-13 09:08:22 > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > index 4bb170117d..6f6f354b91 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c > @@ -67,7 +67,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer) > EFI_STRING SerialNumber; > EFI_STRING AssertTag; > EFI_STRING ChassisSkuNumber; > - STRING_REF TokenToGet; > + EFI_STRING_ID TokenToGet; > EFI_SMBIOS_HANDLE SmbiosHandle; > SMBIOS_TABLE_TYPE3 *SmbiosRecord; > SMBIOS_TABLE_TYPE3 *InputData; > diff --git a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c > index 945fd4c6e3..0fa4903460 100644 > --- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c > +++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c > @@ -29,7 +29,7 @@ UpdateSlotDesignation ( > IN SMBIOS_TABLE_TYPE9 *InputData > ) > { > - STRING_REF TokenToUpdate; > + EFI_STRING_ID TokenToUpdate; > CHAR16 *SlotDesignation; > UINTN DesignationStrLen; > > @@ -140,7 +140,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation) > UINTN SlotDesignationStrLen; > EFI_STATUS Status; > EFI_STRING SlotDesignation; > - STRING_REF TokenToGet; > + EFI_STRING_ID TokenToGet; > SMBIOS_TABLE_TYPE9 *SmbiosRecord; > EFI_SMBIOS_HANDLE SmbiosHandle; > SMBIOS_TABLE_TYPE9 *InputData = NULL; > -- > 2.12.0.windows.1 >