Re: [edk2-devel] [PATCH edk2-Platform v2 1/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one

Wed, 09 Sep 2020 00:28:32 -0700 

On 9/9/20 5:03 AM, Wenyi Xie wrote:

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2777

The deprecated code under DISABLE_NEW_DEPRECATED_INTERFACES
will be removed, which will result in compilation breakage
of the Hisilicon platforms. Prevent that by switching to
S-suffixed one.

Cc: Leif Lindholm <l...@nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheu...@arm.com>
Cc: Philippe Mathieu-Daudé <phi...@redhat.com>
Signed-off-by: Wenyi Xie <xiewen...@huawei.com>
The whole point of the UnicodeStrToAsciiStrS() routine is that it returns a status code, and so it can fail. So please capture the return code, and at least use ASSERT_EFI_ERROR() on it so any errors are flagged in DEBUG mode. 



---
  Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c              
            |  2 +-
  Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c           
            | 12 ++++++------
  Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c     
            | 14 +++++++-------
  
Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c  
          |  6 +++---
  
Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
    | 12 ++++++------
  
Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
 | 12 ++++++------
  
Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
   | 10 +++++-----
  
Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
 |  2 +-
  8 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c 
b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
index 57e049a41da0..4c8c693db039 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
@@ -135,7 +135,7 @@ AddSmbiosType9Record (
    (VOID)CopyMem (SmbiosRecord, Type9Record, sizeof (SMBIOS_TABLE_TYPE9));
    SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE9);
    OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1);
-  (VOID)UnicodeStrToAsciiStr (SlotDesignation, OptionalStrStart);
+  UnicodeStrToAsciiStrS (SlotDesignation, OptionalStrStart, SlotStrLen + 1);
// 
    // Now we have got the full smbios record, call smbios protocol to add this 
record.
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c 
b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
index a1af02047409..f438ddcb5dd6 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
@@ -625,12 +625,12 @@ SmbiosAddType17Table (
      SmbiosGetDimmVoltageInfo (pGblData, Skt, Ch, Dimm, Type17Record);
OptionalStrStart = (CHAR8 *) (Type17Record + 1); 
-    UnicodeStrToAsciiStr (DeviceLocatorStr, OptionalStrStart);
-    UnicodeStrToAsciiStr (BankLocatorStr, OptionalStrStart + 
DeviceLocatorStrLen + 1);
-    UnicodeStrToAsciiStr (ManufactureStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1);
-    UnicodeStrToAsciiStr (SerialNumberStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1);
-    UnicodeStrToAsciiStr (AssertTagStr, OptionalStrStart + DeviceLocatorStrLen 
+ 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + SerialNumberStrLen + 1);
-    UnicodeStrToAsciiStr (PartNumberStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + 
SerialNumberStrLen + 1 + AssertTagStrLen + 1);
+    UnicodeStrToAsciiStrS (DeviceLocatorStr, OptionalStrStart, 
DeviceLocatorStrLen + 1);
+    UnicodeStrToAsciiStrS (BankLocatorStr, OptionalStrStart + 
DeviceLocatorStrLen + 1, BankLocatorStrLen + 1);
+    UnicodeStrToAsciiStrS (ManufactureStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1, ManufactureStrLen + 1);
+    UnicodeStrToAsciiStrS (SerialNumberStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1, 
SerialNumberStrLen + 1);
+    UnicodeStrToAsciiStrS (AssertTagStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + 
SerialNumberStrLen + 1, AssertTagStrLen + 1);
+    UnicodeStrToAsciiStrS (PartNumberStr, OptionalStrStart + 
DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + 
SerialNumberStrLen + 1 + AssertTagStrLen + 1, PartNumberStrLen + 1);
MemDevSmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; 
      Status = mSmbios->Add (mSmbios, NULL, &MemDevSmbiosHandle, 
(EFI_SMBIOS_TABLE_HEADER*) Type17Record);
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c 
b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
index 647632f15ac2..0aa206d79cbb 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
@@ -391,7 +391,7 @@ AddSmbiosCacheTypeTable (
          (VOID)CopyMem(Type7Record, &mSmbiosCacheTable[CacheLevel], sizeof 
(SMBIOS_TABLE_TYPE7));
OptionalStrStart = (CHAR8 *) (Type7Record + 1); 
-        UnicodeStrToAsciiStr (CacheSocketStr, OptionalStrStart);
+        UnicodeStrToAsciiStrS (CacheSocketStr, OptionalStrStart, 
CacheSocketStrLen + 1);
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; 
          Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle, 
(EFI_SMBIOS_TABLE_HEADER *)Type7Record);
@@ -610,12 +610,12 @@ AddSmbiosProcessorTypeTable (
      *ProcessorId = ArmReadMidr();
OptionalStrStart = (CHAR8 *) (Type4Record + 1); 
-    UnicodeStrToAsciiStr (ProcessorSocketStr, OptionalStrStart);
-    UnicodeStrToAsciiStr (ProcessorManuStr, OptionalStrStart + 
ProcessorSocketStrLen + 1);
-    UnicodeStrToAsciiStr (ProcessorVersionStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1);
-    UnicodeStrToAsciiStr (SerialNumberStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1);
-    UnicodeStrToAsciiStr (AssetTagStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1 + SerialNumberStrLen + 1);
-    UnicodeStrToAsciiStr (PartNumberStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1 + SerialNumberStrLen + 1 + AssetTagStrLen + 1);
+    UnicodeStrToAsciiStrS (ProcessorSocketStr, OptionalStrStart, 
ProcessorSocketStrLen + 1);
+    UnicodeStrToAsciiStrS (ProcessorManuStr, OptionalStrStart + 
ProcessorSocketStrLen + 1, ProcessorManuStrLen + 1);
+    UnicodeStrToAsciiStrS (ProcessorVersionStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1, ProcessorVersionStrLen + 
1);
+    UnicodeStrToAsciiStrS (SerialNumberStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1, SerialNumberStrLen + 1);
+    UnicodeStrToAsciiStrS (AssetTagStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1 + SerialNumberStrLen + 1, AssetTagStrLen + 1);
+    UnicodeStrToAsciiStrS (PartNumberStr, OptionalStrStart + 
ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 
1 + SerialNumberStrLen + 1 + AssetTagStrLen + 1, PartNumberStrLen + 1);
SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED; 
      Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle, 
(EFI_SMBIOS_TABLE_HEADER *)Type4Record);
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
index b62ec1dd8fdf..abd766ac8ad9 100644
--- 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++ 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
@@ -213,9 +213,9 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBiosVendor)
      SmbiosRecord->BiosSize = Base2ToByteWith64KUnit(BiosPhysicalSizeHexValue) 
- 1;
OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); 
-    UnicodeStrToAsciiStr(Vendor, OptionalStrStart);
-    UnicodeStrToAsciiStr(Version, OptionalStrStart + VendorStrLen + 1);
-    UnicodeStrToAsciiStr(ReleaseDate, OptionalStrStart + VendorStrLen + 1 + 
VerStrLen + 1);
+    UnicodeStrToAsciiStrS (Vendor, OptionalStrStart, VendorStrLen + 1);
+    UnicodeStrToAsciiStrS (Version, OptionalStrStart + VendorStrLen + 1, 
VerStrLen + 1);
+    UnicodeStrToAsciiStrS (ReleaseDate, OptionalStrStart + VendorStrLen + 1 + 
VerStrLen + 1, DateStrLen + 1);
      //
      // Now we have got the full smbios record, call smbios protocol to add 
this record.
      //
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
index f829b09d9cb7..4c16afa04206 100644
--- 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
+++ 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
@@ -135,12 +135,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemManufacturer)
      }
OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); 
-    UnicodeStrToAsciiStr(Manufacturer, OptionalStrStart);
-    UnicodeStrToAsciiStr(ProductName,  OptionalStrStart + ManuStrLen + 1);
-    UnicodeStrToAsciiStr(Version,      OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1);
-    UnicodeStrToAsciiStr(SerialNumber, OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1);
-    UnicodeStrToAsciiStr(SKUNumber,    OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1);
-    UnicodeStrToAsciiStr(Family,       OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + SKUNumStrLen + 1);
+    UnicodeStrToAsciiStrS (Manufacturer, OptionalStrStart, ManuStrLen + 1);
+    UnicodeStrToAsciiStrS (ProductName,  OptionalStrStart + ManuStrLen + 1, 
PdNameStrLen + 1);
+    UnicodeStrToAsciiStrS (Version,      OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1, VerStrLen + 1);
+    UnicodeStrToAsciiStrS (SerialNumber, OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1, SerialNumStrLen + 1);
+    UnicodeStrToAsciiStrS (SKUNumber,    OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1, SKUNumStrLen + 1);
+    UnicodeStrToAsciiStrS (Family,       OptionalStrStart + ManuStrLen + 1 + 
PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + SKUNumStrLen + 1, 
FamilyStrLen + 1);
// 
      // Now we have got the full smbios record, call smbios protocol to add 
this record.
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
index 3834bf93f70b..20bb001bb33c 100644
--- 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
+++ 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
@@ -142,12 +142,12 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
      FreePool(HandleArray);
OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); 
-    UnicodeStrToAsciiStr(BaseBoardManufacturer, OptionalStrStart);
-    UnicodeStrToAsciiStr(BaseBoardProductName,  OptionalStrStart + ManuStrLen 
+ 1);
-    UnicodeStrToAsciiStr(Version,               OptionalStrStart + ManuStrLen 
+ 1 + ProductNameStrLen + 1);
-    UnicodeStrToAsciiStr(SerialNumber,          OptionalStrStart + ManuStrLen 
+ 1 + ProductNameStrLen + 1 + VerStrLen + 1);
-    UnicodeStrToAsciiStr(AssetTag,              OptionalStrStart + ManuStrLen 
+ 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 );
-    UnicodeStrToAsciiStr(ChassisLocation,       OptionalStrStart + ManuStrLen 
+ 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + 
AssetTagStrLen + 1);
+    UnicodeStrToAsciiStrS (BaseBoardManufacturer, OptionalStrStart, ManuStrLen 
+ 1);
+    UnicodeStrToAsciiStrS (BaseBoardProductName,  OptionalStrStart + 
ManuStrLen + 1, ProductNameStrLen + 1);
+    UnicodeStrToAsciiStrS (Version,               OptionalStrStart + 
ManuStrLen + 1 + ProductNameStrLen + 1, VerStrLen + 1);
+    UnicodeStrToAsciiStrS (SerialNumber,          OptionalStrStart + 
ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1, SerialNumStrLen + 1);
+    UnicodeStrToAsciiStrS (AssetTag,              OptionalStrStart + 
ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1, 
AssetTagStrLen + 1);
+    UnicodeStrToAsciiStrS (ChassisLocation,       OptionalStrStart + 
ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + 
AssetTagStrLen + 1, ChassisLocaStrLen + 1);
Status = LogSmbiosData( (UINT8*)SmbiosRecord, &SmbiosHandle); 
      if(EFI_ERROR(Status))
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
index ec00e1cd10ad..cd98cc966322 100644
--- 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++ 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
@@ -147,11 +147,11 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscChassisManufacturer)
      *((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TABLE_TYPE3) + ExtendLength) = 5;
OptionalStrStart = (CHAR8 *)((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TABLE_TYPE3) + ExtendLength + 1); 
-    UnicodeStrToAsciiStr(Manufacturer,     OptionalStrStart);
-    UnicodeStrToAsciiStr(Version,          OptionalStrStart + ManuStrLen + 1);
-    UnicodeStrToAsciiStr(SerialNumber,     OptionalStrStart + ManuStrLen + 1 + 
VerStrLen + 1);
-    UnicodeStrToAsciiStr(AssertTag,        OptionalStrStart + ManuStrLen + 1 + 
VerStrLen + 1 + SerialNumStrLen + 1);
-    UnicodeStrToAsciiStr(ChassisSkuNumber, OptionalStrStart + ManuStrLen + 1 + 
VerStrLen + 1 + SerialNumStrLen +1 + AssertTagStrLen + 1);
+    UnicodeStrToAsciiStrS (Manufacturer,     OptionalStrStart, ManuStrLen + 1);
+    UnicodeStrToAsciiStrS (Version,          OptionalStrStart + ManuStrLen + 
1, VerStrLen + 1);
+    UnicodeStrToAsciiStrS (SerialNumber,     OptionalStrStart + ManuStrLen + 1 
+ VerStrLen + 1, SerialNumStrLen + 1);
+    UnicodeStrToAsciiStrS (AssertTag,        OptionalStrStart + ManuStrLen + 1 
+ VerStrLen + 1 + SerialNumStrLen + 1, AssertTagStrLen + 1);
+    UnicodeStrToAsciiStrS (ChassisSkuNumber, OptionalStrStart + ManuStrLen + 1 
+ VerStrLen + 1 + SerialNumStrLen +1 + AssertTagStrLen + 1, ChaNumStrLen + 1);
      //
      // Now we have got the full smbios record, call smbios protocol to add 
this record.
      //
diff --git 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
index ca1a7a2c0055..e03b28d2f6aa 100644
--- 
a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
+++ 
b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -172,7 +172,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation)
      SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE9);
OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); 
-    UnicodeStrToAsciiStr(SlotDesignation, OptionalStrStart);
+    UnicodeStrToAsciiStrS (SlotDesignation, OptionalStrStart, 
SlotDesignationStrLen + 1);
      //
      // Now we have got the full smbios record, call smbios protocol to add 
this record.
      //




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#65154): https://edk2.groups.io/g/devel/message/65154
Mute This Topic: https://groups.io/mt/76725391/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to