tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OvmfPkg/SmbiosPlatformDxe: split Xen entry point from QEMU entry point 

Remove the SmbiosTablePublishEntry() function from "SmbiosPlatformDxe.c".
"SmbiosPlatformDxe.c" becomes hypervisor-agnostic.

Add SmbiosTablePublishEntry() back, simplified for QEMU, to the existent
file "Qemu.c". The GetQemuSmbiosTables() function no longer needs to be
declared in "SmbiosPlatformDxe.h"; "SmbiosPlatformDxe.h" becomes
hypervisor-agnostic.

Add SmbiosTablePublishEntry() back, renamed and simplified for Xen, to the
new, arch-independent file "Xen.c". (The existent Xen-specific C files are
arch-dependent.)

Update both INF files; remove the dependencies that are now superfluous in
each.

Cc: Anthony Perard <anthony.perard@citrix.com>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Julien Grall <julien@xen.org>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2122
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20210526201446.12554-43-lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
This commit is contained in:
Laszlo Ersek 2021-05-26 22:14:45 +02:00 committed by mergify[bot]
parent d4a8aaee73
commit ce270905bf
6 changed files with 86 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
OvmfPkg/SmbiosPlatformDxe/Qemu.c
View File

@ -48,3 +48,36 @@ GetQemuSmbiosTables (
return QemuTables;
}
/**
Installs SMBIOS information for OVMF
@param ImageHandle Module's image handle
@param SystemTable Pointer of EFI_SYSTEM_TABLE
@retval EFI_SUCCESS Smbios data successfully installed
@retval Other Smbios data was not installed
**/
EFI_STATUS
EFIAPI
SmbiosTablePublishEntry (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
UINT8 *SmbiosTables;
Status = EFI_NOT_FOUND;
//
// Add QEMU SMBIOS data if found
//
SmbiosTables = GetQemuSmbiosTables ();
if (SmbiosTables != NULL) {
Status = InstallAllStructures (SmbiosTables);
FreePool (SmbiosTables);
}
return Status;
}

49
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.c
View File

@ -10,12 +10,10 @@
#include <IndustryStandard/SmBios.h> // SMBIOS_TABLE_TYPE0
#include <Library/DebugLib.h> // ASSERT_EFI_ERROR()
#include <Library/MemoryAllocationLib.h> // FreePool()
#include <Library/UefiBootServicesTableLib.h> // gBS
#include <Protocol/Smbios.h> // EFI_SMBIOS_PROTOCOL
#include "SmbiosPlatformDxe.h"
#include "XenSmbiosPlatformDxe.h"
#define TYPE0_STRINGS \
"EFI Development Kit II / OVMF\0" /* Vendor */ \
@ -168,50 +166,3 @@ InstallAllStructures (
return EFI_SUCCESS;
}
/**
Installs SMBIOS information for OVMF
@param ImageHandle Module's image handle
@param SystemTable Pointer of EFI_SYSTEM_TABLE
@retval EFI_SUCCESS Smbios data successfully installed
@retval Other Smbios data was not installed
**/
EFI_STATUS
EFIAPI
SmbiosTablePublishEntry (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure;
UINT8 *SmbiosTables;
Status = EFI_NOT_FOUND;
//
// Add Xen or QEMU SMBIOS data if found
//
EntryPointStructure = GetXenSmbiosTables ();
if (EntryPointStructure != NULL) {
SmbiosTables = (UINT8*)(UINTN)EntryPointStructure->TableAddress;
} else {
SmbiosTables = GetQemuSmbiosTables ();
}
if (SmbiosTables != NULL) {
Status = InstallAllStructures (SmbiosTables);
//
// Free SmbiosTables if allocated by Qemu (i.e., NOT by Xen):
//
if (EntryPointStructure == NULL) {
FreePool (SmbiosTables);
}
}
return Status;
}

11
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.h
View File

@ -22,15 +22,4 @@ InstallAllStructures (
IN UINT8 *TableAddress
);
/**
Locates and extracts the QEMU SMBIOS table data if present in fw_cfg
@return Address of extracted QEMU SMBIOS data
**/
UINT8 *
GetQemuSmbiosTables (
VOID
);
#endif

14
OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
View File

@ -27,13 +27,6 @@
Qemu.c
SmbiosPlatformDxe.c
SmbiosPlatformDxe.h
XenSmbiosPlatformDxe.h
[Sources.IA32, Sources.X64]
X86Xen.c
[Sources.ARM, Sources.AARCH64]
ArmXen.c
[Packages]
MdePkg/MdePkg.dec
@ -47,19 +40,12 @@
UefiBootServicesTableLib
UefiDriverEntryPoint
[LibraryClasses.IA32, LibraryClasses.X64]
BaseLib
HobLib
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated
[Protocols]
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED
[Guids.IA32, Guids.X64]
gEfiXenInfoGuid
[Depex]
gEfiSmbiosProtocolGuid

49
OvmfPkg/SmbiosPlatformDxe/Xen.c Normal file
View File

@ -0,0 +1,49 @@
/** @file
This driver installs SMBIOS information for OVMF on Xen
Copyright (C) 2021, Red Hat, Inc.
Copyright (c) 2011, Bei Guan <gbtju85@gmail.com>
Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#include "SmbiosPlatformDxe.h"
#include "XenSmbiosPlatformDxe.h"
/**
Installs SMBIOS information for OVMF on Xen
@param ImageHandle Module's image handle
@param SystemTable Pointer of EFI_SYSTEM_TABLE
@retval EFI_SUCCESS Smbios data successfully installed
@retval Other Smbios data was not installed
**/
EFI_STATUS
EFIAPI
XenSmbiosTablePublishEntry (
IN EFI_HANDLE ImageHandle,
IN EFI_SYSTEM_TABLE *SystemTable
)
{
EFI_STATUS Status;
SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure;
UINT8 *SmbiosTables;
Status = EFI_NOT_FOUND;
//
// Add Xen SMBIOS data if found
//
EntryPointStructure = GetXenSmbiosTables ();
if (EntryPointStructure != NULL) {
SmbiosTables = (UINT8*)(UINTN)EntryPointStructure->TableAddress;
if (SmbiosTables != NULL) {
Status = InstallAllStructures (SmbiosTables);
}
}
return Status;
}

12
OvmfPkg/SmbiosPlatformDxe/XenSmbiosPlatformDxe.inf
View File

@ -16,7 +16,7 @@
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
ENTRY_POINT = SmbiosTablePublishEntry
ENTRY_POINT = XenSmbiosTablePublishEntry
#
# The following information is for reference only and not required by the build tools.
@ -25,9 +25,9 @@
#
[Sources]
Qemu.c
SmbiosPlatformDxe.c
SmbiosPlatformDxe.h
Xen.c
XenSmbiosPlatformDxe.h
[Sources.IA32, Sources.X64]
@ -38,13 +38,12 @@
[Packages]
MdePkg/MdePkg.dec
[Packages.IA32, Packages.X64]
OvmfPkg/OvmfPkg.dec
[LibraryClasses]
DebugLib
MemoryAllocationLib
PcdLib
QemuFwCfgLib
UefiBootServicesTableLib
UefiDriverEntryPoint
@ -52,9 +51,6 @@
BaseLib
HobLib
[Pcd]
gUefiOvmfPkgTokenSpaceGuid.PcdQemuSmbiosValidated
[Protocols]
gEfiSmbiosProtocolGuid # PROTOCOL ALWAYS_CONSUMED