From nobody Mon Nov 25 10:56:18 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+71804+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+71804+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613707073246582.051479622415; Thu, 18 Feb 2021 19:57:53 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id SRO6YY1788612xe6vDxHHAMj; Thu, 18 Feb 2021 19:57:52 -0800 X-Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by mx.groups.io with SMTP id smtpd.web08.4115.1613707072243620967 for ; Thu, 18 Feb 2021 19:57:52 -0800 X-Received: by mail-qk1-f181.google.com with SMTP id t63so4463728qkc.1 for ; Thu, 18 Feb 2021 19:57:52 -0800 (PST) X-Gm-Message-State: rQNoJVPGOUnbKV7PWBieRosQx1787277AA= X-Google-Smtp-Source: ABdhPJzAX0AJjPby8sgWz8/YXt+iJ9NqbxzCJHJ4+cVi9MxYAAKPliiAZ0rRr1dxdxSltax7ABmq4w== X-Received: by 2002:a37:8a04:: with SMTP id m4mr7687902qkd.78.1613707071084; Thu, 18 Feb 2021 19:57:51 -0800 (PST) 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 z28sm5633919qkj.72.2021.02.18.19.57.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 19:57:50 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Ard Biesheuvel , Leif Lindholm , Graeme Gregory , Radoslaw Biernacki Subject: [edk2-devel] [edk2-platforms PATCH v3 1/3] SbsaQemu: Add FdtHelperLib Date: Thu, 18 Feb 2021 20:57:39 -0700 Message-Id: <20210219035741.1467-2-rebecca@nuviainc.com> In-Reply-To: <20210219035741.1467-1-rebecca@nuviainc.com> References: <20210219035741.1467-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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=1613707072; bh=JtM1Gg3v3tc6VlRfB8iSgZ4hGp6O+stur1bYrHP2PaE=; h=Cc:Date:From:Reply-To:Subject:To; b=RYTZGJgVDRSIkzD3rolqZYRzejnOoJOWNCqa0z++2Z8gWmU/HF+g+gm4CMRiKSnqdll XyxSh4fRs43bjPqwKFdPKB5Tvc8FCjdfCeEApKHjj4/4spfeVXxOxhB7vfaeiwNm5uufY 0upWubbD6f/B1qG7X6hChtxIS6hR7NFogR8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" The CountCpusFromFdt function is now used in two places. Create FdtHelperLib for this and similar functions. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 2 + Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h | 24 +++++++ Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c | 69 +++++++++= +++++++++++ Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf | 28 ++++++++ 4 files changed, 123 insertions(+) diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/S= bsaQemu.dsc index f6af3f9111ee..8faad3eda217 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -121,6 +121,8 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE # ARM PL011 UART Driver PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf =20 + FdtHelperLib|Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf + # Debug Support PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCof= fExtraActionLib.inf DebugAgentLib|MdeModulePkg/Library/DebugAgentLibNull/DebugAgentLibNull.i= nf diff --git a/Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h b/Silicon= /Qemu/SbsaQemu/Include/Library/FdtHelperLib.h new file mode 100644 index 000000000000..eac47349a3d7 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Include/Library/FdtHelperLib.h @@ -0,0 +1,24 @@ +/** @file +* FdtHelperLib.h +* +* Copyright (c) 2021, NUVIA Inc. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + +#ifndef FDT_HELPER_LIB_ +#define FDT_HELPER_LIB_ + +/** Walks through the Device Tree created by Qemu and counts the number + of CPUs present in it. + + @return The number of CPUs present. +**/ +EFIAPI +UINT16 +CountCpusFromFdt ( + VOID + ); + +#endif /* FDT_HELPER_LIB_ */ diff --git a/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c b/Si= licon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c new file mode 100644 index 000000000000..c399fec5f9c7 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.c @@ -0,0 +1,69 @@ +/** @file +* FdtHelperLib.c +* +* Copyright (c) 2021, NUVIA Inc. All rights reserved. +* Copyright (c) 2020, Linaro Ltd. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + + +/** Walks through the Device Tree created by Qemu and counts the number + of CPUs present in it. + + @return The number of CPUs present. +**/ + +#include +#include +#include +#include +#include + +/** Walks through the Device Tree created by Qemu and counts the number + of CPUs present in it. + + @return The number of CPUs present. +**/ +EFIAPI +UINT16 +CountCpusFromFdt ( + VOID + ) +{ + VOID *DeviceTreeBase; + INT32 Node; + INT32 Prev; + INT32 CpuNode; + INT32 CpuCount; + + DeviceTreeBase =3D (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeBaseAddress); + ASSERT (DeviceTreeBase !=3D NULL); + + // Make sure we have a valid device tree blob + ASSERT (fdt_check_header (DeviceTreeBase) =3D=3D 0); + + CpuNode =3D fdt_path_offset (DeviceTreeBase, "/cpus"); + if (CpuNode <=3D 0) { + DEBUG ((DEBUG_ERROR, "Unable to locate /cpus in device tree\n")); + return 0; + } + + CpuCount =3D 0; + + // Walk through /cpus node and count the number of subnodes. + // The count of these subnodes corresponds to the number of + // CPUs created by Qemu. + Prev =3D fdt_first_subnode (DeviceTreeBase, CpuNode); + while (1) { + CpuCount++; + Node =3D fdt_next_subnode (DeviceTreeBase, Prev); + if (Node < 0) { + break; + } + Prev =3D Node; + } + + return CpuCount; +} diff --git a/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf b/= Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf new file mode 100644 index 000000000000..d84c16f888d1 --- /dev/null +++ b/Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf @@ -0,0 +1,28 @@ +#/** @file +# +# Component description file for FdtHelperLib module +# +# Copyright (c) 2021, NUVIA Inc. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#**/ + +[Defines] + INF_VERSION =3D 1.29 + BASE_NAME =3D FdtHelperLib + FILE_GUID =3D 34e4396f-c2fc-4f9e-ad58-0f98e99e3875 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D FdtHelperLib + +[Sources.common] + FdtHelperLib.c + +[Packages] + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/Qemu/SbsaQemu/SbsaQemu.dec + +[FixedPcd] + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress --=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 (#71804): https://edk2.groups.io/g/devel/message/71804 Mute This Topic: https://groups.io/mt/80748480/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 Mon Nov 25 10:56:18 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+71805+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+71805+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613707074406714.6286941170782; Thu, 18 Feb 2021 19:57:54 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id g7nhYY1788612xt8Tl8D3Y2Q; Thu, 18 Feb 2021 19:57:54 -0800 X-Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by mx.groups.io with SMTP id smtpd.web09.4172.1613707073461455061 for ; Thu, 18 Feb 2021 19:57:53 -0800 X-Received: by mail-qk1-f170.google.com with SMTP id w19so4390353qki.13 for ; Thu, 18 Feb 2021 19:57:53 -0800 (PST) X-Gm-Message-State: OqGK0ML0VhKjrjPwn1Q0yq0px1787277AA= X-Google-Smtp-Source: ABdhPJxqhlvrkApioqgPzAYvHlK43UQfDIYwHivTuN6EJAm2dVydHsMxgMS+/Y2Vq9nZ9tNPZVW2pg== X-Received: by 2002:a37:434c:: with SMTP id q73mr7984599qka.170.1613707072394; Thu, 18 Feb 2021 19:57:52 -0800 (PST) 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 z28sm5633919qkj.72.2021.02.18.19.57.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 19:57:52 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Ard Biesheuvel , Leif Lindholm , Graeme Gregory , Radoslaw Biernacki Subject: [edk2-devel] [edk2-platforms PATCH v3 2/3] SbsaQemu: Update SbsaQemuAcpiDxe to use FdtHelperLib Date: Thu, 18 Feb 2021 20:57:40 -0700 Message-Id: <20210219035741.1467-3-rebecca@nuviainc.com> In-Reply-To: <20210219035741.1467-1-rebecca@nuviainc.com> References: <20210219035741.1467-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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=1613707074; bh=tEZOpH2jGBzhLmEIX5JGOyOgyqXbO+EhV6XrFD7TFj0=; h=Cc:Date:From:Reply-To:Subject:To; b=Vp8Yk13mSsDBFVaoVBBUpWVDTWnaet1xwaQtYyIe049n9YXYwmk2qpBnKQkGeWxQzEu qTlsmnF4bYM1BtL1rYTNi8klR5qdfA9CdvHkGEwJftt0S8/sfJN/V3tskdhc5/njfrWEr 1E+pJVC+ouKYVfTTRv80Nb6v5jY3UP8LC/I= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" Use the copy of the CountCpusFromFdt function from FdtHelperLib. Signed-off-by: Rebecca Cran --- Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c | 50 +--= ----------------- Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf | 1 + 2 files changed, 2 insertions(+), 49 deletions(-) diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.= c b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c index fb7c1835c3d7..02ba3e452c06 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -25,55 +26,6 @@ STATIC INT32 FdtFirstCpuOffset; STATIC INT32 FdtCpuNodeSize; =20 -/* - * A function that walks through the Device Tree created - * by Qemu and counts the number of CPUs present in it. - */ -STATIC -VOID -CountCpusFromFdt ( - VOID -) -{ - VOID *DeviceTreeBase; - INT32 Node, Prev; - RETURN_STATUS PcdStatus; - INT32 CpuNode; - INT32 CpuCount; - - DeviceTreeBase =3D (VOID *)(UINTN)PcdGet64 (PcdDeviceTreeBaseAddress); - ASSERT (DeviceTreeBase !=3D NULL); - - // Make sure we have a valid device tree blob - ASSERT (fdt_check_header (DeviceTreeBase) =3D=3D 0); - - CpuNode =3D fdt_path_offset (DeviceTreeBase, "/cpus"); - if (CpuNode <=3D 0) { - DEBUG ((DEBUG_ERROR, "Unable to locate /cpus in device tree\n")); - return; - } - - CpuCount =3D 0; - - // Walk through /cpus node and count the number of subnodes. - // The count of these subnodes corresponds to the number of - // CPUs created by Qemu. - Prev =3D fdt_first_subnode (DeviceTreeBase, CpuNode); - FdtFirstCpuOffset =3D Prev; - while (1) { - CpuCount++; - Node =3D fdt_next_subnode (DeviceTreeBase, Prev); - if (Node < 0) { - break; - } - FdtCpuNodeSize =3D Node - Prev; - Prev =3D Node; - } - - PcdStatus =3D PcdSet32S (PcdCoreCount, CpuCount); - ASSERT_RETURN_ERROR (PcdStatus); -} - /* * Get MPIDR from device tree passed by Qemu */ diff --git a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.= inf b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf index 127eef029f3c..a58ebfaf76d5 100644 --- a/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf +++ b/Silicon/Qemu/SbsaQemu/Drivers/SbsaQemuAcpiDxe/SbsaQemuAcpiDxe.inf @@ -34,6 +34,7 @@ BaseLib DebugLib DxeServicesLib + FdtHelperLib FdtLib PcdLib PrintLib --=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 (#71805): https://edk2.groups.io/g/devel/message/71805 Mute This Topic: https://groups.io/mt/80748482/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 Mon Nov 25 10:56:18 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+71806+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+71806+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1613707076; cv=none; d=zohomail.com; s=zohoarc; b=F9y4tlTE51VnxqbBoKYj6yuXUVJ3w/vfuiwyIP38OcM9dm10R26zajTKEkBEnZ6xy0+EAiec2QSw7wbbfAob3FP5DqQzrxg/GTFBD64CvR05X7FagjBmnh8uqbwmvqtLKJylTY+mSALSH7suMy9/fu7Lqh6ggcX9MtDQMmJIY6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613707076; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=7yufZxpFyIuhrIOa8ZVcopU6yR2y1TBBpmX+1MQSzOA=; b=FGPaNj0tjQ9AepiNtxRyK99Gv8Zuuf9R2rtkyBlExyrafIE4X/G+Ri1sRCwWKTY89dWTHxotyQtpW8mQQlLg0+IG60yV6jtWy0MS4WLf5LVVUMuTRJ9MSCx3S1U3UXP+0DVy65+t3n6TUl7znSeFb31kEJLAzDvnxmKTu70vMN8= 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+71806+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1613707076384413.4084153587776; Thu, 18 Feb 2021 19:57:56 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id mkxqYY1788612x9vOcwA8yfj; Thu, 18 Feb 2021 19:57:55 -0800 X-Received: from mail-qk1-f174.google.com (mail-qk1-f174.google.com [209.85.222.174]) by mx.groups.io with SMTP id smtpd.web11.4150.1613707075359932899 for ; Thu, 18 Feb 2021 19:57:55 -0800 X-Received: by mail-qk1-f174.google.com with SMTP id 81so4446657qkf.4 for ; Thu, 18 Feb 2021 19:57:55 -0800 (PST) X-Gm-Message-State: 42KMK8vKKIKxoUICBxak6xezx1787277AA= X-Google-Smtp-Source: ABdhPJzpbnr661FgrLZ8ufMu151+KdIj0zEfJj1y1fb7MEUpPYXKG/qPOFeYWXZy8VYhfZk/Ul0ktA== X-Received: by 2002:a37:78f:: with SMTP id 137mr7757465qkh.208.1613707073900; Thu, 18 Feb 2021 19:57:53 -0800 (PST) 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 z28sm5633919qkj.72.2021.02.18.19.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Feb 2021 19:57:53 -0800 (PST) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Ard Biesheuvel , Leif Lindholm , Graeme Gregory , Radoslaw Biernacki Subject: [edk2-devel] [edk2-platforms PATCH v3 3/3] Platform/Qemu/SbsaQemu: Add SMBIOS tables Date: Thu, 18 Feb 2021 20:57:41 -0700 Message-Id: <20210219035741.1467-4-rebecca@nuviainc.com> In-Reply-To: <20210219035741.1467-1-rebecca@nuviainc.com> References: <20210219035741.1467-1-rebecca@nuviainc.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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=1613707075; bh=U75w6wiug9xqxKBQnsCJQ1h47ZNOa1Zms/11RYAD90w=; h=Cc:Date:From:Reply-To:Subject:To; b=kUT6nNewsN3o8bwEWoc1wZMw8LxubsfM8ltNNi6eKdF0LYSIMwjfhnt/gBe8M39i0Pk omUsDw2YzHIpXji+olCybbYN+Fpq2ON4wrKuJGg2lEP52llFwF/PNsGhhjjrNvd8F96Lp sNE0yEYHcctNSjPIMtPZ52G/G8BAGtChBQ8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" o Add SMBIOS 3.4.0 tables using ArmPkg/Universal/Smbios. o Bump the PcdSmbiosVersion PCD from 0x300 to 0x304 to indicate support for SMBIOS 3.4.0, as is required by SBBR. o Add an implementation of OemMiscLib that provides the system information. The serial numbers, asset tags etc. are currently all fixed strings, to allow fwts to pass without errors. o Add SMBIOS PCDs to identify the platform. The processor serial number, asset tag and part number are populated because otherwise fwts reports errors. Signed-off-by: Rebecca Cran Reviewed-by: Leif Lindholm --- Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c | 242 ++++++++++++++++++++ Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf | 53 +++++ Platform/Qemu/SbsaQemu/SbsaQemu.dsc | 48 +++- Platform/Qemu/SbsaQemu/SbsaQemu.fdf | 7 + Silicon/Qemu/SbsaQemu/SbsaQemu.dec | 18 ++ 5 files changed, 367 insertions(+), 1 deletion(-) diff --git a/Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c b/Platform/Qemu= /SbsaQemu/OemMiscLib/OemMiscLib.c new file mode 100644 index 000000000000..2244e04d0e43 --- /dev/null +++ b/Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.c @@ -0,0 +1,242 @@ +/** @file +* OemMiscLib.c +* +* Copyright (c) 2021, NUVIA Inc. All rights reserved. +* Copyright (c) 2020, Linaro Ltd. All rights reserved. +* +* SPDX-License-Identifier: BSD-2-Clause-Patent +* +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** Returns whether the specified processor is present or not. + + @param ProcessorIndex The processor index to check. + + @return TRUE if the processor is present, FALSE otherwise. +**/ +BOOLEAN +EFIAPI +OemIsProcessorPresent ( + UINTN ProcessorIndex + ) +{ + if (ProcessorIndex < CountCpusFromFdt ()) { + return TRUE; + } + + return FALSE; +} + +/** Gets the CPU frequency of the specified processor. + + @param ProcessorIndex Index of the processor to get the frequency for. + + @return CPU frequency in Hz +**/ +UINTN +EFIAPI +OemGetCpuFreq ( + UINT8 ProcessorIndex + ) +{ + return 2000000000; // 2 GHz +} + +/** Gets information about the specified processor and stores it in + the structures provided. + + @param ProcessorIndex Index of the processor to get the information for. + @param ProcessorStatus Processor status. + @param ProcessorCharacteristics Processor characteritics. + @param MiscProcessorData Miscellaneous processor information. + + @return TRUE on success, FALSE on failure. +**/ +BOOLEAN +EFIAPI +OemGetProcessorInformation ( + IN UINTN ProcessorIndex, + IN OUT PROCESSOR_STATUS_DATA *ProcessorStatus, + IN OUT PROCESSOR_CHARACTERISTIC_FLAGS *ProcessorCharacteristics, + IN OUT OEM_MISC_PROCESSOR_DATA *MiscProcessorData + ) +{ + UINT16 ProcessorCount; + + ProcessorCount =3D CountCpusFromFdt (); + + if (ProcessorIndex < ProcessorCount) { + ProcessorStatus->Bits.CpuStatus =3D 1; // CPU enabled + ProcessorStatus->Bits.Reserved1 =3D 0; + ProcessorStatus->Bits.SocketPopulated =3D 1; + ProcessorStatus->Bits.Reserved2 =3D 0; + } else { + ProcessorStatus->Bits.CpuStatus =3D 0; // CPU disabled + ProcessorStatus->Bits.Reserved1 =3D 0; + ProcessorStatus->Bits.SocketPopulated =3D 0; + ProcessorStatus->Bits.Reserved2 =3D 0; + } + + ProcessorCharacteristics->ProcessorReserved1 =3D 0; + ProcessorCharacteristics->ProcessorUnknown =3D 0; + ProcessorCharacteristics->Processor64BitCapable =3D 1; + ProcessorCharacteristics->ProcessorMultiCore =3D 0; + ProcessorCharacteristics->ProcessorHardwareThread =3D 0; + ProcessorCharacteristics->ProcessorExecuteProtection =3D 1; + ProcessorCharacteristics->ProcessorEnhancedVirtualization =3D 0; + ProcessorCharacteristics->ProcessorPowerPerformanceCtrl =3D 0; + ProcessorCharacteristics->Processor128BitCapable =3D 0; + ProcessorCharacteristics->ProcessorArm64SocId =3D 1; + ProcessorCharacteristics->ProcessorReserved2 =3D 0; + + MiscProcessorData->CurrentSpeed =3D 2000; + MiscProcessorData->MaxSpeed =3D 2000; + MiscProcessorData->CoreCount =3D 1; + MiscProcessorData->CoresEnabled =3D 1; + MiscProcessorData->ThreadCount =3D 1; + + return TRUE; +} + +/** Gets the maximum number of processors supported by the platform. + + @return The maximum number of processors. +**/ +UINT8 +EFIAPI +OemGetMaxProcessors ( + VOID + ) +{ + return CountCpusFromFdt (); +} + +/** Gets information about the cache at the specified cache level. + + @param ProcessorIndex The processor to get information for. + @param CacheLevel The cache level to get information for. + @param DataCache Whether the cache is a data cache. + @param UnifiedCache Whether the cache is a unified cache. + @param SmbiosCacheTable The SMBIOS Type7 cache information structure. + + @return TRUE on success, FALSE on failure. +**/ +BOOLEAN +EFIAPI +OemGetCacheInformation ( + IN UINT8 ProcessorIndex, + IN UINT8 CacheLevel, + IN BOOLEAN DataCache, + IN BOOLEAN UnifiedCache, + IN OUT SMBIOS_TABLE_TYPE7 *SmbiosCacheTable + ) +{ + SmbiosCacheTable->CacheConfiguration =3D CacheLevel - 1; + + if (CacheLevel =3D=3D 1 && !DataCache && !UnifiedCache) { + // Unknown operational mode + SmbiosCacheTable->CacheConfiguration |=3D (3 << 8); + } else { + // Write back operational mode + SmbiosCacheTable->CacheConfiguration |=3D (1 << 8); + } + + return TRUE; +} + +/** Gets the type of chassis for the system. + + @retval The type of the chassis. +**/ +MISC_CHASSIS_TYPE +EFIAPI +OemGetChassisType ( + VOID + ) +{ + return MiscChassisTypeMainServerChassis; +} + +/** Updates the HII string for the specified field. + + @param mHiiHandle The HII handle. + @param TokenToUpdate The string to update. + @param Field The field to get information about. +**/ +VOID +EFIAPI +OemUpdateSmbiosInfo ( + IN EFI_HII_HANDLE mHiiHandle, + IN EFI_STRING_ID TokenToUpdate, + IN OEM_MISC_SMBIOS_HII_STRING_FIELD Field + ) +{ + CHAR16 *String; + + // These values are fixed for now, but should be configurable via + // something like an emulated SCP. + switch (Field) { + case SystemManufacturerType01: + String =3D (CHAR16*)PcdGetPtr (PcdSystemManufacturer); + break; + case SerialNumType01: + String =3D (CHAR16*)PcdGetPtr (PcdSystemSerialNumber); + break; + case SkuNumberType01: + String =3D (CHAR16*)PcdGetPtr (PcdSystemSKU); + break; + case FamilyType01: + String =3D (CHAR16*)PcdGetPtr (PcdSystemFamily); + break; + case AssertTagType02: + String =3D (CHAR16*)PcdGetPtr (PcdBaseBoardAssetTag); + break; + case SerialNumberType02: + String =3D (CHAR16*)PcdGetPtr (PcdBaseBoardSerialNumber); + break; + case BoardManufacturerType02: + String =3D (CHAR16*)PcdGetPtr (PcdBaseBoardManufacturer); + break; + case SkuNumberType02: + String =3D (CHAR16*)PcdGetPtr (PcdBaseBoardSKU); + break; + case ChassisLocationType02: + String =3D (CHAR16*)PcdGetPtr (PcdBaseBoardLocation); + break; + case SerialNumberType03: + String =3D (CHAR16*)PcdGetPtr (PcdChassisSerialNumber); + break; + case VersionType03: + String =3D (CHAR16*)PcdGetPtr (PcdChassisVersion); + break; + case ManufacturerType03: + String =3D (CHAR16*)PcdGetPtr (PcdChassisManufacturer); + break; + case AssetTagType03: + String =3D (CHAR16*)PcdGetPtr (PcdChassisAssetTag); + break; + case SkuNumberType03: + String =3D (CHAR16*)PcdGetPtr (PcdChassisSKU); + break; + default: + String =3D NULL; + break; + } + + if (String !=3D NULL) { + HiiSetString (mHiiHandle, TokenToUpdate, String, NULL); + } +} + diff --git a/Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf b/Platform/Qe= mu/SbsaQemu/OemMiscLib/OemMiscLib.inf new file mode 100644 index 000000000000..04a07a55cee9 --- /dev/null +++ b/Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf @@ -0,0 +1,53 @@ +#/** @file +# OemMiscLib.inf +# +# Copyright (c) 2021, NUVIA Inc. All rights reserved. +# Copyright (c) 2018, Hisilicon Limited. All rights reserved. +# Copyright (c) 2018, Linaro Limited. All rights reserved. +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#**/ + +[Defines] + INF_VERSION =3D 1.29 + BASE_NAME =3D OemMiscLib + FILE_GUID =3D 958caf90-9e55-4e2a-86e0-71da21485e2c + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D OemMiscLib + +[Sources.common] + OemMiscLib.c + +[Packages] + ArmPkg/ArmPkg.dec + EmbeddedPkg/EmbeddedPkg.dec + MdeModulePkg/MdeModulePkg.dec + MdePkg/MdePkg.dec + Silicon/Qemu/SbsaQemu/SbsaQemu.dec + +[LibraryClasses] + BaseMemoryLib + FdtLib + FdtHelperLib + IoLib + PcdLib + +[Pcd] + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdDeviceTreeBaseAddress + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemManufacturer + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSerialNumber + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSKU + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemFamily + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardAssetTag + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSerialNumber + gArmTokenSpaceGuid.PcdBaseBoardManufacturer + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSKU + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardLocation + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSerialNumber + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisVersion + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisManufacturer + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisAssetTag + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSKU diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc b/Platform/Qemu/SbsaQemu/S= bsaQemu.dsc index 8faad3eda217..c1f8a4696560 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.dsc +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.dsc @@ -1,4 +1,5 @@ # +# Copyright (c) 2021, NUVIA Inc. All rights reserved. # Copyright (c) 2019, Linaro Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -122,6 +123,7 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf =20 FdtHelperLib|Silicon/Qemu/SbsaQemu/Library/FdtHelperLib/FdtHelperLib.inf + OemMiscLib|Platform/Qemu/SbsaQemu/OemMiscLib/OemMiscLib.inf =20 # Debug Support PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCof= fExtraActionLib.inf @@ -486,6 +488,23 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE # enumeration to complete before installing ACPI tables. gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|FALSE =20 + gArmTokenSpaceGuid.PcdSystemProductName|L"QEMU SBSA-REF Machine" + gArmTokenSpaceGuid.PcdSystemVersion|L"1.0" + gArmTokenSpaceGuid.PcdBaseBoardManufacturer|L"QEMU" + gArmTokenSpaceGuid.PcdBaseBoardProductName|L"SBSA-REF" + gArmTokenSpaceGuid.PcdBaseBoardVersion|L"1.0" + + # These values are fixed for now, but should be configurable via + # something like an emulated SCP. + gArmTokenSpaceGuid.PcdProcessorManufacturer|L"QEMU" + gArmTokenSpaceGuid.PcdProcessorVersion|L"arm-virt" + gArmTokenSpaceGuid.PcdProcessorSerialNumber|L"SN0000" + gArmTokenSpaceGuid.PcdProcessorAssetTag|L"AT0000" + gArmTokenSpaceGuid.PcdProcessorPartNumber|L"PN0000" + + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor|L"EFI Development Kit I= I / SbsaQemu" + gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString|L"1.0" + [PcdsDynamicDefault.common] gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3 =20 @@ -510,9 +529,28 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE # # SMBIOS entry point version # - gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0300 + gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0304 gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0 =20 + gArmTokenSpaceGuid.PcdSystemBiosRelease|0x0100 + gArmTokenSpaceGuid.PcdEmbeddedControllerFirmwareRelease|0x0100 + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemManufacturer|L"QEMU" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSerialNumber|L"SN0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSKU|L"SK0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemFamily|L"ArmVirt" + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardAssetTag|L"AT0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSerialNumber|L"SN0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSKU|L"SK000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardLocation|L"Internal" + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSerialNumber|L"SN0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisVersion|L"1.0" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisManufacturer|L"QEMU" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisAssetTag|L"AT0000" + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSKU|L"SK0000" + ##########################################################################= ###### # # Components Section - list of all EDK II Modules needed by this Platform @@ -670,6 +708,14 @@ DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf =20 + # + # SMBIOS support + # + ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf + ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf + EmbeddedPkg/Library/FdtLib/FdtLib.inf + MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf + # # PCI support # diff --git a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf b/Platform/Qemu/SbsaQemu/S= bsaQemu.fdf index 3bcf0bf0040a..c35e3ed44054 100644 --- a/Platform/Qemu/SbsaQemu/SbsaQemu.fdf +++ b/Platform/Qemu/SbsaQemu/SbsaQemu.fdf @@ -236,6 +236,13 @@ READ_LOCK_STATUS =3D TRUE INF RuleOverride =3D ACPITABLE Silicon/Qemu/SbsaQemu/AcpiTables/AcpiTabl= es.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphic= sResourceTableDxe.inf =20 + # + # SMBIOS support + # + INF ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClassDxe.inf + INF ArmPkg/Universal/Smbios/SmbiosMiscDxe/SmbiosMiscDxe.inf + INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf + # # PCI support # diff --git a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec b/Silicon/Qemu/SbsaQemu/Sbs= aQemu.dec index 476dc82f98f3..3abc9b64e49e 100644 --- a/Silicon/Qemu/SbsaQemu/SbsaQemu.dec +++ b/Silicon/Qemu/SbsaQemu/SbsaQemu.dec @@ -50,3 +50,21 @@ [PcdsDynamic.common] gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdCoreCount|0x1|UINT32|0x00000100 gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdClusterCount|0x1|UINT32|0x0000= 0101 + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemManufacturer|L""|VOID*|0= x00000110 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSerialNumber|L""|VOID*|0= x00000111 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemSKU|L""|VOID*|0x00000112 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdSystemFamily|L""|VOID*|0x00000= 113 + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardAssetTag|L""|VOID*|0x= 00000114 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSerialNumber|L""|VOID= *|0x00000115 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardManufacturer|L""|VOID= *|0x00000116 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardSKU|L""|VOID*|0x00000= 117 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdBaseBoardLocation|L""|VOID*|0x= 00000118 + + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSerialNumber|L""|VOID*|= 0x00000119 + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisVersion|L""|VOID*|0x000= 0011A + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisManufacturer|L""|VOID*|= 0x0000011B + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisAssetTag|L""|VOID*|0x00= 00011C + gArmVirtSbsaQemuPlatformTokenSpaceGuid.PcdChassisSKU|L""|VOID*|0x0000011D + --=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 (#71806): https://edk2.groups.io/g/devel/message/71806 Mute This Topic: https://groups.io/mt/80748483/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-