From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.groups.io with SMTP id smtpd.web10.612.1611601785119303715 for ; Mon, 25 Jan 2021 11:09:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=xwGSSjGd; spf=pass (domain: nuviainc.com, ip: 209.85.221.46, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f46.google.com with SMTP id p15so7453164wrq.8 for ; Mon, 25 Jan 2021 11:09:44 -0800 (PST) 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:user-agent; bh=OvMDNt4y2VxleWsGRrXor8B2/sTBIDUnxpti+lpw6LM=; b=xwGSSjGd8QtnkReVQkj2iO4oJuhXyr7prhneN+sosgLSBeZmcbMDws9P776HHoehOq Tj+tnQqkW+/BHdG2mjGkq1oJkrPSup7ITcnPn8lNhNryqI9sje0C98aUUYMk/TbRUArm 9kCo/3oIIqJ9nERIpt930kFCtpSOBZR81YPkAH3aXd0hOn/W7wyVnFXnFaNsL9KbMed5 JmakyR7Be1g9xeviKNuRmKCj/WXy0agpyVXX78p4NulXyjLvbtQtDW/3UciMDhtFKKWI BN9J7kWZZQ93khASJNUxB8t/cF/uxOVvgKeb24vHtYPbGKnU+2URdbUZFIMeSNB25/DI PnXA== 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:user-agent; bh=OvMDNt4y2VxleWsGRrXor8B2/sTBIDUnxpti+lpw6LM=; b=MkwnetuPcm+tUYXaqOPemLeyk+HKau0gdEiw9PU+TN16VSoiFMclHYslh06/FdhJBm ABCtKsHBFvVa8vFVgwiM/lNRHAzuhyOSII16HT5RkrYtObMojBE9W7hRlbiIByi2y+c4 cSDwzQWtQnDZxbIf3ZLoXKDZTXVj35KWu5aK4m5VzSwWljiUdoFeXLwn9lqnKQDsCCO4 WZA6giV8XtZk+4nGr8RpKTNaedsTH3IVBs3CmpXd76Auuf3ukp8bLfIH0ery2vb9irru PI0iueOin8yX2Gr5+Q5JglByEmukEnxudNawCnKXz1Q5sGX0RI1gvn8UGVtATjPsrGFg J2mw== X-Gm-Message-State: AOAM533R0OewXPlONwJhm9J6yjw+b6aLuViopr5GSpdvoRpW59x116Cl 5N72zukr++cEqX63CqIRUl0fWQ== X-Google-Smtp-Source: ABdhPJxM2LlY97IIoTvLZlSQSMmT7fASX1ei/x+6wrAdoWUR/nqgVh4U3SQMw/6gijhYWvKqtGTkMA== X-Received: by 2002:adf:c642:: with SMTP id u2mr2549793wrg.243.1611601783669; Mon, 25 Jan 2021 11:09:43 -0800 (PST) Return-Path: Received: from vanye (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id c2sm278551wmd.10.2021.01.25.11.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 11:09:43 -0800 (PST) Date: Mon, 25 Jan 2021 19:09:41 +0000 From: "Leif Lindholm" To: Rebecca Cran Cc: devel@edk2.groups.io, Ard Biesheuvel , nd@arm.com, Sami Mujawar , Liming Gao , Michael D Kinney , Zhiguang Liu Subject: Re: [PATCH v6 16/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type01 Message-ID: <20210125190941.GG1664@vanye> References: <20210114163628.31952-1-rebecca@nuviainc.com> <20210114163628.31952-17-rebecca@nuviainc.com> MIME-Version: 1.0 In-Reply-To: <20210114163628.31952-17-rebecca@nuviainc.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jan 14, 2021 at 09:36:22 -0700, Rebecca Cran wrote: > This code provides information for the SMBIOS Type 1 table. > > Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm > --- > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c | 36 ++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 196 ++++++++++++++++++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni | 20 ++ > 3 files changed, 252 insertions(+) > > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c > new file mode 100644 > index 000000000000..c03b133690ce > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerData.c > @@ -0,0 +1,36 @@ > +/** @file > + This file provides Smbios Type1 Data > + > + Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ > + > + Copyright (c) 2021, NUVIA Inc. All rights reserved.
> + Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.
> + Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> + Copyright (c) 2015, Linaro Limited. All rights reserved.
> + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include "SmbiosMisc.h" > + > + > +// > +// Static (possibly build generated) System Manufacturer data. > +// > +SMBIOS_MISC_TABLE_DATA(SMBIOS_TABLE_TYPE1, MiscSystemManufacturer) = { > + { // Hdr > + EFI_SMBIOS_TYPE_SYSTEM_INFORMATION, // Type, > + 0, // Length, > + 0 // Handle > + }, > + 1, // Manufacturer > + 2, // ProductName > + 3, // Version > + 4, // SerialNumber > + { // Uuid > + 0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} > + }, > + SystemWakeupTypePowerSwitch, // SystemWakeupType > + 5, // SKUNumber, > + 6 // Family > +}; > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > new file mode 100644 > index 000000000000..2c69c2593f5d > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c > @@ -0,0 +1,196 @@ > +/** @file > + This driver parses the mMiscSubclassDataTable structure and reports > + any generated data to smbios. > + > + Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ > + > + Copyright (c) 2021, NUVIA Inc. All rights reserved.
> + Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.
> + Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> + Copyright (c) 2015, Linaro Limited. All rights reserved.
> + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "SmbiosMisc.h" > + > +/** > + This function makes boot time changes to the contents of the > + MiscSystemManufacturer (Type 1) record. > + > + @param RecordData Pointer to SMBIOS table with default values. > + @param Smbios SMBIOS protocol. > + > + @retval EFI_SUCCESS The SMBIOS table was successfully added. > + @retval EFI_INVALID_PARAMETER Invalid parameter was found. > + @retval EFI_OUT_OF_RESOURCES Failed to allocate required memory. > + > +**/ > +SMBIOS_MISC_TABLE_FUNCTION(MiscSystemManufacturer) > +{ > + CHAR8 *OptionalStrStart; > + CHAR8 *StrStart; > + UINTN ManuStrLen; > + UINTN VerStrLen; > + UINTN PdNameStrLen; > + UINTN SerialNumStrLen; > + UINTN SKUNumStrLen; > + UINTN FamilyStrLen; > + UINTN RecordLength; > + EFI_STRING Manufacturer; > + EFI_STRING ProductName; > + EFI_STRING Version; > + EFI_STRING SerialNumber; > + EFI_STRING SKUNumber; > + EFI_STRING Family; > + EFI_STRING_ID TokenToGet; > + SMBIOS_TABLE_TYPE1 *SmbiosRecord; > + SMBIOS_TABLE_TYPE1 *InputData; > + EFI_STATUS Status; > + EFI_STRING_ID TokenToUpdate; > + CHAR16 *Product; > + CHAR16 *pVersion; > + > + Status = EFI_SUCCESS; > + > + // > + // First check for invalid parameters. > + // > + if (RecordData == NULL) { > + return EFI_INVALID_PARAMETER; > + } > + > + InputData = (SMBIOS_TABLE_TYPE1 *)RecordData; > + > + Product = (CHAR16 *) PcdGetPtr (PcdSystemProductName); > + if (StrLen (Product) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_SYSTEM_PRODUCT_NAME); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Product, NULL); > + } > + > + pVersion = (CHAR16 *) PcdGetPtr (PcdSystemVersion); > + if (StrLen (pVersion) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_SYSTEM_VERSION); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, pVersion, NULL); > + } > + > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_SYSTEM_SERIAL_NUMBER), > + SerialNumType01); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER), > + SystemManufacturerType01); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_SYSTEM_SKU_NUMBER), > + SkuNumberType01); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_SYSTEM_FAMILY), > + FamilyType01); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_MANUFACTURER); > + Manufacturer = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + ManuStrLen = StrLen (Manufacturer); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_PRODUCT_NAME); > + ProductName = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + PdNameStrLen = StrLen (ProductName); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_VERSION); > + Version = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + VerStrLen = StrLen (Version); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_SERIAL_NUMBER); > + SerialNumber = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + SerialNumStrLen = StrLen (SerialNumber); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_SKU_NUMBER); > + SKUNumber = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + SKUNumStrLen = StrLen (SKUNumber); > + > + TokenToGet = STRING_TOKEN (STR_MISC_SYSTEM_FAMILY); > + Family = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + FamilyStrLen = StrLen (Family); > + > + // > + // Two zeros following the last string. > + // > + RecordLength = sizeof (SMBIOS_TABLE_TYPE1) + > + ManuStrLen + 1 + > + PdNameStrLen + 1 + > + VerStrLen + 1 + > + SerialNumStrLen + 1 + > + SKUNumStrLen + 1 + > + FamilyStrLen + 1 + 1; > + SmbiosRecord = AllocateZeroPool (RecordLength); > + > + if (SmbiosRecord == NULL) { > + Status = EFI_OUT_OF_RESOURCES; > + goto Exit; > + } > + > + (VOID)CopyMem (SmbiosRecord, InputData, sizeof (SMBIOS_TABLE_TYPE1)); > + > + SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE1); > + > + CopyGuid(&SmbiosRecord->Uuid, &InputData->Uuid); > + > + OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); > + UnicodeStrToAsciiStrS (Manufacturer, OptionalStrStart, ManuStrLen + 1); > + StrStart = OptionalStrStart + ManuStrLen + 1; > + UnicodeStrToAsciiStrS (ProductName, StrStart, PdNameStrLen + 1); > + StrStart += PdNameStrLen + 1; > + UnicodeStrToAsciiStrS (Version, StrStart, VerStrLen + 1); > + StrStart += VerStrLen + 1; > + UnicodeStrToAsciiStrS (SerialNumber, StrStart, SerialNumStrLen + 1); > + StrStart += SerialNumStrLen + 1; > + UnicodeStrToAsciiStrS (SKUNumber, StrStart, SKUNumStrLen + 1); > + StrStart += SKUNumStrLen + 1; > + UnicodeStrToAsciiStrS (Family, StrStart, FamilyStrLen + 1); > + > + // > + // Now we have got the full smbios record, call smbios protocol to add this record. > + // > + Status = SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n", > + __FUNCTION__, __LINE__, Status)); > + } > + > + FreePool (SmbiosRecord); > + > +Exit: > + if (Manufacturer != NULL) { > + FreePool (Manufacturer); > + } > + > + if (ProductName != NULL) { > + FreePool (ProductName); > + } > + > + if (Version != NULL) { > + FreePool (Version); > + } > + > + if (SerialNumber != NULL) { > + FreePool (SerialNumber); > + } > + > + if (SKUNumber != NULL) { > + FreePool (SKUNumber); > + } > + > + if (Family != NULL) { > + FreePool (Family); > + } > + > + return Status; > +} > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni > new file mode 100644 > index 000000000000..8038f0e4b0bf > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturer.uni > @@ -0,0 +1,20 @@ > +/** @file > + Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ > + > + Copyright (c) 2021, NUVIA Inc. All rights reserved.
> + Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.
> + Copyright (c) 2015, Hisilicon Limited. All rights reserved.
> + Copyright (c) 2015, Linaro Limited. All rights reserved.
> + SPDX-License-Identifier: BSD-2-Clause-Patent > + > +**/ > + > +/=# > + > +#string STR_MISC_SYSTEM_MANUFACTURER #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_PRODUCT_NAME #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_PRODUCT_NAME #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_VERSION #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_SERIAL_NUMBER #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_SKU_NUMBER #language en-US "Not Specified" > +#string STR_MISC_SYSTEM_FAMILY #language en-US "Not Specified" > -- > 2.26.2 >