From: Matt Fleming <matt@console-pimps.org>
To: linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@linux.intel.com>,
Matthew Garrett <mjg@redhat.com>,
x86@kernel.org, Ingo Molnar <mingo@elte.hu>,
Thomas Gleixner <tglx@linutronix.de>,
Matt Fleming <matt.fleming@intel.com>
Subject: [PATCH v2 05/10] efi.h: Add efi_image_loaded_t
Date: Mon, 12 Sep 2011 15:34:49 +0100 [thread overview]
Message-ID: <1315838094-2307-6-git-send-email-matt@console-pimps.org> (raw)
In-Reply-To: <1315838094-2307-1-git-send-email-matt@console-pimps.org>
From: Matt Fleming <matt.fleming@intel.com>
Add the EFI loaded image structure and protocol guid which are
required by the x86 EFI boot stub. The EFI boot stub uses the
structure to figure out where it was loaded in memory and to pass
command line arguments to the kernel.
Cc: Matthew Garrett <mjg@redhat.com>
Cc: "H. Peter Anvin" <hpa@linux.intel.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---
v2: use __aligned_u64 because x86 only aligns 64-bit data types on a
4-byte boundary unless instructed otherwise.
include/linux/efi.h | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 9547597..e35005f 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -287,6 +287,9 @@ typedef efi_status_t efi_query_capsule_caps_t(efi_capsule_header_t **capsules,
#define LINUX_EFI_CRASH_GUID \
EFI_GUID( 0xcfc8fc79, 0xbe2e, 0x4ddc, 0x97, 0xf0, 0x9f, 0x98, 0xbf, 0xe2, 0x98, 0xa0 )
+#define LOADED_IMAGE_PROTOCOL_GUID \
+ EFI_GUID( 0x5b1b31a1, 0x9562, 0x11d2, 0x8e, 0x3f, 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b )
+
typedef struct {
efi_guid_t guid;
unsigned long table;
@@ -326,6 +329,22 @@ struct efi_memory_map {
unsigned long desc_size;
};
+typedef struct {
+ u32 revision;
+ void *parent_handle;
+ efi_system_table_t *system_table;
+ void *device_handle;
+ void *file_path;
+ void *reserved;
+ u32 load_options_size;
+ void *load_options;
+ void *image_base;
+ __aligned_u64 image_size;
+ unsigned int image_code_type;
+ unsigned int image_data_type;
+ unsigned long unload;
+} efi_loaded_image_t;
+
#define EFI_INVALID_TABLE_ADDR (~0UL)
/*
--
1.7.4.4
next prev parent reply other threads:[~2011-09-12 14:35 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-12 14:34 [PATCH v2 00/10] x86 EFI boot stub Matt Fleming
2011-09-12 14:34 ` [PATCH 01/10] x86: Add missing bzImage fields to struct setup_header Matt Fleming
2011-09-12 14:34 ` [PATCH 02/10] x86, efi: Make efi_call_phys_prelog() CONFIG_RELOCATABLE-aware Matt Fleming
2011-09-12 14:34 ` [PATCH 03/10] x86: Don't use magic strings for EFI loader signature Matt Fleming
2011-09-12 14:34 ` [PATCH 04/10] efi.h: Add struct definition for boot time services Matt Fleming
2011-09-12 14:34 ` Matt Fleming [this message]
2011-09-12 14:34 ` [PATCH 06/10] efi.h: Add allocation types for boottime->allocate_pages() Matt Fleming
2011-09-12 14:34 ` [PATCH v2 07/10] efi.h: Add graphics protocol guids Matt Fleming
2011-09-12 14:34 ` [PATCH 08/10] efi.h: Add boottime->locate_handle search types Matt Fleming
2011-09-12 14:34 ` [PATCH v2 09/10] efi: Add EFI file I/O data types Matt Fleming
2011-09-12 14:34 ` [PATCH v2 10/10] x86, efi: EFI boot stub support Matt Fleming
2011-09-13 13:29 ` Matthew Garrett
2011-09-13 14:01 ` Matt Fleming
2011-09-13 14:33 ` Maarten Lankhorst
2011-09-14 16:07 ` Matt Fleming
[not found] ` <20110915045231.GA32136@emperor.us.dell.com>
2011-09-15 8:04 ` Maarten Lankhorst
2011-09-15 9:08 ` Maarten Lankhorst
[not found] ` <20110915115255.GA4669@emperor.us.dell.com>
2011-09-15 12:44 ` Maarten Lankhorst
2011-09-17 11:44 ` Matt Fleming
2011-09-17 12:12 ` Maarten Lankhorst
2011-09-21 11:57 ` Matt Fleming
2011-09-21 12:10 ` [PATCH v3 " Matt Fleming
2011-09-22 11:43 ` Maarten Lankhorst
2011-09-22 11:55 ` Matt Fleming
2011-09-29 10:14 ` Henrik Rydberg
2011-09-30 7:41 ` Matt Fleming
2011-09-30 11:13 ` Henrik Rydberg
2011-10-03 16:53 ` Matthew Garrett
2011-10-03 18:32 ` Henrik Rydberg
2011-09-30 8:51 ` [PATCH v4 " Matt Fleming
2011-09-30 16:24 ` Shea Levy
2011-09-30 20:11 ` Matt Fleming
2011-10-01 7:50 ` Maarten Lankhorst
2011-10-01 9:19 ` Matt Fleming
-- strict thread matches above, loose matches on Subject: below --
2011-10-17 10:40 [PATCH v5 00/10] x86 EFI boot stub Matt Fleming
2011-10-17 10:40 ` [PATCH v2 05/10] efi.h: Add efi_image_loaded_t Matt Fleming
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=1315838094-2307-6-git-send-email-matt@console-pimps.org \
--to=matt@console-pimps.org \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mingo@elte.hu \
--cc=mjg@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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).