public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
@ 2020-09-09  8:52 wenyi,xie
  2020-09-09  8:52 ` [PATCH edk2-Platform v3 1/1] " wenyi,xie
  2020-11-25 14:26 ` [EXTERNAL] [PATCH edk2-Platform v3 0/1] " Leif Lindholm
  0 siblings, 2 replies; 4+ messages in thread
From: wenyi,xie @ 2020-09-09  8:52 UTC (permalink / raw)
  To: devel, leif, ard.biesheuvel, philmd
  Cc: michael.d.kinney, lersek, songdongkuang, xiewenyi2

Main Changes since v2:
Adding ASSERT_EFI_ERROR() to check the return code from UnicodeStrToAsciiStrS.

Wenyi Xie (1):
  Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one

 Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c                          |  3 ++-
 Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c                       | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c                 | 21 +++++++++++++-------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c            |  9 ++++++---
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c    | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c   | 15 +++++++++-----
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c |  3 ++-
 8 files changed, 70 insertions(+), 35 deletions(-)

-- 
2.20.1.windows.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH edk2-Platform v3 1/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
  2020-09-09  8:52 [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one wenyi,xie
@ 2020-09-09  8:52 ` wenyi,xie
  2020-11-25 14:26 ` [EXTERNAL] [PATCH edk2-Platform v3 0/1] " Leif Lindholm
  1 sibling, 0 replies; 4+ messages in thread
From: wenyi,xie @ 2020-09-09  8:52 UTC (permalink / raw)
  To: devel, leif, ard.biesheuvel, philmd
  Cc: michael.d.kinney, lersek, songdongkuang, xiewenyi2

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 <leif@nuviainc.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Wenyi Xie <xiewenyi2@huawei.com>
---

Notes:
    v3:
    - capture the return code [Ard]

 Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c                          |  3 ++-
 Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c                       | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c                 | 21 +++++++++++++-------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c            |  9 ++++++---
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c    | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 18 +++++++++++------
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c   | 15 +++++++++-----
 Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c |  3 ++-
 8 files changed, 70 insertions(+), 35 deletions(-)

diff --git a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
index 57e049a41da0..5927f66d5fd1 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c
@@ -135,7 +135,8 @@ AddSmbiosType9Record (
   (VOID)CopyMem (SmbiosRecord, Type9Record, sizeof (SMBIOS_TABLE_TYPE9));
   SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE9);
   OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1);
-  (VOID)UnicodeStrToAsciiStr (SlotDesignation, OptionalStrStart);
+  Status = UnicodeStrToAsciiStrS (SlotDesignation, OptionalStrStart, SlotStrLen + 1);
+  ASSERT_EFI_ERROR (Status);
 
   //
   // 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..9c66eed3f3ad 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c
@@ -625,12 +625,18 @@ 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);
+    Status = UnicodeStrToAsciiStrS (DeviceLocatorStr, OptionalStrStart, DeviceLocatorStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (BankLocatorStr, OptionalStrStart + DeviceLocatorStrLen + 1, BankLocatorStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ManufactureStr, OptionalStrStart + DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1, ManufactureStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SerialNumberStr, OptionalStrStart + DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1, SerialNumberStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (AssertTagStr, OptionalStrStart + DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + SerialNumberStrLen + 1, AssertTagStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (PartNumberStr, OptionalStrStart + DeviceLocatorStrLen + 1 + BankLocatorStrLen + 1 + ManufactureStrLen + 1 + SerialNumberStrLen + 1 + AssertTagStrLen + 1, PartNumberStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
 
     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..275b4f0e484a 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c
@@ -391,7 +391,8 @@ AddSmbiosCacheTypeTable (
         (VOID)CopyMem(Type7Record, &mSmbiosCacheTable[CacheLevel], sizeof (SMBIOS_TABLE_TYPE7));
 
         OptionalStrStart = (CHAR8 *) (Type7Record + 1);
-        UnicodeStrToAsciiStr (CacheSocketStr, OptionalStrStart);
+        Status = UnicodeStrToAsciiStrS (CacheSocketStr, OptionalStrStart, CacheSocketStrLen + 1);
+        ASSERT_EFI_ERROR (Status);
 
         SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;
         Status = mSmbios->Add (mSmbios, NULL, &SmbiosHandle, (EFI_SMBIOS_TABLE_HEADER *)Type7Record);
@@ -610,12 +611,18 @@ 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);
+    Status = UnicodeStrToAsciiStrS (ProcessorSocketStr, OptionalStrStart, ProcessorSocketStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ProcessorManuStr, OptionalStrStart + ProcessorSocketStrLen + 1, ProcessorManuStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ProcessorVersionStr, OptionalStrStart + ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1, ProcessorVersionStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SerialNumberStr, OptionalStrStart + ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 1, SerialNumberStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (AssetTagStr, OptionalStrStart + ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 1 + SerialNumberStrLen + 1, AssetTagStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (PartNumberStr, OptionalStrStart + ProcessorSocketStrLen + 1 + ProcessorManuStrLen + 1 + ProcessorVersionStrLen + 1 + SerialNumberStrLen + 1 + AssetTagStrLen + 1, PartNumberStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
 
     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..9bdc13c96a74 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c
@@ -213,9 +213,12 @@ 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);
+    Status = UnicodeStrToAsciiStrS (Vendor, OptionalStrStart, VendorStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (Version, OptionalStrStart + VendorStrLen + 1, VerStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ReleaseDate, OptionalStrStart + VendorStrLen + 1 + VerStrLen + 1, DateStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
     //
     // 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..32bdcf1bee74 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c
@@ -135,12 +135,18 @@ 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);
+    Status = UnicodeStrToAsciiStrS (Manufacturer, OptionalStrStart, ManuStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ProductName,  OptionalStrStart + ManuStrLen + 1, PdNameStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (Version,      OptionalStrStart + ManuStrLen + 1 + PdNameStrLen + 1, VerStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SerialNumber, OptionalStrStart + ManuStrLen + 1 + PdNameStrLen + 1 + VerStrLen + 1, SerialNumStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SKUNumber,    OptionalStrStart + ManuStrLen + 1 + PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1, SKUNumStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (Family,       OptionalStrStart + ManuStrLen + 1 + PdNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + SKUNumStrLen + 1, FamilyStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
 
     //
     // 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..278f97ddae66 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c
@@ -142,12 +142,18 @@ 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);
+    Status = UnicodeStrToAsciiStrS (BaseBoardManufacturer, OptionalStrStart, ManuStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (BaseBoardProductName,  OptionalStrStart + ManuStrLen + 1, ProductNameStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (Version,               OptionalStrStart + ManuStrLen + 1 + ProductNameStrLen + 1, VerStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SerialNumber,          OptionalStrStart + ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1, SerialNumStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (AssetTag,              OptionalStrStart + ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1, AssetTagStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ChassisLocation,       OptionalStrStart + ManuStrLen + 1 + ProductNameStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssetTagStrLen + 1, ChassisLocaStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
 
     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..27ad983afbcb 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c
@@ -147,11 +147,16 @@ 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);
+    Status = UnicodeStrToAsciiStrS (Manufacturer,     OptionalStrStart, ManuStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (Version,          OptionalStrStart + ManuStrLen + 1, VerStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (SerialNumber,     OptionalStrStart + ManuStrLen + 1 + VerStrLen + 1, SerialNumStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (AssertTag,        OptionalStrStart + ManuStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1, AssertTagStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
+    Status = UnicodeStrToAsciiStrS (ChassisSkuNumber, OptionalStrStart + ManuStrLen + 1 + VerStrLen + 1 + SerialNumStrLen +1 + AssertTagStrLen + 1, ChaNumStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
     //
     // 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..929288519780 100644
--- a/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
+++ b/Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c
@@ -172,7 +172,8 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscSystemSlotDesignation)
     SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE9);
 
     OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1);
-    UnicodeStrToAsciiStr(SlotDesignation, OptionalStrStart);
+    Status = UnicodeStrToAsciiStrS (SlotDesignation, OptionalStrStart, SlotDesignationStrLen + 1);
+    ASSERT_EFI_ERROR (Status);
     //
     // Now we have got the full smbios record, call smbios protocol to add this record.
     //
-- 
2.20.1.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [EXTERNAL] [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
  2020-09-09  8:52 [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one wenyi,xie
  2020-09-09  8:52 ` [PATCH edk2-Platform v3 1/1] " wenyi,xie
@ 2020-11-25 14:26 ` Leif Lindholm
  2020-11-26 10:42   ` wenyi,xie
  1 sibling, 1 reply; 4+ messages in thread
From: Leif Lindholm @ 2020-11-25 14:26 UTC (permalink / raw)
  To: Wenyi Xie
  Cc: devel, ard.biesheuvel, philmd, michael.d.kinney, lersek,
	songdongkuang

I am sorry, I managed to misfile this set.

On Wed, Sep 09, 2020 at 16:52:28 +0800, Wenyi Xie wrote:
> Main Changes since v2:
> Adding ASSERT_EFI_ERROR() to check the return code from
> UnicodeStrToAsciiStrS.

Reviewed-by: Leif Lindholm <leif@nuviainc.com>
Pushed as f37e98bfc00d.

However, the build still fails (for all of d03, d05, d06) due to
missing symbols in binary modules in edk2-non-osi.

Can you fix and post updated binaries required?
Please generate patches with --no-binary and include a link to a
repository which I can pick the commits directly from.

/
    Leif

> Wenyi Xie (1):
>   Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
> 
>  Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c                          |  3 ++-
>  Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c                       | 18 +++++++++++------
>  Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c                 | 21 +++++++++++++-------
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c            |  9 ++++++---
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c    | 18 +++++++++++------
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 18 +++++++++++------
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c   | 15 +++++++++-----
>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c |  3 ++-
>  8 files changed, 70 insertions(+), 35 deletions(-)
> 
> -- 
> 2.20.1.windows.1
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [EXTERNAL] [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
  2020-11-25 14:26 ` [EXTERNAL] [PATCH edk2-Platform v3 0/1] " Leif Lindholm
@ 2020-11-26 10:42   ` wenyi,xie
  0 siblings, 0 replies; 4+ messages in thread
From: wenyi,xie @ 2020-11-26 10:42 UTC (permalink / raw)
  To: Leif Lindholm
  Cc: devel, ard.biesheuvel, philmd, michael.d.kinney, lersek,
	songdongkuang

OK, I'm working on it.

Thanks
Wenyi

On 2020/11/25 22:26, Leif Lindholm wrote:
> I am sorry, I managed to misfile this set.
> 
> On Wed, Sep 09, 2020 at 16:52:28 +0800, Wenyi Xie wrote:
>> Main Changes since v2:
>> Adding ASSERT_EFI_ERROR() to check the return code from
>> UnicodeStrToAsciiStrS.
> 
> Reviewed-by: Leif Lindholm <leif@nuviainc.com>
> Pushed as f37e98bfc00d.
> 
> However, the build still fails (for all of d03, d05, d06) due to
> missing symbols in binary modules in edk2-non-osi.
> 
> Can you fix and post updated binaries required?
> Please generate patches with --no-binary and include a link to a
> repository which I can pick the commits directly from.
> 
> /
>     Leif
> 
>> Wenyi Xie (1):
>>   Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one
>>
>>  Silicon/Hisilicon/Drivers/Smbios/AddSmbiosType9/AddSmbiosType9.c                          |  3 ++-
>>  Silicon/Hisilicon/Drivers/Smbios/MemorySubClassDxe/MemorySubClass.c                       | 18 +++++++++++------
>>  Silicon/Hisilicon/Drivers/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c                 | 21 +++++++++++++-------
>>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c            |  9 ++++++---
>>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c    | 18 +++++++++++------
>>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 18 +++++++++++------
>>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c   | 15 +++++++++-----
>>  Silicon/Hisilicon/Drivers/Smbios/SmbiosMiscDxe/Type09/MiscSystemSlotDesignationFunction.c |  3 ++-
>>  8 files changed, 70 insertions(+), 35 deletions(-)
>>
>> -- 
>> 2.20.1.windows.1
>>
> .
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-11-26 10:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-09  8:52 [PATCH edk2-Platform v3 0/1] Hisilicon/Smbios: Replace DEPRECATED code with S-suffixed one wenyi,xie
2020-09-09  8:52 ` [PATCH edk2-Platform v3 1/1] " wenyi,xie
2020-11-25 14:26 ` [EXTERNAL] [PATCH edk2-Platform v3 0/1] " Leif Lindholm
2020-11-26 10: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