From: Roy Franz <roy.franz@linaro.org>
To: xen-devel@lists.xen.org, ian.campbell@citrix.com,
stefano.stabellini@citrix.com, tim@xen.org, jbeulich@suse.com,
keir@xen.org
Cc: Roy Franz <roy.franz@linaro.org>, fu.wei@linaro.org
Subject: [PATCH V4 10/15] Add SMBIOS and runtime services setup arch functions.
Date: Tue, 9 Sep 2014 17:52:00 -0700 [thread overview]
Message-ID: <1410310325-4509-11-git-send-email-roy.franz@linaro.org> (raw)
In-Reply-To: <1410310325-4509-1-git-send-email-roy.franz@linaro.org>
Add architecture specific funtions for setting up SMBIOS and
runtime services data structures. These are not fundamentally
x86 specific, but ARM currently lacks implementations. These functions
may not be needed when ARM SMBIOS and runtime service support is added.
Both SMBIOS and EFI runtime service support depend on this EFI boot
patch series.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
xen/common/efi/boot.c | 50 ++++----------------------------------
xen/include/asm-x86/efi-boot.h | 55 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 5296d88..013597b 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -55,6 +55,8 @@ static CHAR16 *__init s2w(union string *str);
static char *__init w2s(const union string *str);
static bool_t __init read_file(EFI_FILE_HANDLE dir_handle, struct file *file,
char *name_options);
+static bool_t __init __maybe_unused match_guid(const EFI_GUID *guid1,
+ const EFI_GUID *guid2);
static EFI_BOOT_SERVICES *__initdata efi_bs;
static EFI_HANDLE __initdata efi_ih;
@@ -170,7 +172,7 @@ static char *__init w2s(const union string *str)
return str->s;
}
-static bool_t __init match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2)
+static bool_t __init __maybe_unused match_guid(const EFI_GUID *guid1, const EFI_GUID *guid2)
{
return guid1->Data1 == guid2->Data1 &&
guid1->Data2 == guid2->Data2 &&
@@ -581,12 +583,6 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
efi_ih = ImageHandle;
efi_bs = SystemTable->BootServices;
- efi_rs = SystemTable->RuntimeServices;
- efi_ct = SystemTable->ConfigurationTable;
- efi_num_ct = SystemTable->NumberOfTableEntries;
- efi_version = SystemTable->Hdr.Revision;
- efi_fw_vendor = SystemTable->FirmwareVendor;
- efi_fw_revision = SystemTable->FirmwareRevision;
StdOut = SystemTable->ConOut;
StdErr = SystemTable->StdErr ?: StdOut;
@@ -805,49 +801,13 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE *SystemTable)
boot_cpu_data.x86_capability[1] = cpuid_ext_features;
}
- /* Obtain basic table pointers. */
- for ( i = 0; i < efi_num_ct; ++i )
- {
- static EFI_GUID __initdata acpi2_guid = ACPI_20_TABLE_GUID;
- static EFI_GUID __initdata acpi_guid = ACPI_TABLE_GUID;
- static EFI_GUID __initdata mps_guid = MPS_TABLE_GUID;
- static EFI_GUID __initdata smbios_guid = SMBIOS_TABLE_GUID;
-
- if ( match_guid(&acpi2_guid, &efi_ct[i].VendorGuid) )
- efi.acpi20 = (long)efi_ct[i].VendorTable;
- if ( match_guid(&acpi_guid, &efi_ct[i].VendorGuid) )
- efi.acpi = (long)efi_ct[i].VendorTable;
- if ( match_guid(&mps_guid, &efi_ct[i].VendorGuid) )
- efi.mps = (long)efi_ct[i].VendorTable;
- if ( match_guid(&smbios_guid, &efi_ct[i].VendorGuid) )
- efi.smbios = (long)efi_ct[i].VendorTable;
- }
+ efi_arch_runtime_setup(SystemTable);
- if (efi.smbios != EFI_INVALID_TABLE_ADDR)
- dmi_efi_get_table((void *)(long)efi.smbios);
+ efi_arch_smbios();
/* Collect PCI ROM contents. */
efi_arch_pci();
- /* Get snapshot of variable store parameters. */
- status = (efi_rs->Hdr.Revision >> 16) >= 2 ?
- efi_rs->QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE |
- EFI_VARIABLE_BOOTSERVICE_ACCESS |
- EFI_VARIABLE_RUNTIME_ACCESS,
- &efi_boot_max_var_store_size,
- &efi_boot_remain_var_store_size,
- &efi_boot_max_var_size) :
- EFI_INCOMPATIBLE_VERSION;
- if ( EFI_ERROR(status) )
- {
- efi_boot_max_var_store_size = 0;
- efi_boot_remain_var_store_size = 0;
- efi_boot_max_var_size = status;
- PrintStr(L"Warning: Could not query variable store: ");
- DisplayUint(status, 0);
- PrintStr(newline);
- }
-
efi_arch_memory();
efi_arch_video(base_video, cols, rows, depth, gop);
diff --git a/xen/include/asm-x86/efi-boot.h b/xen/include/asm-x86/efi-boot.h
index b09e12c..b2e8599 100644
--- a/xen/include/asm-x86/efi-boot.h
+++ b/xen/include/asm-x86/efi-boot.h
@@ -984,3 +984,58 @@ static void __init efi_arch_handle_module(struct file *file, char *name,
mb_modules[mbi.mods_count].mod_end = file->size;
++mbi.mods_count;
}
+
+static void __init efi_arch_smbios(void)
+{
+ if (efi.smbios != EFI_INVALID_TABLE_ADDR)
+ dmi_efi_get_table((void *)(long)efi.smbios);
+}
+
+static void __init efi_arch_runtime_setup(EFI_SYSTEM_TABLE *SystemTable)
+{
+ EFI_STATUS status;
+ int i;
+
+ efi_rs = SystemTable->RuntimeServices;
+ efi_ct = SystemTable->ConfigurationTable;
+ efi_num_ct = SystemTable->NumberOfTableEntries;
+ efi_version = SystemTable->Hdr.Revision;
+ efi_fw_vendor = SystemTable->FirmwareVendor;
+ efi_fw_revision = SystemTable->FirmwareRevision;
+
+ /* Obtain basic table pointers. */
+ for ( i = 0; i < efi_num_ct; ++i )
+ {
+ static EFI_GUID __initdata acpi2_guid = ACPI_20_TABLE_GUID;
+ static EFI_GUID __initdata acpi_guid = ACPI_TABLE_GUID;
+ static EFI_GUID __initdata mps_guid = MPS_TABLE_GUID;
+ static EFI_GUID __initdata smbios_guid = SMBIOS_TABLE_GUID;
+
+ if ( match_guid(&acpi2_guid, &efi_ct[i].VendorGuid) )
+ efi.acpi20 = (long)efi_ct[i].VendorTable;
+ if ( match_guid(&acpi_guid, &efi_ct[i].VendorGuid) )
+ efi.acpi = (long)efi_ct[i].VendorTable;
+ if ( match_guid(&mps_guid, &efi_ct[i].VendorGuid) )
+ efi.mps = (long)efi_ct[i].VendorTable;
+ if ( match_guid(&smbios_guid, &efi_ct[i].VendorGuid) )
+ efi.smbios = (long)efi_ct[i].VendorTable;
+ }
+ /* Get snapshot of variable store parameters. */
+ status = (efi_rs->Hdr.Revision >> 16) >= 2 ?
+ efi_rs->QueryVariableInfo(EFI_VARIABLE_NON_VOLATILE |
+ EFI_VARIABLE_BOOTSERVICE_ACCESS |
+ EFI_VARIABLE_RUNTIME_ACCESS,
+ &efi_boot_max_var_store_size,
+ &efi_boot_remain_var_store_size,
+ &efi_boot_max_var_size) :
+ EFI_INCOMPATIBLE_VERSION;
+ if ( EFI_ERROR(status) )
+ {
+ efi_boot_max_var_store_size = 0;
+ efi_boot_remain_var_store_size = 0;
+ efi_boot_max_var_size = status;
+ PrintStr(L"Warning: Could not query variable store: ");
+ DisplayUint(status, 0);
+ PrintStr(newline);
+ }
+}
--
2.1.0.rc1
next prev parent reply other threads:[~2014-09-10 0:52 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 0:51 [PATCH V4 00/15] arm64 EFI stub Roy Franz
2014-09-10 0:51 ` [PATCH V4 01/15] move x86 EFI boot code to common/efi Roy Franz
2014-09-11 13:50 ` Jan Beulich
2014-09-11 17:16 ` Roy Franz
2014-09-12 6:55 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 02/15] Move x86 specific funtions/variables to arch header Roy Franz
2014-09-11 14:03 ` Jan Beulich
2014-09-11 17:33 ` Roy Franz
2014-09-12 7:04 ` Jan Beulich
2014-09-12 9:43 ` Ian Campbell
2014-09-12 9:53 ` Jan Beulich
2014-09-12 9:58 ` Ian Campbell
2014-09-12 16:52 ` Roy Franz
2014-09-10 0:51 ` [PATCH V4 03/15] create arch functions to get and process EFI memory map Roy Franz
2014-09-11 14:11 ` Jan Beulich
2014-09-11 17:40 ` Roy Franz
2014-09-12 7:07 ` Jan Beulich
2014-09-12 9:45 ` Ian Campbell
2014-09-12 9:56 ` Jan Beulich
2014-09-12 10:23 ` Ian Campbell
2014-09-12 10:35 ` Jan Beulich
2014-09-12 17:01 ` Roy Franz
2014-09-10 0:51 ` [PATCH V4 04/15] Add architecture functions for pre/post ExitBootServices Roy Franz
2014-09-11 14:13 ` Jan Beulich
2014-09-11 17:44 ` Roy Franz
2014-09-12 7:08 ` Jan Beulich
2014-09-12 9:46 ` Ian Campbell
2014-09-12 9:58 ` Jan Beulich
2014-09-12 16:57 ` Roy Franz
2014-09-15 8:47 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 05/15] Add efi_arch_cfg_file() to handle arch specific cfg file fields Roy Franz
2014-09-11 14:16 ` Jan Beulich
2014-09-11 18:11 ` Roy Franz
2014-09-12 7:10 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 06/15] Add efi_arch_handle_cmdline() for processing commandline Roy Franz
2014-09-11 14:22 ` Jan Beulich
2014-09-11 18:24 ` Roy Franz
2014-09-10 0:51 ` [PATCH V4 07/15] Move x86 specific video and disk probing code Roy Franz
2014-09-11 14:26 ` Jan Beulich
2014-09-11 18:30 ` Roy Franz
2014-09-12 7:12 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 08/15] Add efi_arch_memory() for arch specific memory setup Roy Franz
2014-09-11 14:27 ` Jan Beulich
2014-09-10 0:51 ` [PATCH V4 09/15] Add arch specific module handling to read_file() Roy Franz
2014-09-11 14:40 ` Jan Beulich
2014-09-10 0:52 ` Roy Franz [this message]
2014-09-11 14:44 ` [PATCH V4 10/15] Add SMBIOS and runtime services setup arch functions Jan Beulich
2014-09-11 22:03 ` Roy Franz
2014-09-11 23:41 ` Stefano Stabellini
2014-09-12 7:14 ` Jan Beulich
2014-09-12 16:24 ` Roy Franz
2014-09-10 0:52 ` [PATCH V4 11/15] Add several misc. arch functions for EFI boot code Roy Franz
2014-09-11 14:45 ` Jan Beulich
2014-09-10 0:52 ` [PATCH V4 12/15] Add efi_arch_use_config_file() function to control use of config file Roy Franz
2014-09-11 14:49 ` Jan Beulich
2014-09-11 23:54 ` Stefano Stabellini
2014-09-12 7:15 ` Jan Beulich
2014-09-12 16:30 ` Roy Franz
2014-09-10 0:52 ` [PATCH V4 13/15] add arm64 cache flushing code from linux v3.16 Roy Franz
2014-09-10 0:52 ` [PATCH V4 14/15] Update libfdt to v1.4.0 Roy Franz
2014-09-10 0:52 ` [PATCH V4 15/15] Add ARM EFI boot support Roy Franz
2014-09-11 14:53 ` Jan Beulich
2014-09-11 22:26 ` Roy Franz
2014-09-12 7:17 ` Jan Beulich
2014-09-12 0:49 ` Stefano Stabellini
2014-09-12 3:21 ` Roy Franz
2014-09-12 17:41 ` Stefano Stabellini
2014-09-12 17:50 ` Roy Franz
2014-09-12 17:55 ` Stefano Stabellini
2014-09-22 11:13 ` Ian Campbell
2014-09-23 12:39 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410310325-4509-11-git-send-email-roy.franz@linaro.org \
--to=roy.franz@linaro.org \
--cc=fu.wei@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=stefano.stabellini@citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).