From nobody Tue Apr 16 17:24:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73564+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73564+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156989; cv=none; d=zohomail.com; s=zohoarc; b=D/nQ89WBDlmi/mNXp/XhUgc2Rv9YwEBR6KI4FupDH3axU0xqJ9OkR7x4S7QaVRvw6HWxFhaz65UtFd9+zP7wQQE7cF2eiwC8mLtOcGZgF5TRTkzTWbrKg98rpwnq3j28/c855HsxnN+405nqHj68bUlvHWIQnksguKTLosaH9wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156989; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=k4DLcbZy6FUnxwzV0Xg2d2zVdW7iKhgKHpuucM2lTsI=; b=BV9W+o+TxCD1qw1JQihc+1zxH+SuXcoF6nWQYW7KBT4N9YY9E9ipwK9khVJyMoKOmzI/9uNvaJ/UFXIWtUcjnvrzxBSPcnzkvjCdEnLWjpNnB9gtPXJ3BaUv+y494pooA18EIlN6iFC2ZxF4iGN8kGexdhSdLYyEW5VgJZCeuRU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73564+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156989363915.6746230756654; Tue, 30 Mar 2021 19:16:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id G8LbYY1788612xKiahIubqYd; Tue, 30 Mar 2021 19:16:28 -0700 X-Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by mx.groups.io with SMTP id smtpd.web08.1292.1617156988309078484 for ; Tue, 30 Mar 2021 19:16:28 -0700 X-Received: by mail-ot1-f45.google.com with SMTP id g8-20020a9d6c480000b02901b65ca2432cso17548700otq.3 for ; Tue, 30 Mar 2021 19:16:28 -0700 (PDT) X-Gm-Message-State: T04NjDKwCegIpIiYWpaNauBPx1787277AA= X-Google-Smtp-Source: ABdhPJy3txurvX/o8t8x2szJDmgELPS3+R1W8asode8aapQ5g/wGua+ko6fZRzphKalZCNw7DBnXTw== X-Received: by 2002:a05:6830:210e:: with SMTP id i14mr705443otc.229.1617156987431; Tue, 30 Mar 2021 19:16:27 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:27 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 1/5] ArmPkg: Allow platforms to override PCI supported state in SmbiosMiscDxe Date: Tue, 30 Mar 2021 20:16:15 -0600 Message-Id: <20210331021619.19761-2-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617156988; bh=NDACD/H7sexanb1tKXgmy268y/9lHopSVqkYU09eckE=; h=Cc:Date:From:Reply-To:Subject:To; b=Wd+NKTinIoAk611WgmV7KG7qxkbS9fd0I0qkWDzAzb4d6shpx2UkQ9YT+fDbGpN1lG9 eb95YytiDwLCPq+TPuiWoN5kQ1UifMu5wAGtuMrAOaNsymvg7tNo73Lyg6Zytt53PUmXB xk4wBm/DwNqZqJUn4U9buCjD/gjKyJBbEWI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Not all platforms support PCI, so introduce a PCD to allow platforms to specify whether they support it. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- ArmPkg/ArmPkg.dec | 1 + ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf | 1 + ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 4 = ++++ 3 files changed, 6 insertions(+) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index a8a22c649ff8..51ac2191c85a 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -125,6 +125,7 @@ [PcdsFixedAtBuild.common] # # SMBIOS PCDs # + gArmTokenSpaceGuid.PcdPlatformSupportsPCI|TRUE|BOOLEAN|0x30000052 gArmTokenSpaceGuid.PcdSystemProductName|L""|VOID*|0x30000053 gArmTokenSpaceGuid.PcdSystemVersion|L""|VOID*|0x30000054 gArmTokenSpaceGuid.PcdBaseBoardManufacturer|L""|VOID*|0x30000055 diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf b/ArmP= kg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf index 60d8fe31c219..ebc4c99ac436 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf @@ -71,6 +71,7 @@ [Pcd] gArmTokenSpaceGuid.PcdFdSize gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString + gArmTokenSpaceGuid.PcdPlatformSupportsPCI gArmTokenSpaceGuid.PcdSystemBiosRelease gArmTokenSpaceGuid.PcdEmbeddedControllerFirmwareRelease gArmTokenSpaceGuid.PcdSystemProductName diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFun= ction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFuncti= on.c index 5aea32521bd3..a06f814aeb7c 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include =20 @@ -264,6 +265,9 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) UnicodeStrToAsciiStrS (Version, StrStart, VerStrLen + 1); StrStart +=3D VerStrLen + 1; UnicodeStrToAsciiStrS (ReleaseDate, StrStart, DateStrLen + 1); + + SmbiosRecord->BiosCharacteristics.PciIsSupported =3D FixedPcdGetBool (Pc= dPlatformSupportsPCI); + // // Now we have got the full smbios record, call smbios protocol to add t= his record. // --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73564): https://edk2.groups.io/g/devel/message/73564 Mute This Topic: https://groups.io/mt/81741553/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue Apr 16 17:24:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73565+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73565+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156990; cv=none; d=zohomail.com; s=zohoarc; b=CYzCmdobKwmpBywIGKdSwVakVC/LChvc1a0nGP0wEmdlYsVIorBvConoYbWY5PKkmMepn8mIjR12scvYbyNRzVvYhqvj/iTmnJZxHfeWmSZDizFwba0qAB1K9/6JrGGuDAyvM1xrMhKMwoWch2wmdTZ2kixwRt3GjGmOgOwMdY4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156990; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=F8TrxY+voZfMjDo+Aj+WnTtD5F4GePVkqImwPWJXUNg=; b=Z+iVQMBtncB97HLe30O8CPmUrUbGQUkXRQlXz6IeKhj0oUtpNkjlhV50xme8/q5LTUcsADBDt1NuYYcGsJZgZNJoKBzXVi+BH9Rwo+vicmh67MI+XaIVOjpc4TyXhvY2RDiC8MPmxx5b3au7FQ72EPTK7EO0jrsT1Cn3rurl4Q8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73565+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156990370620.726740456693; Tue, 30 Mar 2021 19:16:30 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id jqyfYY1788612xDBQxfbAEky; Tue, 30 Mar 2021 19:16:29 -0700 X-Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) by mx.groups.io with SMTP id smtpd.web09.1270.1617156989378957572 for ; Tue, 30 Mar 2021 19:16:29 -0700 X-Received: by mail-oi1-f171.google.com with SMTP id k25so18566656oic.4 for ; Tue, 30 Mar 2021 19:16:29 -0700 (PDT) X-Gm-Message-State: IpwG9qG0dsIwN1AryRSYPvo8x1787277AA= X-Google-Smtp-Source: ABdhPJxLTut11ak7cWRY6XEft6YJoFcKqUjf327pqgKoDfP0P5aIWgH0hyLsJJl19zye7Ovi4xYq3w== X-Received: by 2002:aca:d485:: with SMTP id l127mr658065oig.21.1617156988474; Tue, 30 Mar 2021 19:16:28 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:28 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 2/5] ArmPkg: Allow platforms to supply more data for SMBIOS Type3 record Date: Tue, 30 Mar 2021 20:16:16 -0600 Message-Id: <20210331021619.19761-3-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617156989; bh=TjJftF2nU6tuneyOg/OYdnyg4ZcXr/TnusOojq8d8wU=; h=Cc:Date:From:Reply-To:Subject:To; b=DIH/ZB7AJfEVKS0HfEW+/Aua+OXAyrayeEGk0yeQcYG9G6IJHB9gbrgCXZBfFR4WQ0l HVVelYzXi3GbUJHlAaf/HlIlfrfRdcwm7V9wTSaU1itWercx6GP68ll6cs+LXFLd4kcFN xj+AvOSC7oc6Gpx5nm13qg1SYawrDU7nCM4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add OemMiscLib calls to allow platforms to provide the following information about the chassis: o Bootup state o Power supply/supplies state o Thermal state o Security state o Chassis height (in RMU) o Number of power cords Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- ArmPkg/Include/Library/OemMiscLib.h = | 60 ++++++++++++++ ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c = | 85 ++++++++++++++++++++ ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFuncti= on.c | 8 ++ 3 files changed, 153 insertions(+) diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 6dcc76a214df..25ae508ddb03 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -162,4 +162,64 @@ OemUpdateSmbiosInfo ( IN OEM_MISC_SMBIOS_HII_STRING_FIELD Field ); =20 +/** Fetches the chassis status when it was last booted. + + @return Chassis status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisBootupState ( + VOID + ); + +/** Fetches the chassis power supply/supplies status when last booted. + + @return Chassis power supply/supplies status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisPowerSupplyState ( + VOID + ); + +/** Fetches the chassis thermal status when last booted. + + @return Chassis thermal status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisThermalState ( + VOID + ); + +/** Fetches the chassis security status when last booted. + + @return Chassis security status. +**/ +MISC_CHASSIS_SECURITY_STATE +EFIAPI +OemGetChassisSecurityStatus ( + VOID + ); + +/** Fetches the chassis height in RMUs (Rack Mount Units). + + @return The height of the chassis. +**/ +UINT8 +EFIAPI +OemGetChassisHeight ( + VOID + ); + +/** Fetches the number of power cords. + + @return The number of power cords. +**/ +UINT8 +EFIAPI +OemGetChassisNumPowerCords ( + VOID + ); + #endif // OEM_MISC_LIB_H_ diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/U= niversal/Smbios/OemMiscLibNull/OemMiscLib.c index 21f106f1e060..e6a4793fe1c2 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c @@ -139,3 +139,88 @@ OemUpdateSmbiosInfo ( { ASSERT (FALSE); } + +/** Fetches the chassis status when it was last booted. + + @return Chassis status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisBootupState ( + VOID + ) +{ + ASSERT (FALSE); + return ChassisStateSafe; +} + +/** Fetches the chassis power supply/supplies status when last booted. + + @return Chassis power supply/supplies status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisPowerSupplyState ( + VOID + ) +{ + ASSERT (FALSE); + return ChassisStateSafe; +} + +/** Fetches the chassis thermal status when last booted. + + @return Chassis thermal status. +**/ +MISC_CHASSIS_STATE +EFIAPI +OemGetChassisThermalState ( + VOID + ) +{ + ASSERT (FALSE); + return ChassisStateSafe; +} + +/** Fetches the chassis security status when last booted. + + @return Chassis security status. +**/ +MISC_CHASSIS_SECURITY_STATE +EFIAPI +OemGetChassisSecurityStatus ( + VOID + ) +{ + ASSERT (FALSE); + return ChassisSecurityStatusNone; +} + +/** Fetches the chassis height in RMUs (Rack Mount Units). + + @return The height of the chassis. +**/ +UINT8 +EFIAPI +OemGetChassisHeight ( + VOID + ) +{ + ASSERT (FALSE); + return 1U; +} + +/** Fetches the number of power cords. + + @return The number of power cords. +**/ +UINT8 +EFIAPI +OemGetChassisNumPowerCords ( + VOID + ) +{ + ASSERT (FALSE); + return 1; +} + diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufa= cturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassis= ManufacturerFunction.c index fc4dba319aad..344343ed60a5 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c @@ -162,6 +162,14 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) UnicodeStrToAsciiStrS (AssertTag, StrStart, AssertTagStrLen + 1); StrStart +=3D AssertTagStrLen + 1; UnicodeStrToAsciiStrS (ChassisSkuNumber, StrStart, ChaNumStrLen + 1); + + SmbiosRecord->BootupState =3D OemGetChassisBootupState (); + SmbiosRecord->PowerSupplyState =3D OemGetChassisPowerSupplyState (); + SmbiosRecord->ThermalState =3D OemGetChassisThermalState (); + SmbiosRecord->SecurityStatus =3D OemGetChassisSecurityStatus (); + SmbiosRecord->Height =3D OemGetChassisHeight (); + SmbiosRecord->NumberofPowerCords =3D OemGetChassisNumPowerCords (); + // // Now we have got the full smbios record, call smbios protocol to add t= his record. // --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73565): https://edk2.groups.io/g/devel/message/73565 Mute This Topic: https://groups.io/mt/81741554/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue Apr 16 17:24:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73566+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73566+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156991; cv=none; d=zohomail.com; s=zohoarc; b=FMkS/AYr07PEcVgibjRNbfl1tfuVLe2Bw3ryY13fSpiH3DRqH4f5H4dz3Gv9xpLA2/61jCJ2K66mHtPiwbX206bADF6lUtIgxIXlO2CXw04noeX8CXGOwPANtK2zxzua4tU20A+YP3z1MeeIdtwzDLVlH4iX9E3Xy1vjvAKVhfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156991; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=I7wnXoiZv7/1B+PUne3I3FdR394IV5pPd8kD4dU/zgQ=; b=WqcPMdvCIWMv4K7JWn1xIwVb3XllZAEcKe/qkN12E01btJEO9uF6wmAlzMcoz2mL7+mG8sGYBUUBgFU7/4rwYmtrs0qQtAtUMjJ9jKMGE6VGhTk1bHIehVduyg9Rm18ZM1Zhm/QzkoM8VZx6twPuF+jL0AOgavVCldPfNFi8Rmo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73566+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156991699994.9167052263907; Tue, 30 Mar 2021 19:16:31 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id V2sLYY1788612xVLFmop36en; Tue, 30 Mar 2021 19:16:31 -0700 X-Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by mx.groups.io with SMTP id smtpd.web09.1271.1617156990305223847 for ; Tue, 30 Mar 2021 19:16:30 -0700 X-Received: by mail-oi1-f176.google.com with SMTP id n140so18547172oig.9 for ; Tue, 30 Mar 2021 19:16:30 -0700 (PDT) X-Gm-Message-State: RIXC7h9oXwwEBggkdsiD8QsAx1787277AA= X-Google-Smtp-Source: ABdhPJyooYq8yQm05n5U1jV6alJl8BJmX1JjlgMFIRG783E9uGt6pMulXKs3RgJlmXl95ZzWNAdgIg== X-Received: by 2002:aca:c791:: with SMTP id x139mr626897oif.91.1617156989435; Tue, 30 Mar 2021 19:16:29 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:29 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 3/5] ArmPkg: Allow platforms to report their boot status via OemMiscLib call Date: Tue, 30 Mar 2021 20:16:17 -0600 Message-Id: <20210331021619.19761-4-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617156991; bh=gYlvxCeXji3WJlblKJSdufMmj23VwXqaX8gkjphLvFM=; h=Cc:Date:From:Reply-To:Subject:To; b=DLhBVC1RZQze8FxQ+/tzD7jmg5rRVHHImUFb7Pv6zkjX9yZbLAul25KjxANAunlUefX ilND32BzeFobjaSmEvtma2H1RbMCPEsdz88hiTvBXjt+Z0nOuE2pgJW03Mh6NOdFe0rwd xNREtPAHISdwvZMQz/JnnUri4LsNTlzibEU= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Add a new function to OemMiscLib to allow platforms to report their boot status into the Type32 SMBIOS table. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- ArmPkg/Include/Library/OemMiscLib.h = | 10 ++++++++++ ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c = | 14 ++++++++++++++ ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c= | 3 +++ 3 files changed, 27 insertions(+) diff --git a/ArmPkg/Include/Library/OemMiscLib.h b/ArmPkg/Include/Library/O= emMiscLib.h index 25ae508ddb03..0b03fe8d4de3 100644 --- a/ArmPkg/Include/Library/OemMiscLib.h +++ b/ArmPkg/Include/Library/OemMiscLib.h @@ -162,6 +162,16 @@ OemUpdateSmbiosInfo ( IN OEM_MISC_SMBIOS_HII_STRING_FIELD Field ); =20 +/** Fetches the Type 32 boot information status. + + @return Boot status. +**/ +MISC_BOOT_INFORMATION_STATUS_DATA_TYPE +EFIAPI +OemGetBootStatus ( + VOID + ); + /** Fetches the chassis status when it was last booted. =20 @return Chassis status. diff --git a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c b/ArmPkg/U= niversal/Smbios/OemMiscLibNull/OemMiscLib.c index e6a4793fe1c2..74101beab1cb 100644 --- a/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c +++ b/ArmPkg/Universal/Smbios/OemMiscLibNull/OemMiscLib.c @@ -140,6 +140,20 @@ OemUpdateSmbiosInfo ( ASSERT (FALSE); } =20 +/** Fetches the Type 32 boot information status. + + @return Boot status. +**/ +MISC_BOOT_INFORMATION_STATUS_DATA_TYPE +EFIAPI +OemGetBootStatus ( + VOID + ) +{ + ASSERT (FALSE); + return BootInformationStatusNoError; +} + /** Fetches the chassis status when it was last booted. =20 @return Chassis status. diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformati= onFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInforma= tionFunction.c index 733615bbcf1a..4be1e1cd29a9 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunct= ion.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunct= ion.c @@ -16,6 +16,7 @@ #include #include #include +#include #include =20 #include "SmbiosMisc.h" @@ -59,6 +60,8 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBootInformation) =20 SmbiosRecord->Hdr.Length =3D sizeof (SMBIOS_TABLE_TYPE32); =20 + SmbiosRecord->BootStatus =3D OemGetBootStatus (); + // // Now we have got the full smbios record, call smbios protocol to add t= his record. // --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73566): https://edk2.groups.io/g/devel/message/73566 Mute This Topic: https://groups.io/mt/81741555/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue Apr 16 17:24:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73567+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73567+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156992; cv=none; d=zohomail.com; s=zohoarc; b=UmEnfGL4S6N0ROnxyqAcGdKy/O0Vd73n02QIjdCw4WSBBHmOFZPb7G9r3XXwgTj+gR9sqnE0ivmPsoSB/XyerWw4+8L+UdXfn3NHBH8U8Du+VgLeYbE6w5Nuw716St9St0EBecU2DVLWQIv/JfOk2wYMu7mlmarUsXu1feKMGNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156992; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=R4PUWncYUWcEnKI1BP1Xvs48Z4UcMYqg8TVpa5b3EKQ=; b=hZGxfPokzeTdXekwQFaW9tVNzGI8v9jbGh2DPyslW89W78RSJxM2Vv86AHIiQnR6GXlMY9MGA6ljFuv3RWtlSf4JoYpfEekWlOllg3AJ56FFk7NBtYssPz268IjE75YF6MiRB8tNMFNaumUi31g523PdyHfDYN185XpIrswmGxk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73567+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156992823166.98014059730076; Tue, 30 Mar 2021 19:16:32 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id hyH1YY1788612xLpLQpEKffq; Tue, 30 Mar 2021 19:16:32 -0700 X-Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by mx.groups.io with SMTP id smtpd.web12.1292.1617156991479806915 for ; Tue, 30 Mar 2021 19:16:31 -0700 X-Received: by mail-ot1-f45.google.com with SMTP id w31-20020a9d36220000b02901f2cbfc9743so17523132otb.7 for ; Tue, 30 Mar 2021 19:16:31 -0700 (PDT) X-Gm-Message-State: jkrxRGKBnErfRBKxNq7LBvB6x1787277AA= X-Google-Smtp-Source: ABdhPJy/33T6fx8L+Uj0szJE4uW/tIh4Dt/I5MuEe880jiYUiRlOCgM9h77p1evRCgJD6on2oaWRQw== X-Received: by 2002:a9d:921:: with SMTP id 30mr710339otp.49.1617156990609; Tue, 30 Mar 2021 19:16:30 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:30 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 4/5] ArmPkg: Fix calculation of offset of chassis SKU Number in SmbiosMiscDxe Date: Tue, 30 Mar 2021 20:16:18 -0600 Message-Id: <20210331021619.19761-5-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617156992; bh=yc1EeoqwdT+NmT1UKqCxveuk2g0wBO63Q4G+ekPmvcE=; h=Cc:Date:From:Reply-To:Subject:To; b=n9jpkZEUdk5H6/UjnaeE/IBlSO4w8oVGyyehfn2eCYkASo8nbnR8z/qS3LUrs1KoL0G T7Za4H//fKc8/15jBgoF4AyJu6QJe8K7XVx0StYIMJ4Trvo1PXkQryZ4CAcT1D/pdvjh0 EludaAIATDaI7r4GGeuIzCf7F6Z/LYIyZqA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The calculation of the chassis SKU number field was being calculated incorrectly, forgetting that there's one element already present in the structure. Fix the calculation and improve code readability by introducing a SkuNumberField variable. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerFuncti= on.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufa= cturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassis= ManufacturerFunction.c index 344343ed60a5..66e3e5327fc3 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c @@ -39,6 +39,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) { CHAR8 *OptionalStrStart; CHAR8 *StrStart; + UINT8 *SkuNumberField; UINTN RecordLength; UINTN ManuStrLen; UINTN VerStrLen; @@ -117,10 +118,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) ChaNumStrLen =3D StrLen (ChassisSkuNumber); =20 ContainedElementCount =3D InputData->ContainedElementCount; - - if (ContainedElementCount > 1) { - ExtendLength =3D (ContainedElementCount - 1) * sizeof (CONTAINED_ELEME= NT); - } + ExtendLength =3D ContainedElementCount * sizeof (CONTAINED_ELEMENT); =20 // // Two zeros following the last string. @@ -149,7 +147,11 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) (VOID)CopyMem (SmbiosRecord + 1, &ContainedElements, ExtendLength); =20 //ChassisSkuNumber - *((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TABLE_TYPE3) + ExtendLength) = =3D 5; + SkuNumberField =3D (UINT8 *)SmbiosRecord + + sizeof (SMBIOS_TABLE_TYPE3) - + sizeof (CONTAINED_ELEMENT) + ExtendLength; + + *SkuNumberField =3D 5; =20 OptionalStrStart =3D (CHAR8 *)((UINT8 *)SmbiosRecord + sizeof (SMBIOS_TA= BLE_TYPE3) + ExtendLength + 1); --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73567): https://edk2.groups.io/g/devel/message/73567 Mute This Topic: https://groups.io/mt/81741557/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Tue Apr 16 17:24:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+73568+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73568+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1617156993; cv=none; d=zohomail.com; s=zohoarc; b=iASbpqz0QIOgn/3699mUFIXHMWAr8wooIOCCosuKMla76MIf6v46jp9qb70Cf9e36cghIbquoPwrPt2aHSlz/rDCArUC1MBnKCmOA47YPEKXMpMf6oJMmCvnXAjB3x9PDphAlPxLtab8umCYlOhsf2Gc86cjKWhbS72yOieXbN0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617156993; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=dJJ2l4EE3ccpEpgK/cIXb87fhfXSiM4zcSerga9vWwI=; b=Ao49lisargdNp38IbayckniiITOcizf/+QSYeI2LFhyJrK/R3qo/D4ZD6q0IGFa3lRjRS6TlA3bYe4ISAx9V1mckc8YRDOv2eZtwIMCmp/sKB1q9YU748fGXfEr8B+CwetQF38706dNNKfigEEUsypBjS4A/nBFDtBSiHuP3AvM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+73568+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1617156993555174.93292070097027; Tue, 30 Mar 2021 19:16:33 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id npACYY1788612xneJvRvo3SF; Tue, 30 Mar 2021 19:16:33 -0700 X-Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by mx.groups.io with SMTP id smtpd.web10.1228.1617156992485590900 for ; Tue, 30 Mar 2021 19:16:32 -0700 X-Received: by mail-oi1-f182.google.com with SMTP id i3so18546058oik.7 for ; Tue, 30 Mar 2021 19:16:32 -0700 (PDT) X-Gm-Message-State: qcd2EMSsEVwUqBI4Rj6gu2bax1787277AA= X-Google-Smtp-Source: ABdhPJzZNrVpTwFuD0OqQDzVf8fU4X3/B3AW2TR/GNR3Gyb3LPmar797PhsBITonKHZwjUiyjEw1cA== X-Received: by 2002:a05:6808:3d9:: with SMTP id o25mr677417oie.4.1617156991555; Tue, 30 Mar 2021 19:16:31 -0700 (PDT) X-Received: from cube.nuviainc.com (c-174-52-16-57.hsd1.ut.comcast.net. [174.52.16.57]) by smtp.gmail.com with ESMTPSA id u11sm199996oif.10.2021.03.30.19.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 19:16:31 -0700 (PDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Leif Lindholm , Ard Biesheuvel Subject: [edk2-devel] [PATCH 5/5] ArmPkg: Fix typo of Manufacturer in comment in SmbiosMiscDxe Date: Tue, 30 Mar 2021 20:16:19 -0600 Message-Id: <20210331021619.19761-6-rebecca@nuviainc.com> In-Reply-To: <20210331021619.19761-1-rebecca@nuviainc.com> References: <20210331021619.19761-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,rebecca@nuviainc.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1617156993; bh=GP7f1wLoZn/yCxgTq3AEHVCqYcMutLk0p/G4oQ1WHck=; h=Cc:Date:From:Reply-To:Subject:To; b=iT9OJS4zIPAPJPwtfbm35ctmlPPCfKN61tiPZI3V5PbM1dg1o0byTjAo/8X599HTWgv OPx2cnePmKdRDb2Ha0wDVMFTh2DZsKOq9bxRARYQD94nNCjdb/wVZM9Bv/IxOprSuQ8dM 2Jpl7wn6fSmAGn+37sZn/VEPBI4fKBWtUno= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" 'Manufacturer' was spelled wrongly in a comment in MiscChassisManufacturerData.c. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerData.c= | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufa= cturerData.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManu= facturerData.c index 137bd941d0b1..29449b871902 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerD= ata.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerD= ata.c @@ -23,7 +23,7 @@ SMBIOS_MISC_TABLE_DATA(SMBIOS_TABLE_TYPE3, MiscChassisMan= ufacturer) =3D { 0, // Length, 0 // Handle }, - 1, // Manufactrurer + 1, // Manufacturer MiscChassisTypeMainServerChassis, // Type 2, // Version 3, // SerialNumber --=20 2.26.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#73568): https://edk2.groups.io/g/devel/message/73568 Mute This Topic: https://groups.io/mt/81741559/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-