From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:54572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJbyr-0003IL-5R for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:51:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJbqq-0000Np-CR for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:43:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJbqq-0000Ls-2e for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:43:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 486288123D for ; Thu, 25 Apr 2019 10:43:35 +0000 (UTC) From: Laszlo Ersek Date: Thu, 25 Apr 2019 12:43:25 +0200 Message-Id: <20190425104326.12835-2-lersek@redhat.com> In-Reply-To: <20190425104326.12835-1-lersek@redhat.com> References: <20190425104326.12835-1-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 1/2] tests/uefi-test-tools: report the SMBIOS entry point structures List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu devel list Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Igor Mammedov On UEFI systems, the SMBIOS entry point (a.k.a. anchor) structures are found similarly to the ACPI RSD PTR table(s): by scanning the ConfigurationTable array in the EFI system table for well-known GUIDs. Locate the SMBIOS 2.1 (32-bit) and 3.0 (64-bit) anchors in the BiosTablesTest UEFI application, and report the addresses in new fields appended to the BIOS_TABLES_TEST structure. Cc: "Philippe Mathieu-Daud=C3=A9" Cc: Igor Mammedov Launchpad: https://bugs.launchpad.net/qemu/+bug/1821884 Signed-off-by: Laszlo Ersek --- tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h = | 25 +++++++++++++++----- tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf= | 2 ++ tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c = | 23 ++++++++++++++---- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTabl= esTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTables= Test.h index 0b72c61254af..7a74c121d596 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.= h +++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.= h @@ -1,13 +1,14 @@ /** @file - Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned st= ructure - to the hypervisor. + Expose the address(es) of the ACPI RSD PTR table(s) and the SMBIOS ent= ry + point(s) in a MB-aligned structure to the hypervisor. =20 The hypervisor locates the MB-aligned structure based on the signature= GUID - that is at offset 0 in the structure. Once the RSD PTR address(es) are - retrieved, the hypervisor may perform various ACPI checks. + that is at offset 0 in the structure. Once the RSD PTR and SMBIOS anch= or + address(es) are retrieved, the hypervisor may perform various ACPI and= SMBIOS + checks. =20 - This feature is a development aid, for supporting ACPI table unit test= s in - hypervisors. Do not enable in production builds. + This feature is a development aid, for supporting ACPI and SMBIOS tabl= e unit + tests in hypervisors. Do not enable in production builds. =20 Copyright (C) 2019, Red Hat, Inc. =20 @@ -61,6 +62,18 @@ typedef struct { // EFI_PHYSICAL_ADDRESS Rsdp10; EFI_PHYSICAL_ADDRESS Rsdp20; + // + // The Smbios21 and Smbios30 fields may be read when the signature GUI= D + // matches. Smbios21 is the guest-physical address of the SMBIOS 2.1 (= 32-bit) + // Entry Point Structure from the SMBIOS v3.2.0 specification, in 8-by= te + // little endian representation. Smbios30 is the guest-physical addres= s of + // the SMBIOS 3.0 (64-bit) Entry Point Structure from the same specifi= cation, + // in the same representation. Each of these fields may be zero + // (independently of the other) if the UEFI System Table does not prov= ide the + // corresponding UEFI Configuration Table. + // + EFI_PHYSICAL_ADDRESS Smbios21; + EFI_PHYSICAL_ADDRESS Smbios30; } BIOS_TABLES_TEST; #pragma pack () =20 diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/Bios= TablesTest.inf index 924d8a80d00b..708bc1e7982b 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.inf +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.inf @@ -35,6 +35,8 @@ gBiosTablesTestGuid gEfiAcpi10TableGuid gEfiAcpi20TableGuid + gEfiSmbios3TableGuid + gEfiSmbiosTableGuid =20 [Packages] MdePkg/MdePkg.dec diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.c index b208e17fb00f..75891e68ec20 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.c +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.c @@ -14,6 +14,7 @@ =20 #include #include +#include #include #include #include @@ -55,6 +56,8 @@ BiosTablesTestMain ( volatile BIOS_TABLES_TEST *BiosTablesTest; CONST VOID *Rsdp10; CONST VOID *Rsdp20; + CONST VOID *Smbios21; + CONST VOID *Smbios30; CONST EFI_CONFIGURATION_TABLE *ConfigTable; CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd; volatile EFI_GUID *InverseSignature; @@ -77,31 +80,43 @@ BiosTablesTestMain ( } =20 // - // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tabl= es in - // one go. + // Locate all the gEfiAcpi10TableGuid, gEfiAcpi20TableGuid, + // gEfiSmbiosTableGuid, gEfiSmbios3TableGuid config tables in one go. // Rsdp10 =3D NULL; Rsdp20 =3D NULL; + Smbios21 =3D NULL; + Smbios30 =3D NULL; ConfigTable =3D gST->ConfigurationTable; ConfigTablesEnd =3D gST->ConfigurationTable + gST->NumberOfTableEntrie= s; - while ((Rsdp10 =3D=3D NULL || Rsdp20 =3D=3D NULL) && ConfigTable < Con= figTablesEnd) { + while ((Rsdp10 =3D=3D NULL || Rsdp20 =3D=3D NULL || + Smbios21 =3D=3D NULL || Smbios30 =3D=3D NULL) && + ConfigTable < ConfigTablesEnd) { if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) { Rsdp10 =3D ConfigTable->VendorTable; } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGu= id)) { Rsdp20 =3D ConfigTable->VendorTable; + } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiSmbiosTableGu= id)) { + Smbios21 =3D ConfigTable->VendorTable; + } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiSmbios3TableG= uid)) { + Smbios30 =3D ConfigTable->VendorTable; } ++ConfigTable; } =20 AsciiPrint ("%a: BiosTablesTest=3D%p Rsdp10=3D%p Rsdp20=3D%p\n", gEfiCallerBaseName, Pages, Rsdp10, Rsdp20); + AsciiPrint ("%a: Smbios21=3D%p Smbios30=3D%p\n", gEfiCallerBaseName, S= mbios21, + Smbios30); =20 // - // Store the RSD PTR address(es) first, then the signature second. + // Store the config table addresses first, then the signature second. // BiosTablesTest =3D Pages; BiosTablesTest->Rsdp10 =3D (UINTN)Rsdp10; BiosTablesTest->Rsdp20 =3D (UINTN)Rsdp20; + BiosTablesTest->Smbios21 =3D (UINTN)Smbios21; + BiosTablesTest->Smbios30 =3D (UINTN)Smbios30; =20 MemoryFence(); =20 --=20 2.19.1.3.g30247aa5d201 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9785C10F03 for ; Thu, 25 Apr 2019 10:53:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8D02720811 for ; Thu, 25 Apr 2019 10:53:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8D02720811 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:55174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJc0l-0004eN-MZ for qemu-devel@archiver.kernel.org; Thu, 25 Apr 2019 06:53:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJbyr-0003IL-5R for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:51:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJbqq-0000Np-CR for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:43:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47976) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJbqq-0000Ls-2e for qemu-devel@nongnu.org; Thu, 25 Apr 2019 06:43:36 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 486288123D for ; Thu, 25 Apr 2019 10:43:35 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-105.rdu2.redhat.com [10.10.120.105]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFBFF5D9C5; Thu, 25 Apr 2019 10:43:32 +0000 (UTC) From: Laszlo Ersek To: qemu devel list Date: Thu, 25 Apr 2019 12:43:25 +0200 Message-Id: <20190425104326.12835-2-lersek@redhat.com> In-Reply-To: <20190425104326.12835-1-lersek@redhat.com> References: <20190425104326.12835-1-lersek@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 25 Apr 2019 10:43:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] tests/uefi-test-tools: report the SMBIOS entry point structures X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190425104325.Qo-EHlB3LYq6sTwDFy0i_HPhK1piCU4oXwCSoE6urEg@z> On UEFI systems, the SMBIOS entry point (a.k.a. anchor) structures are found similarly to the ACPI RSD PTR table(s): by scanning the ConfigurationTable array in the EFI system table for well-known GUIDs. Locate the SMBIOS 2.1 (32-bit) and 3.0 (64-bit) anchors in the BiosTablesTest UEFI application, and report the addresses in new fields appended to the BIOS_TABLES_TEST structure. Cc: "Philippe Mathieu-Daud=C3=A9" Cc: Igor Mammedov Launchpad: https://bugs.launchpad.net/qemu/+bug/1821884 Signed-off-by: Laszlo Ersek --- tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.h = | 25 +++++++++++++++----- tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.inf= | 2 ++ tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTest.c = | 23 ++++++++++++++---- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTabl= esTest.h b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTables= Test.h index 0b72c61254af..7a74c121d596 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.= h +++ b/tests/uefi-test-tools/UefiTestToolsPkg/Include/Guid/BiosTablesTest.= h @@ -1,13 +1,14 @@ /** @file - Expose the address(es) of the ACPI RSD PTR table(s) in a MB-aligned st= ructure - to the hypervisor. + Expose the address(es) of the ACPI RSD PTR table(s) and the SMBIOS ent= ry + point(s) in a MB-aligned structure to the hypervisor. =20 The hypervisor locates the MB-aligned structure based on the signature= GUID - that is at offset 0 in the structure. Once the RSD PTR address(es) are - retrieved, the hypervisor may perform various ACPI checks. + that is at offset 0 in the structure. Once the RSD PTR and SMBIOS anch= or + address(es) are retrieved, the hypervisor may perform various ACPI and= SMBIOS + checks. =20 - This feature is a development aid, for supporting ACPI table unit test= s in - hypervisors. Do not enable in production builds. + This feature is a development aid, for supporting ACPI and SMBIOS tabl= e unit + tests in hypervisors. Do not enable in production builds. =20 Copyright (C) 2019, Red Hat, Inc. =20 @@ -61,6 +62,18 @@ typedef struct { // EFI_PHYSICAL_ADDRESS Rsdp10; EFI_PHYSICAL_ADDRESS Rsdp20; + // + // The Smbios21 and Smbios30 fields may be read when the signature GUI= D + // matches. Smbios21 is the guest-physical address of the SMBIOS 2.1 (= 32-bit) + // Entry Point Structure from the SMBIOS v3.2.0 specification, in 8-by= te + // little endian representation. Smbios30 is the guest-physical addres= s of + // the SMBIOS 3.0 (64-bit) Entry Point Structure from the same specifi= cation, + // in the same representation. Each of these fields may be zero + // (independently of the other) if the UEFI System Table does not prov= ide the + // corresponding UEFI Configuration Table. + // + EFI_PHYSICAL_ADDRESS Smbios21; + EFI_PHYSICAL_ADDRESS Smbios30; } BIOS_TABLES_TEST; #pragma pack () =20 diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.inf b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/Bios= TablesTest.inf index 924d8a80d00b..708bc1e7982b 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.inf +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.inf @@ -35,6 +35,8 @@ gBiosTablesTestGuid gEfiAcpi10TableGuid gEfiAcpi20TableGuid + gEfiSmbios3TableGuid + gEfiSmbiosTableGuid =20 [Packages] MdePkg/MdePkg.dec diff --git a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.c b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTa= blesTest.c index b208e17fb00f..75891e68ec20 100644 --- a/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.c +++ b/tests/uefi-test-tools/UefiTestToolsPkg/BiosTablesTest/BiosTablesTes= t.c @@ -14,6 +14,7 @@ =20 #include #include +#include #include #include #include @@ -55,6 +56,8 @@ BiosTablesTestMain ( volatile BIOS_TABLES_TEST *BiosTablesTest; CONST VOID *Rsdp10; CONST VOID *Rsdp20; + CONST VOID *Smbios21; + CONST VOID *Smbios30; CONST EFI_CONFIGURATION_TABLE *ConfigTable; CONST EFI_CONFIGURATION_TABLE *ConfigTablesEnd; volatile EFI_GUID *InverseSignature; @@ -77,31 +80,43 @@ BiosTablesTestMain ( } =20 // - // Locate both gEfiAcpi10TableGuid and gEfiAcpi20TableGuid config tabl= es in - // one go. + // Locate all the gEfiAcpi10TableGuid, gEfiAcpi20TableGuid, + // gEfiSmbiosTableGuid, gEfiSmbios3TableGuid config tables in one go. // Rsdp10 =3D NULL; Rsdp20 =3D NULL; + Smbios21 =3D NULL; + Smbios30 =3D NULL; ConfigTable =3D gST->ConfigurationTable; ConfigTablesEnd =3D gST->ConfigurationTable + gST->NumberOfTableEntrie= s; - while ((Rsdp10 =3D=3D NULL || Rsdp20 =3D=3D NULL) && ConfigTable < Con= figTablesEnd) { + while ((Rsdp10 =3D=3D NULL || Rsdp20 =3D=3D NULL || + Smbios21 =3D=3D NULL || Smbios30 =3D=3D NULL) && + ConfigTable < ConfigTablesEnd) { if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi10TableGuid)) { Rsdp10 =3D ConfigTable->VendorTable; } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiAcpi20TableGu= id)) { Rsdp20 =3D ConfigTable->VendorTable; + } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiSmbiosTableGu= id)) { + Smbios21 =3D ConfigTable->VendorTable; + } else if (CompareGuid (&ConfigTable->VendorGuid, &gEfiSmbios3TableG= uid)) { + Smbios30 =3D ConfigTable->VendorTable; } ++ConfigTable; } =20 AsciiPrint ("%a: BiosTablesTest=3D%p Rsdp10=3D%p Rsdp20=3D%p\n", gEfiCallerBaseName, Pages, Rsdp10, Rsdp20); + AsciiPrint ("%a: Smbios21=3D%p Smbios30=3D%p\n", gEfiCallerBaseName, S= mbios21, + Smbios30); =20 // - // Store the RSD PTR address(es) first, then the signature second. + // Store the config table addresses first, then the signature second. // BiosTablesTest =3D Pages; BiosTablesTest->Rsdp10 =3D (UINTN)Rsdp10; BiosTablesTest->Rsdp20 =3D (UINTN)Rsdp20; + BiosTablesTest->Smbios21 =3D (UINTN)Smbios21; + BiosTablesTest->Smbios30 =3D (UINTN)Smbios30; =20 MemoryFence(); =20 --=20 2.19.1.3.g30247aa5d201