From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web11.582.1611601824686779044 for ; Mon, 25 Jan 2021 11:10:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=jeWHl+ui; spf=pass (domain: nuviainc.com, ip: 209.85.221.47, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f47.google.com with SMTP id q7so14092941wre.13 for ; Mon, 25 Jan 2021 11:10:24 -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=xEKAHJXbEox21i5FW/i4C0/22b9jM3lcxW6lwlI3kvI=; b=jeWHl+uiLLHFl0erUZnHI27uI1D/Ix8bAHpS/DaAI7mc+HocqcicUYAJcVg5wahtMm 7Z7UkHw7PEMGoNRwQY8Zm237V/GTDZ0xH3ZTbDp5TXlPXM2qnZWNfx2CCy7L4MevFPeP 6Hpnksc3tgPo/hijxTp8fsE8ByJYpWM7KA7DuguJq6AxyQHYcL8cB1xEZv0hnM9m8HEp NeFCgwTXKJiq46YFJuE9rVSB15e/yp56jfwZD2oFfjREnn4e5qA/AyCTD0G0f7c9NEFO ruwi0fzBv2lUpOIYghAyoH6Geybz9/HmqdxaYEeF52bGEF812bMzsyKfTBHL6OKbou5K zSnw== 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=xEKAHJXbEox21i5FW/i4C0/22b9jM3lcxW6lwlI3kvI=; b=uO7ITogbbcVOvqsSUQnln1FsguGnk/OJello1+WD2fLWHahELLihVqFDtI6PaF6eRn RrEKiOdoLzlG4xjHk6M+II4tyl6YB48MknJjQ9aWFZxMaRaSajTR8621hnmswZKOjKcz OFewLMRDq5ekcYrnhXyfSWFX7l7OmpkjhyuOFW7YWw6NuriQMv0sMOqEJaX5iD4DnCSL O3oeTrPbyyEQ/q81fB6WAk07LEOdUAJ6qir6Pf/IAmTOgCkGmRNwSWBBrqKSScD9K0c9 jKCbMxexbtuS2OP57fU+AplE4CaOPXF4G2yechlFXucgg5hwCo0ZvAfliSVKbEOF8DXf 62Ug== X-Gm-Message-State: AOAM532DZZS+km8Hypljzpf5FW+WqnFHJyTaR/rxD5SIn22Si46JZsJo KSwpXf+ZtcC9YGSVHoJ1TzO74w== X-Google-Smtp-Source: ABdhPJzwBMom59GpgJIynhJLwCMUNVquj52VGw3+GaHMO1jM3lg+V8NGyA2mJKeYYYNIIz31cBnDzg== X-Received: by 2002:adf:ea51:: with SMTP id j17mr2686592wrn.382.1611601823232; Mon, 25 Jan 2021 11:10:23 -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 f189sm242074wmf.45.2021.01.25.11.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 11:10:22 -0800 (PST) Date: Mon, 25 Jan 2021 19:10:21 +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 17/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type02 Message-ID: <20210125191021.GH1664@vanye> References: <20210114163628.31952-1-rebecca@nuviainc.com> <20210114163628.31952-18-rebecca@nuviainc.com> MIME-Version: 1.0 In-Reply-To: <20210114163628.31952-18-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:23 -0700, Rebecca Cran wrote: > This code provides information for the SMBIOS Type 2 table. > > Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm > --- > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c | 46 ++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 230 ++++++++++++++++++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni | 20 ++ > 3 files changed, 296 insertions(+) > > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c > new file mode 100644 > index 000000000000..dfe1f2d45b92 > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerData.c > @@ -0,0 +1,46 @@ > +/** @file > + > + This file provide OEM to define Smbios Type2 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) Chassis Manufacturer data. > +// > +SMBIOS_MISC_TABLE_DATA(SMBIOS_TABLE_TYPE2, MiscBaseBoardManufacturer) = { > + { // Hdr > + EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION, // Type, > + 0, // Length, > + 0 // Handle > + }, > + 1, // BaseBoardManufacturer > + 2, // BaseBoardProductName > + 3, // BaseBoardVersion > + 4, // BaseBoardSerialNumber > + 5, // BaseBoardAssetTag > + { // FeatureFlag > + 1, // Motherboard :1 > + 0, // RequiresDaughterCard :1 > + 0, // Removable :1 > + 1, // Replaceable :1 > + 0, // HotSwappable :1 > + 0 // Reserved :3 > + }, > + 6, // BaseBoardChassisLocation > + 0, // ChassisHandle; > + BaseBoardTypeMotherBoard, // BoardType; > + 0, // NumberOfContainedObjectHandles; > + { > + 0 > + } // ContainedObjectHandles[1]; > +}; > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > new file mode 100644 > index 000000000000..097777a23904 > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c > @@ -0,0 +1,230 @@ > +/** @file > + This driver parses the mSmbiosMiscDataTable structure and reports > + any generated data using SMBIOS protocol. > + > + Based on files under Nt32Pkg/MiscSubClassPlatformDxe/ > + > + Copyright (c) 2021, NUVIA Inc. All rights reserved.
> + Copyright (c) 2009 - 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 > + MiscBaseBoardManufacturer (Type 2) 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(MiscBaseBoardManufacturer) > +{ > + CHAR8 *OptionalStrStart; > + CHAR8 *StrStart; > + UINTN RecordLength; > + UINTN ManuStrLen; > + UINTN ProductNameStrLen; > + UINTN VerStrLen; > + UINTN SerialNumStrLen; > + UINTN AssetTagStrLen; > + UINTN ChassisLocaStrLen; > + UINTN HandleCount; > + UINT16 *HandleArray; > + CHAR16 *BaseBoardManufacturer; > + CHAR16 *BaseBoardProductName; > + CHAR16 *Version; > + EFI_STRING SerialNumber; > + EFI_STRING AssetTag; > + EFI_STRING ChassisLocation; > + EFI_STRING_ID TokenToGet; > + SMBIOS_TABLE_TYPE2 *SmbiosRecord; > + SMBIOS_TABLE_TYPE2 *InputData; > + EFI_STATUS Status; > + > + EFI_STRING_ID TokenToUpdate; > + > + HandleCount = 0; > + HandleArray = NULL; > + InputData = NULL; > + > + // > + // First check for invalid parameters. > + // > + if (RecordData == NULL) { > + return EFI_INVALID_PARAMETER; > + } > + > + InputData = (SMBIOS_TABLE_TYPE2*)RecordData; > + > + BaseBoardManufacturer = (CHAR16 *) PcdGetPtr (PcdBaseBoardManufacturer); > + if (StrLen (BaseBoardManufacturer) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, BaseBoardManufacturer, NULL); > + } > + > + BaseBoardProductName = (CHAR16 *) PcdGetPtr (PcdBaseBoardProductName); > + if (StrLen (BaseBoardProductName) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BASE_BOARD_PRODUCT_NAME); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, BaseBoardProductName, NULL); > + } > + > + Version = (CHAR16 *) PcdGetPtr (PcdBaseBoardVersion); > + if (StrLen (Version) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BASE_BOARD_VERSION); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); > + } > + > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG), > + AssertTagType02 > + ); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_SERIAL_NUMBER), > + SerialNumberType02 > + ); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER), > + BoardManufacturerType02 > + ); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_SERIAL_NUMBER), > + SerialNumberType02 > + ); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_SKU_NUMBER), > + SerialNumberType02 > + ); > + OemUpdateSmbiosInfo (mSmbiosMiscHiiHandle, > + STRING_TOKEN (STR_MISC_BASE_BOARD_CHASSIS_LOCATION), > + ChassisLocationType02 > + ); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_MANUFACTURER); > + BaseBoardManufacturer = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + ManuStrLen = StrLen (BaseBoardManufacturer); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_PRODUCT_NAME); > + BaseBoardProductName = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + ProductNameStrLen = StrLen (BaseBoardProductName); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_VERSION); > + Version = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + VerStrLen = StrLen (Version); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_SERIAL_NUMBER); > + SerialNumber = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + SerialNumStrLen = StrLen (SerialNumber); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG); > + AssetTag = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + AssetTagStrLen = StrLen (AssetTag); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_CHASSIS_LOCATION); > + ChassisLocation = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + ChassisLocaStrLen = StrLen (ChassisLocation); > + > + // > + // Two zeros following the last string. > + // > + RecordLength = sizeof (SMBIOS_TABLE_TYPE2) + > + ManuStrLen + 1 + > + ProductNameStrLen + 1 + > + VerStrLen + 1 + > + SerialNumStrLen + 1 + > + AssetTagStrLen + 1 + > + ChassisLocaStrLen + 1 + 1; > + SmbiosRecord = AllocateZeroPool (RecordLength); > + if (SmbiosRecord == NULL) { > + Status = EFI_OUT_OF_RESOURCES; > + goto Exit; > + } > + > + (VOID)CopyMem (SmbiosRecord, InputData, sizeof (SMBIOS_TABLE_TYPE2)); > + SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE2); > + > + // > + // Update Contained objects Handle > + // > + SmbiosRecord->NumberOfContainedObjectHandles = 0; > + SmbiosMiscGetLinkTypeHandle (EFI_SMBIOS_TYPE_SYSTEM_ENCLOSURE, &HandleArray, > + &HandleCount); > + // It's assumed there's at most a single chassis > + ASSERT (HandleCount < 2); > + if (HandleCount > 0) { > + SmbiosRecord->ChassisHandle = HandleArray[0]; > + } > + > + FreePool (HandleArray); > + > + OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); > + UnicodeStrToAsciiStrS (BaseBoardManufacturer, OptionalStrStart, ManuStrLen + 1); > + > + StrStart = OptionalStrStart + ManuStrLen + 1; > + UnicodeStrToAsciiStrS (BaseBoardProductName, StrStart, ProductNameStrLen + 1); > + > + StrStart += ProductNameStrLen + 1; > + UnicodeStrToAsciiStrS (Version, StrStart, VerStrLen + 1); > + > + StrStart += VerStrLen + 1; > + UnicodeStrToAsciiStrS (SerialNumber, StrStart, SerialNumStrLen + 1); > + > + StrStart += SerialNumStrLen + 1; > + UnicodeStrToAsciiStrS (AssetTag, StrStart, AssetTagStrLen + 1); > + > + StrStart += AssetTagStrLen + 1; > + UnicodeStrToAsciiStrS (ChassisLocation, StrStart, ChassisLocaStrLen + 1); > + > + Status = SmbiosMiscAddRecord ((UINT8 *)SmbiosRecord, NULL); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n", > + __FUNCTION__, __LINE__, Status)); > + } > + > + FreePool (SmbiosRecord); > + > +Exit: > + if (BaseBoardManufacturer != NULL) { > + FreePool (BaseBoardManufacturer); > + } > + > + if (BaseBoardProductName != NULL) { > + FreePool (BaseBoardProductName); > + } > + > + if (Version != NULL) { > + FreePool (Version); > + } > + > + if (SerialNumber != NULL) { > + FreePool (SerialNumber); > + } > + > + if (AssetTag != NULL) { > + FreePool (AssetTag); > + } > + > + if (ChassisLocation != NULL) { > + FreePool (ChassisLocation); > + } > + > + return 0; > +} > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.uni > new file mode 100644 > index 000000000000..0f0fb1f93bbb > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacturer.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_BASE_BOARD_MANUFACTURER #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_PRODUCT_NAME #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_VERSION #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_SERIAL_NUMBER #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_ASSET_TAG #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_CHASSIS_LOCATION #language en-US "Not Specified" > +#string STR_MISC_BASE_BOARD_SKU_NUMBER #language en-US "Not Specified" > -- > 2.26.2 >