From: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: mjg59-1xO5oi07KQx4cg9Nei1l7Q@public.gmane.org,
linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
toshi.kani-VXdhtT5mjnY@public.gmane.org,
matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org,
greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org,
x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org,
horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org,
bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org,
ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org,
hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org,
vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
Subject: [PATCH v5 07/14] efi: export more efi table variable to sysfs
Date: Mon, 9 Dec 2013 17:42:20 +0800 [thread overview]
Message-ID: <1386582147-9802-8-git-send-email-dyoung@redhat.com> (raw)
In-Reply-To: <1386582147-9802-1-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Export fw_vendor, runtime and config table physical addresses to
/sys/firmware/efi/fw_vendor, /sys/firmware/efi/runtime and
/sys/firmware/efi/config_table because kexec kernel will need them.
>From EFI spec these 3 variables will be updated to
virtual address after entering virtual mode. But
kernel startup code will need the physical address.
changelog:
Greg: add standalone sysfs files instead of add lines to systab
Document them as testing ABI
Greg: use group attrs and is_visible
Boris: align comments lines
Boris: add macros for _show functions
Matt: Documentation fixes.
Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
Documentation/ABI/testing/sysfs-firmware-efi | 24 +++++++++++++++++
arch/x86/platform/efi/efi.c | 4 +++
drivers/firmware/efi/efi.c | 39 ++++++++++++++++++++++++++++
include/linux/efi.h | 3 +++
4 files changed, 70 insertions(+)
create mode 100644 Documentation/ABI/testing/sysfs-firmware-efi
diff --git a/Documentation/ABI/testing/sysfs-firmware-efi b/Documentation/ABI/testing/sysfs-firmware-efi
new file mode 100644
index 0000000..8c6e460
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-firmware-efi
@@ -0,0 +1,24 @@
+What: /sys/firmware/efi/fw_vendor
+Date: December 2013
+Contact: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Description:
+ It shows the physical address of firmware vendor field in the
+ EFI system table.
+
+Users: Kexec
+
+What: /sys/firmware/efi/runtime
+Date: December 2013
+Contact: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Description:
+ It shows the physical address of runtime service table entry in
+ the EFI system table.
+Users: Kexec
+
+What: /sys/firmware/efi/config_table
+Date: December 2013
+Contact: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+Description:
+ It shows the physical address of config table entry in the EFI
+ system table.
+Users: Kexec
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 7778b5f..3e8b760 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -653,6 +653,10 @@ void __init efi_init(void)
set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);
+ efi.config_table = (unsigned long)efi.systab->tables;
+ efi.fw_vendor = (unsigned long)efi.systab->fw_vendor;
+ efi.runtime = (unsigned long)efi.systab->runtime;
+
/*
* Show what we know for posterity
*/
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index b716a66..0ecccab 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -32,6 +32,9 @@ struct efi __read_mostly efi = {
.hcdp = EFI_INVALID_TABLE_ADDR,
.uga = EFI_INVALID_TABLE_ADDR,
.uv_systab = EFI_INVALID_TABLE_ADDR,
+ .fw_vendor = EFI_INVALID_TABLE_ADDR,
+ .runtime = EFI_INVALID_TABLE_ADDR,
+ .config_table = EFI_INVALID_TABLE_ADDR,
};
EXPORT_SYMBOL(efi);
@@ -71,13 +74,49 @@ static ssize_t systab_show(struct kobject *kobj,
static struct kobj_attribute efi_attr_systab =
__ATTR(systab, 0400, systab_show, NULL);
+#define EFI_FIELD(var) efi.var
+
+#define EFI_ATTR_SHOW(name) \
+static ssize_t name##_show(struct kobject *kobj, \
+ struct kobj_attribute *attr, char *buf) \
+{ \
+ return sprintf(buf, "0x%lx\n", EFI_FIELD(name)); \
+}
+
+EFI_ATTR_SHOW(fw_vendor);
+EFI_ATTR_SHOW(runtime);
+EFI_ATTR_SHOW(config_table);
+
+static struct kobj_attribute efi_attr_fw_vendor = __ATTR_RO(fw_vendor);
+static struct kobj_attribute efi_attr_runtime = __ATTR_RO(runtime);
+static struct kobj_attribute efi_attr_config_table = __ATTR_RO(config_table);
+
static struct attribute *efi_subsys_attrs[] = {
&efi_attr_systab.attr,
+ &efi_attr_fw_vendor.attr,
+ &efi_attr_runtime.attr,
+ &efi_attr_config_table.attr,
NULL, /* maybe more in the future? */
};
+static umode_t efi_attr_is_visible(struct kobject *kobj,
+ struct attribute *attr, int n)
+{
+ umode_t mode = attr->mode;
+
+ if (attr == &efi_attr_fw_vendor.attr)
+ return (efi.fw_vendor == EFI_INVALID_TABLE_ADDR) ? 0 : mode;
+ else if (attr == &efi_attr_runtime.attr)
+ return (efi.runtime == EFI_INVALID_TABLE_ADDR) ? 0 : mode;
+ else if (attr == &efi_attr_config_table.attr)
+ return (efi.config_table == EFI_INVALID_TABLE_ADDR) ? 0 : mode;
+
+ return mode;
+}
+
static struct attribute_group efi_subsys_attr_group = {
.attrs = efi_subsys_attrs,
+ .is_visible = efi_attr_is_visible,
};
static struct efivars generic_efivars;
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 6c0ca52..fb60b10 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -556,6 +556,9 @@ extern struct efi {
unsigned long hcdp; /* HCDP table */
unsigned long uga; /* UGA table */
unsigned long uv_systab; /* UV system table */
+ unsigned long fw_vendor; /* fw_vendor */
+ unsigned long runtime; /* runtime table */
+ unsigned long config_table; /* config tables */
efi_get_time_t *get_time;
efi_set_time_t *set_time;
efi_get_wakeup_time_t *get_wakeup_time;
--
1.8.3.1
next prev parent reply other threads:[~2013-12-09 9:42 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-09 9:42 [PATCH v5 00/14] kexec kernel efi runtime support Dave Young
[not found] ` <1386582147-9802-1-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-09 9:42 ` [PATCH v5 01/14] x86/mm: sparse warning fix for early_memremap Dave Young
[not found] ` <1386582147-9802-2-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-09 15:05 ` Borislav Petkov
[not found] ` <20131209150521.GE31650-fF5Pk5pvG8Y@public.gmane.org>
2013-12-10 2:12 ` Dave Young
[not found] ` <20131210021221.GA3800-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-11 10:20 ` Matt Fleming
2013-12-11 11:12 ` Borislav Petkov
[not found] ` <20131211111240.GE21683-fF5Pk5pvG8Y@public.gmane.org>
2013-12-12 2:06 ` Dave Young
2013-12-09 9:42 ` [PATCH v5 02/14] efi: use early_memremap and early_memunmap Dave Young
[not found] ` <1386582147-9802-3-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-11 10:39 ` Matt Fleming
2013-12-11 11:02 ` Leif Lindholm
[not found] ` <20131211110227.GK22356-GZEopFhza0F985/tl1ce8aaDwS/vmuI7@public.gmane.org>
2013-12-11 11:32 ` Matt Fleming
[not found] ` <20131211113207.GA29980-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-12-11 15:17 ` Mark Salter
2013-12-13 15:51 ` Leif Lindholm
[not found] ` <20131213155133.GR22356-GZEopFhza0F985/tl1ce8aaDwS/vmuI7@public.gmane.org>
2013-12-16 1:50 ` Dave Young
[not found] ` <20131211103903.GC19196-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-12-12 2:04 ` Dave Young
2013-12-11 17:38 ` Borislav Petkov
2013-12-09 9:42 ` [PATCH v5 03/14] efi: remove unused variables in __map_region Dave Young
2013-12-09 9:42 ` [PATCH v5 04/14] efi: add a wrapper function efi_map_region_fixed Dave Young
2013-12-09 9:42 ` [PATCH v5 05/14] efi: reserve boot service fix Dave Young
2013-12-09 9:42 ` [PATCH v5 06/14] efi: cleanup efi_enter_virtual_mode function Dave Young
2013-12-09 9:42 ` Dave Young [this message]
[not found] ` <1386582147-9802-8-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-11 18:32 ` [PATCH v5 07/14] efi: export more efi table variable to sysfs Borislav Petkov
[not found] ` <20131211183203.GF23793-fF5Pk5pvG8Y@public.gmane.org>
2013-12-12 2:15 ` Dave Young
2013-12-09 9:42 ` [PATCH v5 08/14] efi: export efi runtime memory mapping " Dave Young
[not found] ` <1386582147-9802-9-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-11 18:55 ` Borislav Petkov
[not found] ` <20131211185520.GG23793-fF5Pk5pvG8Y@public.gmane.org>
2013-12-12 2:36 ` Dave Young
[not found] ` <20131212023617.GF3751-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-12 7:13 ` Dave Young
2013-12-12 20:36 ` Borislav Petkov
[not found] ` <20131212203656.GC26927-fF5Pk5pvG8Y@public.gmane.org>
2013-12-13 7:20 ` Dave Young
2013-12-12 20:53 ` Borislav Petkov
[not found] ` <20131212205346.GA30162-fF5Pk5pvG8Y@public.gmane.org>
2013-12-13 7:26 ` Dave Young
[not found] ` <20131213072600.GB11164-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-13 12:30 ` Matt Fleming
[not found] ` <20131213123028.GB18640-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-12-16 1:33 ` Dave Young
[not found] ` <20131216013319.GA3754-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-16 3:02 ` Dave Young
2013-12-16 6:02 ` Dave Young
2013-12-09 9:42 ` [PATCH v5 09/14] efi: passing kexec necessary efi data via setup_data Dave Young
[not found] ` <1386582147-9802-10-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-11 12:13 ` Matt Fleming
[not found] ` <20131211121352.GB29980-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org>
2013-12-11 14:05 ` Borislav Petkov
[not found] ` <20131211140531.GJ21683-fF5Pk5pvG8Y@public.gmane.org>
2013-12-12 2:11 ` Dave Young
2013-12-12 2:10 ` Dave Young
2013-12-11 22:20 ` Borislav Petkov
[not found] ` <20131211222057.GB8863-fF5Pk5pvG8Y@public.gmane.org>
2013-12-12 3:06 ` Dave Young
[not found] ` <20131212030619.GG3751-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-12 6:25 ` Dave Young
2013-12-12 7:17 ` Dave Young
[not found] ` <20131212071743.GJ3751-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-12 21:04 ` Borislav Petkov
[not found] ` <20131212210439.GB30162-fF5Pk5pvG8Y@public.gmane.org>
2013-12-13 7:27 ` Dave Young
2013-12-09 9:42 ` [PATCH v5 10/14] efi: only print saved efi runtime maps instead of all memmap ranges for kexec Dave Young
2013-12-13 16:01 ` Borislav Petkov
[not found] ` <20131213160150.GE32329-fF5Pk5pvG8Y@public.gmane.org>
2013-12-16 2:00 ` Dave Young
[not found] ` <20131216020010.GC3754-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-16 11:33 ` Borislav Petkov
[not found] ` <20131216113324.GB4922-fF5Pk5pvG8Y@public.gmane.org>
2013-12-17 6:34 ` Dave Young
[not found] ` <20131217063436.GF6751-je1gSBvt1TcFLmT5oZ11vB/sF2h8X+2i0E9HWUfgJXw@public.gmane.org>
2013-12-17 15:58 ` Borislav Petkov
[not found] ` <20131217155844.GG30592-fF5Pk5pvG8Y@public.gmane.org>
2013-12-18 2:06 ` Dave Young
2013-12-09 9:42 ` [PATCH v5 11/14] x86: add xloadflags bit for efi runtime support on kexec Dave Young
2013-12-09 9:42 ` [PATCH v5 12/14] x86: export x86 boot_params to sysfs Dave Young
[not found] ` <1386582147-9802-13-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-13 20:04 ` Borislav Petkov
2013-12-09 9:42 ` [PATCH v5 13/14] x86: reserve setup_data ranges late after parsing memmap cmdline Dave Young
[not found] ` <1386582147-9802-14-git-send-email-dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2013-12-13 20:04 ` Borislav Petkov
2013-12-09 9:42 ` [PATCH v5 14/14] x86: kdebugfs do not use __va for getting setup_data virt addr Dave Young
2013-12-10 23:25 ` [PATCH v5 00/14] kexec kernel efi runtime support Andrew Morton
2013-12-10 23:32 ` Borislav Petkov
[not found] ` <20131210233207.GI31437-fF5Pk5pvG8Y@public.gmane.org>
2013-12-10 23:38 ` H. Peter Anvin
[not found] ` <52A7A5D9.9030504-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
2013-12-11 12:37 ` 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=1386582147-9802-8-git-send-email-dyoung@redhat.com \
--to=dyoung-h+wxahxf7alqt0dzr+alfa@public.gmane.org \
--cc=James.Bottomley-d9PhHud1JfjCXq6kfMZ53/egYHeGw8Jk@public.gmane.org \
--cc=bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org \
--cc=ebiederm-aS9lmoZGLiVWk0Htik3J/w@public.gmane.org \
--cc=greg-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org \
--cc=horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org \
--cc=hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org \
--cc=kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=matt-HNK1S37rvNbeXh+fF434Mdi2O/JbrIOy@public.gmane.org \
--cc=mjg59-1xO5oi07KQx4cg9Nei1l7Q@public.gmane.org \
--cc=toshi.kani-VXdhtT5mjnY@public.gmane.org \
--cc=vgoyal-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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).