From 164cf4038357efca659cd750e20b1ca95b80620b Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:40 +0000 Subject: OvmfPkg: SmbiosPlatformDxe: restrict current Xen code to IA32/X64 The Xen code in SmbiosPlatformDxe is centered on the informational HOB with GUID gEfiXenInfoGuid, and the address constants XEN_SMBIOS_PHYSICAL_ADDRESS=0x000EB000, XEN_SMBIOS_PHYSICAL_END=0x000F0000. This Xen hand-off mechanism is specific to the IA32 and X64 architectures, and it is very unlikely that a future ARM / AARCH64 implementation would follow it. Therefore, sequester the IA32 / X64 specific code from the rest of the source, by renaming "Xen.c" to "X86Xen.c", and adding a GetXenSmbiosTables() stub function in "ArmXen.c" that returns NULL. (Those file names are inspired by "OvmfPkg/Library/XenHypercallLib/X86XenHypercall.c".) The call site in SmbiosTablePublishEntry() [SmbiosPlatformDxe.c] is aware that a NULL return value means "Xen SMBIOS tables not found", and will continue to the QEMU tables (for which the retrieval mechanism is shared by x86 and Arm). This change enables SmbiosPlatformDxe for ARM architectures; update the VALID_ARCHITECTURES comment accordingly. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Wei Liu Cc: Gabriel Somlo Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek Reviewed-by: Jordan Justen git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18040 6f19259b-4bc3-4df7-8a09-765794883524 --- OvmfPkg/SmbiosPlatformDxe/ArmXen.c | 34 +++++++++ OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf | 9 ++- OvmfPkg/SmbiosPlatformDxe/X86Xen.c | 98 +++++++++++++++++++++++++ OvmfPkg/SmbiosPlatformDxe/Xen.c | 98 ------------------------- 4 files changed, 139 insertions(+), 100 deletions(-) create mode 100644 OvmfPkg/SmbiosPlatformDxe/ArmXen.c create mode 100644 OvmfPkg/SmbiosPlatformDxe/X86Xen.c delete mode 100644 OvmfPkg/SmbiosPlatformDxe/Xen.c (limited to 'OvmfPkg') diff --git a/OvmfPkg/SmbiosPlatformDxe/ArmXen.c b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c new file mode 100644 index 0000000000..538cbc26f0 --- /dev/null +++ b/OvmfPkg/SmbiosPlatformDxe/ArmXen.c @@ -0,0 +1,34 @@ +/** @file + Detect Xen SMBIOS data on ARM / AARCH64. + + Copyright (C) 2015, Red Hat, Inc. + Copyright (c) 2011, Bei Guan + Copyright (c) 2011, Intel Corporation. All rights reserved.
+ + This program and the accompanying materials are licensed and made available + under the terms and conditions of the BSD License which accompanies this + distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT + WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +**/ + +#include "SmbiosPlatformDxe.h" + +/** + Locates the Xen SMBIOS data if it exists + + @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data + +**/ +SMBIOS_TABLE_ENTRY_POINT * +GetXenSmbiosTables ( + VOID + ) +{ + // + // Not implemented yet. + // + return NULL; +} diff --git a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf index 6596392095..3b90aac438 100644 --- a/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf +++ b/OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf @@ -25,15 +25,20 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF EBC +# VALID_ARCHITECTURES = IA32 X64 IPF EBC ARM AARCH64 # [Sources] SmbiosPlatformDxe.h SmbiosPlatformDxe.c - Xen.c Qemu.c +[Sources.IA32, Sources.X64] + X86Xen.c + +[Sources.ARM, Sources.AARCH64] + ArmXen.c + [Packages] MdePkg/MdePkg.dec MdeModulePkg/MdeModulePkg.dec diff --git a/OvmfPkg/SmbiosPlatformDxe/X86Xen.c b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c new file mode 100644 index 0000000000..3f018d6f5c --- /dev/null +++ b/OvmfPkg/SmbiosPlatformDxe/X86Xen.c @@ -0,0 +1,98 @@ +/** @file + Detect Xen hvmloader SMBIOS data for usage by OVMF. + + Copyright (c) 2011, Bei Guan + Copyright (c) 2011, Intel Corporation. All rights reserved.
+ + This program and the accompanying materials + are licensed and made available under the terms and conditions of the BSD License + which accompanies this distribution. The full text of the license may be found at + http://opensource.org/licenses/bsd-license.php + + THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. + +**/ + +#include "SmbiosPlatformDxe.h" +#include +#include + +#define XEN_SMBIOS_PHYSICAL_ADDRESS 0x000EB000 +#define XEN_SMBIOS_PHYSICAL_END 0x000F0000 + +/** + Validates the SMBIOS entry point structure + + @param EntryPointStructure SMBIOS entry point structure + + @retval TRUE The entry point structure is valid + @retval FALSE The entry point structure is not valid + +**/ +STATIC +BOOLEAN +IsEntryPointStructureValid ( + IN SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure + ) +{ + UINTN Index; + UINT8 Length; + UINT8 Checksum; + UINT8 *BytePtr; + + BytePtr = (UINT8*) EntryPointStructure; + Length = EntryPointStructure->EntryPointLength; + Checksum = 0; + + for (Index = 0; Index < Length; Index++) { + Checksum = Checksum + (UINT8) BytePtr[Index]; + } + + if (Checksum != 0) { + return FALSE; + } else { + return TRUE; + } +} + +/** + Locates the Xen SMBIOS data if it exists + + @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data + +**/ +SMBIOS_TABLE_ENTRY_POINT * +GetXenSmbiosTables ( + VOID + ) +{ + UINT8 *XenSmbiosPtr; + SMBIOS_TABLE_ENTRY_POINT *XenSmbiosEntryPointStructure; + EFI_HOB_GUID_TYPE *GuidHob; + + // + // See if a XenInfo HOB is available + // + GuidHob = GetFirstGuidHob (&gEfiXenInfoGuid); + if (GuidHob == NULL) { + return NULL; + } + + for (XenSmbiosPtr = (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_ADDRESS; + XenSmbiosPtr < (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_END; + XenSmbiosPtr += 0x10) { + + XenSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) XenSmbiosPtr; + + if (!AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->AnchorString, "_SM_", 4) && + !AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) && + IsEntryPointStructureValid (XenSmbiosEntryPointStructure)) { + + return XenSmbiosEntryPointStructure; + + } + } + + return NULL; +} diff --git a/OvmfPkg/SmbiosPlatformDxe/Xen.c b/OvmfPkg/SmbiosPlatformDxe/Xen.c deleted file mode 100644 index 3f018d6f5c..0000000000 --- a/OvmfPkg/SmbiosPlatformDxe/Xen.c +++ /dev/null @@ -1,98 +0,0 @@ -/** @file - Detect Xen hvmloader SMBIOS data for usage by OVMF. - - Copyright (c) 2011, Bei Guan - Copyright (c) 2011, Intel Corporation. All rights reserved.
- - This program and the accompanying materials - are licensed and made available under the terms and conditions of the BSD License - which accompanies this distribution. The full text of the license may be found at - http://opensource.org/licenses/bsd-license.php - - THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, - WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. - -**/ - -#include "SmbiosPlatformDxe.h" -#include -#include - -#define XEN_SMBIOS_PHYSICAL_ADDRESS 0x000EB000 -#define XEN_SMBIOS_PHYSICAL_END 0x000F0000 - -/** - Validates the SMBIOS entry point structure - - @param EntryPointStructure SMBIOS entry point structure - - @retval TRUE The entry point structure is valid - @retval FALSE The entry point structure is not valid - -**/ -STATIC -BOOLEAN -IsEntryPointStructureValid ( - IN SMBIOS_TABLE_ENTRY_POINT *EntryPointStructure - ) -{ - UINTN Index; - UINT8 Length; - UINT8 Checksum; - UINT8 *BytePtr; - - BytePtr = (UINT8*) EntryPointStructure; - Length = EntryPointStructure->EntryPointLength; - Checksum = 0; - - for (Index = 0; Index < Length; Index++) { - Checksum = Checksum + (UINT8) BytePtr[Index]; - } - - if (Checksum != 0) { - return FALSE; - } else { - return TRUE; - } -} - -/** - Locates the Xen SMBIOS data if it exists - - @return SMBIOS_TABLE_ENTRY_POINT Address of Xen SMBIOS data - -**/ -SMBIOS_TABLE_ENTRY_POINT * -GetXenSmbiosTables ( - VOID - ) -{ - UINT8 *XenSmbiosPtr; - SMBIOS_TABLE_ENTRY_POINT *XenSmbiosEntryPointStructure; - EFI_HOB_GUID_TYPE *GuidHob; - - // - // See if a XenInfo HOB is available - // - GuidHob = GetFirstGuidHob (&gEfiXenInfoGuid); - if (GuidHob == NULL) { - return NULL; - } - - for (XenSmbiosPtr = (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_ADDRESS; - XenSmbiosPtr < (UINT8*)(UINTN) XEN_SMBIOS_PHYSICAL_END; - XenSmbiosPtr += 0x10) { - - XenSmbiosEntryPointStructure = (SMBIOS_TABLE_ENTRY_POINT *) XenSmbiosPtr; - - if (!AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->AnchorString, "_SM_", 4) && - !AsciiStrnCmp ((CHAR8 *) XenSmbiosEntryPointStructure->IntermediateAnchorString, "_DMI_", 5) && - IsEntryPointStructureValid (XenSmbiosEntryPointStructure)) { - - return XenSmbiosEntryPointStructure; - - } - } - - return NULL; -} -- cgit v1.2.3