From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.groups.io with SMTP id smtpd.web10.591.1611601710903768695 for ; Mon, 25 Jan 2021 11:08:31 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@nuviainc-com.20150623.gappssmtp.com header.s=20150623 header.b=BgPLScIq; spf=pass (domain: nuviainc.com, ip: 209.85.221.45, mailfrom: leif@nuviainc.com) Received: by mail-wr1-f45.google.com with SMTP id m1so13408687wrq.12 for ; Mon, 25 Jan 2021 11:08:30 -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=x3DL55eaqK33Y3YTN5GJ+d1aq42gW7TGuD7AX3J6nmw=; b=BgPLScIqU3q9zxl43Wmxzka5hhXPWvhNIbBLEwjFLdfj4xdsdxl1HEYvszae+u21MY L4FRK2ROmaTr9KcFdRIRdxIWsMJPjHS6jZWJWTl/UUBGhvYBeyCPEXDwLYIzQvsbTSjV jhn4fPhgx6c2s2n1GXOJMZrl7BDi3FAkkYzfrde0qVTj/dEX6Y4xq2xebfoPgvLkiKb2 JYJYDD1z5jMisIHv8Z8D6COMGloxz5I+Y8oQ92hj2Vx0p4ZJudFSIfLaf4GumSkhaFzi 87SLIHZjXNi2ttpuMWULcIfpqpSA0r3FutATNawyTJwWBS/ARlSqXycjGxG6ni/42XZD vvyw== 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=x3DL55eaqK33Y3YTN5GJ+d1aq42gW7TGuD7AX3J6nmw=; b=gnLPYv0Kh7kyad+QX29a39JGBWsN4/9zKqKQMj/qG0YmcXxGOzNoPUnlcGgvQhhoDR 4pIW46dhdj7mSBmFI6OBQgvA//GDRpB5wk2nja/+XLh3M4tKwDjlwn6kLLuPcFkoG1K/ mUYRlusv0Bc1gzXCbfvuK7uVL/YWiqutRKSQElYRl29r+JmrwnQD8hvJjzZeCtli5qGc G1QCmzAqdBA+rtAR4jWshoq04+vG5s3P7LLudPJg7acabetjh3W/hN3h7E+pQH1BAvNA GzhTe+wsIRdseIZ1C2Q6ynI6VtCqeEbtsyZ5ETz3G6oPFoRqLdbjTy9EWOu73KKRV41s Wc5w== X-Gm-Message-State: AOAM531sGSEaE51a1fA7OhwtIhG2OH1Pdd/F2P29HNDadIRMtBBu01XE 841oY9zqINwhExYofAQxjIHKfg== X-Google-Smtp-Source: ABdhPJxk4zgwINlJPdRrsTr2Ns72psAJa71LOcy9COYKaxzlSpd+y2oQjaQ4llQsRJF8U21NYM5sMA== X-Received: by 2002:adf:9c88:: with SMTP id d8mr535424wre.132.1611601709444; Mon, 25 Jan 2021 11:08:29 -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 v7sm9649641wru.46.2021.01.25.11.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 11:08:28 -0800 (PST) Date: Mon, 25 Jan 2021 19:08:26 +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 15/22] ArmPkg: Add Universal/Smbios/SmbiosMiscDxe/Type00 Message-ID: <20210125190826.GF1664@vanye> References: <20210114163628.31952-1-rebecca@nuviainc.com> <20210114163628.31952-16-rebecca@nuviainc.com> MIME-Version: 1.0 In-Reply-To: <20210114163628.31952-16-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:21 -0700, Rebecca Cran wrote: > This code provides information for the SMBIOS Type 0 table. > > Signed-off-by: Rebecca Cran Minor whitespace comments below only, if addressed, please add Reviewed-by: Leif Lindholm > --- > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c | 93 ++++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 297 ++++++++++++++++++++ > ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni | 18 ++ > 3 files changed, 408 insertions(+) > > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c > new file mode 100644 > index 000000000000..edf0186aeae8 > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorData.c > @@ -0,0 +1,93 @@ > +/** @file > + This file provides Smbios Type0 Data > + > + Based on the 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) Bios Vendor data. > +// > +SMBIOS_MISC_TABLE_DATA(SMBIOS_TABLE_TYPE0, MiscBiosVendor) = { > + { // Hdr > + EFI_SMBIOS_TYPE_BIOS_INFORMATION, // Type, > + 0, // Length, > + 0 // Handle > + }, > + 1, // Vendor > + 2, // BiosVersion > + 0xE000, // BiosSegment > + 3, // BiosReleaseDate > + 0, // BiosSize > + { // BiosCharacteristics > + 0, // Reserved :2 > + 0, // Unknown :1 > + 0, // BiosCharacteristicsNotSupported :1 > + 0, // IsaIsSupported :1 > + 0, // McaIsSupported :1 > + 0, // EisaIsSupported :1 > + 1, // PciIsSupported :1 > + 0, // PcmciaIsSupported :1 > + 1, // PlugAndPlayIsSupported :1 > + 0, // ApmIsSupported :1 > + 1, // BiosIsUpgradable :1 > + 1, // BiosShadowingAllowed :1 > + 0, // VlVesaIsSupported :1 > + 0, // EscdSupportIsAvailable :1 > + 1, // BootFromCdIsSupported :1 > + 1, // SelectableBootIsSupported :1 > + 0, // RomBiosIsSocketed :1 > + 0, // BootFromPcmciaIsSupported :1 > + 0, // EDDSpecificationIsSupported :1 > + 0, // JapaneseNecFloppyIsSupported :1 > + 0, // JapaneseToshibaFloppyIsSupported :1 > + 0, // Floppy525_360IsSupported :1 > + 0, // Floppy525_12IsSupported :1 > + 0, // Floppy35_720IsSupported :1 > + 0, // Floppy35_288IsSupported :1 > + 0, // PrintScreenIsSupported :1 > + 0, // Keyboard8042IsSupported :1 > + 0, // SerialIsSupported :1 > + 0, // PrinterIsSupported :1 > + 0, // CgaMonoIsSupported :1 > + 0, // NecPc98 :1 > + 0 // ReservedForVendor :32 > + }, > + > + { > + 0x01, // BIOSCharacteristicsExtensionBytes[0] > + // { // BiosReserved > + // 1, // AcpiIsSupported :1 > + // 0, // UsbLegacyIsSupported :1 > + // 0, // AgpIsSupported :1 > + // 0, // I20BootIsSupported :1 > + // 0, // Ls120BootIsSupported :1 > + // 0, // AtapiZipDriveBootIsSupported :1 > + // 0, // Boot1394IsSupported :1 > + // 0 // SmartBatteryIsSupported :1 > + // }, > + 0x0C //BIOSCharacteristicsExtensionBytes[1] > + // { //SystemReserved > + // 0, //BiosBootSpecIsSupported :1 > + // 0, //FunctionKeyNetworkBootIsSupported :1 > + // 1, //TargetContentDistributionEnabled :1 > + // 1, //UefiSpecificationSupported :1 > + // 0, //VirtualMachineSupported :1 > + // 0 //ExtensionByte2Reserved :3 > + // }, > + }, > + 0xFF, // SystemBiosMajorRelease; > + 0xFF, // SystemBiosMinorRelease; > + 0xFF, // EmbeddedControllerFirmwareMajorRelease; > + 0xFF // EmbeddedControllerFirmwareMinorRelease; > +}; > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > new file mode 100644 > index 000000000000..dd8d062d4903 > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c > @@ -0,0 +1,297 @@ > +/** @file > + > + Copyright (c) 2021, NUVIA Inc. All rights reserved.
> + Copyright (c) 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 > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "SmbiosMisc.h" > + > + > +typedef struct { > + CONST CHAR8* MonthStr; > + UINT32 MonthInt; > +} MONTH_DESCRIPTION; > + > +STATIC CONST > +MONTH_DESCRIPTION mMonthDescription[] = { > + { "Jan", 1 }, > + { "Feb", 2 }, > + { "Mar", 3 }, > + { "Apr", 4 }, > + { "May", 5 }, > + { "Jun", 6 }, > + { "Jul", 7 }, > + { "Aug", 8 }, > + { "Sep", 9 }, > + { "Oct", 10 }, > + { "Nov", 11 }, > + { "Dec", 12 }, > + { "???", 1 }, // Use 1 as default month > +}; > + > +/** > + Field Filling Function. Transform an EFI_EXP_BASE2_DATA to a byte, with '64k' > + as the unit. > + > + @param Value Pointer to Base2_Data > + > + @retval > + > +**/ > +UINT8 > +Base2ToByteWith64KUnit ( > + IN UINTN Value > + ) > +{ > + UINT8 Size; > + > + Size = ((Value + (SIZE_64KB - 1)) >> 16); > + > + return Size; > +} > + > +/** > + Returns the date and time this file (and firmware) was built. > + > + @param[out] *Time Pointer to the EFI_TIME structure to fill in. > +**/ > +VOID > +GetReleaseTime ( > + OUT EFI_TIME *Time > + ) > +{ > + CONST CHAR8 *ReleaseDate = __DATE__; > + CONST CHAR8 *ReleaseTime = __TIME__; > + UINTN i; > + > + for (i = 0; i < 12; i++) { > + if (AsciiStrnCmp (ReleaseDate, mMonthDescription[i].MonthStr, 3) == 0) { > + break; > + } > + } > + > + Time->Month = mMonthDescription[i].MonthInt; > + Time->Day = AsciiStrDecimalToUintn (ReleaseDate + 4); > + Time->Year = AsciiStrDecimalToUintn (ReleaseDate + 7); > + Time->Hour = AsciiStrDecimalToUintn (ReleaseTime); > + Time->Minute = AsciiStrDecimalToUintn (ReleaseTime + 3); > + Time->Second = AsciiStrDecimalToUintn (ReleaseTime + 6); > +} > + > +/** > + Fetches the firmware ('BIOS') release date from the > + FirmwareVersionInfo HOB. > + > + @return The release date as a UTF-16 string > +**/ > +CHAR16 * > +GetBiosReleaseDate ( > + VOID > + ) > +{ > + CHAR16 *ReleaseDate; > + EFI_TIME BuildTime; > + > + ReleaseDate = AllocateZeroPool ((sizeof (CHAR16)) * SMBIOS_STRING_MAX_LENGTH); > + if (ReleaseDate == NULL) { > + return NULL; > + } > + > + GetReleaseTime (&BuildTime); > + > + (VOID)UnicodeSPrintAsciiFormat (ReleaseDate, > + (sizeof (CHAR16)) * SMBIOS_STRING_MAX_LENGTH, > + "%02d/%02d/%4d", > + BuildTime.Month, > + BuildTime.Day, > + BuildTime.Year > + ); Something strange about indentation. > + > + return ReleaseDate; > +} > + > +/** > + Fetches the firmware ('BIOS') version from the > + FirmwareVersionInfo HOB. > + > + @return The version as a UTF-16 string > +**/ > +CHAR16 * > +GetBiosVersion ( > + VOID > + ) > +{ > + CHAR16 *ReleaseString; > + > + ReleaseString = > + (CHAR16 *)FixedPcdGetPtr (PcdFirmwareVersionString); Does this line even need breaking? > + > + return ReleaseString; > +} > + > + > +/** > + This function makes boot time changes to the contents of the > + MiscBiosVendor (Type 0) 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 (MiscBiosVendor) > +{ > + CHAR8 *OptionalStrStart; > + CHAR8 *StrStart; > + UINTN VendorStrLen; > + UINTN VerStrLen; > + UINTN DateStrLen; > + UINTN BiosPhysicalSize; > + CHAR16 *Vendor; > + CHAR16 *Version; > + CHAR16 *ReleaseDate; > + CHAR16 *Char16String; > + EFI_STATUS Status; > + EFI_STRING_ID TokenToUpdate; > + EFI_STRING_ID TokenToGet; > + SMBIOS_TABLE_TYPE0 *SmbiosRecord; > + SMBIOS_TABLE_TYPE0 *InputData; > + > + // > + // First check for invalid parameters. > + // > + if (RecordData == NULL) { > + return EFI_INVALID_PARAMETER; > + } > + > + InputData = (SMBIOS_TABLE_TYPE0 *)RecordData; > + > + Vendor = (CHAR16 *) PcdGetPtr (PcdFirmwareVendor); > + > + if (StrLen (Vendor) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VENDOR); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Vendor, NULL); > + } > + > + Version = GetBiosVersion(); > + > + if (StrLen (Version) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); > + } else { > + Version = (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString); > + if (StrLen (Version) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_VERSION); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Version, NULL); > + } > + } > + > + Char16String = GetBiosReleaseDate (); > + if (StrLen(Char16String) > 0) { > + TokenToUpdate = STRING_TOKEN (STR_MISC_BIOS_RELEASE_DATE); > + HiiSetString (mSmbiosMiscHiiHandle, TokenToUpdate, Char16String, NULL); > + } > + > + TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VENDOR); > + Vendor = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + VendorStrLen = StrLen (Vendor); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BIOS_VERSION); > + Version = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + VerStrLen = StrLen (Version); > + > + TokenToGet = STRING_TOKEN (STR_MISC_BIOS_RELEASE_DATE); > + ReleaseDate = HiiGetPackageString (&gEfiCallerIdGuid, TokenToGet, NULL); > + DateStrLen = StrLen (ReleaseDate); > + > + // > + // Now update the BiosPhysicalSize > + // > + BiosPhysicalSize = FixedPcdGet32 (PcdFdSize); > + > + // > + // Two zeros following the last string. > + // > + SmbiosRecord = AllocateZeroPool (sizeof (SMBIOS_TABLE_TYPE0) + VendorStrLen + 1 + > + VerStrLen + 1 + > + DateStrLen + 1 + 1); > + if (SmbiosRecord == NULL) { > + Status = EFI_OUT_OF_RESOURCES; > + goto Exit; > + } > + > + (VOID)CopyMem (SmbiosRecord, InputData, sizeof (SMBIOS_TABLE_TYPE0)); > + > + SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE0); > + SmbiosRecord->BiosSegment = (UINT16)(FixedPcdGet32 (PcdFdBaseAddress) / SIZE_64KB); > + if (BiosPhysicalSize < SIZE_16MB) { > + SmbiosRecord->BiosSize = Base2ToByteWith64KUnit (BiosPhysicalSize) - 1; > + SmbiosRecord->ExtendedBiosSize.Size = BiosPhysicalSize / SIZE_1MB; > + SmbiosRecord->ExtendedBiosSize.Unit = 0; // Size is in MB > + } else { > + SmbiosRecord->BiosSize = 0xFF; > + if (BiosPhysicalSize > 0x3FFF) { > + SmbiosRecord->ExtendedBiosSize.Size = BiosPhysicalSize / SIZE_1GB; > + SmbiosRecord->ExtendedBiosSize.Unit = 1; // Size is in GB > + } > + } > + > + SmbiosRecord->SystemBiosMajorRelease = (UINT8) (PcdGet16 (PcdSystemBiosRelease) >> 8); > + SmbiosRecord->SystemBiosMinorRelease = (UINT8) (PcdGet16 (PcdSystemBiosRelease) & 0xFF); > + > + SmbiosRecord->EmbeddedControllerFirmwareMajorRelease = (UINT16) > + (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) >> 8); > + SmbiosRecord->EmbeddedControllerFirmwareMinorRelease = (UINT16) > + (PcdGet16 (PcdEmbeddedControllerFirmwareRelease) & 0xFF); > + > + OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); > + UnicodeStrToAsciiStrS (Vendor, OptionalStrStart, VendorStrLen + 1); > + StrStart = OptionalStrStart + VendorStrLen + 1; > + UnicodeStrToAsciiStrS (Version, StrStart, VerStrLen + 1); > + StrStart += VerStrLen + 1; > + UnicodeStrToAsciiStrS (ReleaseDate, StrStart, DateStrLen + 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 Type00 Table Log Failed! %r \n", Funky indentation. / Leif > + __FUNCTION__, __LINE__, Status)); > + } > + > + FreePool (SmbiosRecord); > + > +Exit: > + if (Vendor != NULL) { > + FreePool (Vendor); > + } > + > + if (Version != NULL) { > + FreePool (Version); > + } > + > + if (ReleaseDate != NULL) { > + FreePool (ReleaseDate); > + } > + > + if (Char16String != NULL) { > + FreePool (Char16String); > + } > + > + return Status; > +} > diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni > new file mode 100644 > index 000000000000..a3f068cdcca2 > --- /dev/null > +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendor.uni > @@ -0,0 +1,18 @@ > +/** @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_BIOS_VENDOR #language en-US "Not Specified" > +#string STR_MISC_BIOS_VERSION #language en-US "Not Specified" > +#string STR_MISC_BIOS_RELEASE_DATE #language en-US "Not Specified" > +#string STR_MISC_BIOS_VENDOR #language en-US "Not Specified" > +#string STR_MISC_BIOS_RELEASE_DATE #language en-US "12/02/2020" > -- > 2.26.2 >