Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1244721 > unrolled thread
| Started by | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| First post | 2015-10-12 16:00 +0200 |
| Last post | 2015-10-14 17:10 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[GIT PULL 00/11] EFI changes for v4.4 Matt Fleming <matt@codeblueprint.co.uk> - 2015-10-12 16:00 +0200
[PATCH 10/11] x86/efi: Rename print_efi_memmap() to efi_print_memmap() Matt Fleming <matt@codeblueprint.co.uk> - 2015-10-12 16:00 +0200
[PATCH 11/11] efi: Add "efi_fake_mem" boot option Matt Fleming <matt@codeblueprint.co.uk> - 2015-10-12 16:00 +0200
Re: [GIT PULL 00/11] EFI changes for v4.4 Ingo Molnar <mingo@kernel.org> - 2015-10-14 17:10 +0200
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2015-10-12 16:00 +0200 |
| Subject | [GIT PULL 00/11] EFI changes for v4.4 |
| Message-ID | <qiLNT-LL-3@gated-at.bofh.it> |
From: Matt Fleming <matt.fleming@intel.com>
Folks, please pull the below patches. The largest thing is probably
the introduction of Taku's "efi_fake_mem" kernel option which allows
the EFI memory map passed from the firmware to the kernel to be
modified with additional memory map attributes.
There's also the ground work from Ard for supporting the
EFI_PROPERTIES_TABLE feature, which allows us to use more strict page
mapping attributes for the EFI runtime services regions (such as RO
for code and NX for data). Actually doing that will come in the
future.
Other than that, it's small changes and cleanups.
The following changes since commit 0ce423b6492a02be11662bfaa837dd16945aad3e:
efi: Use the generic efi.memmap instead of 'memmap' (2015-10-11 11:04:18 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-next
for you to fetch changes up to 0f96a99dab366333439e110d6ad253bc7c557c09:
efi: Add "efi_fake_mem" boot option (2015-10-12 14:20:09 +0100)
----------------------------------------------------------------
* Make the EFI System Resource Table (ESRT) driver explicitly
non-modular by ripping out the module_* code since Kconfig doesn't
allow it to be built as a module anyway - Paul Gortmaker
* Make the x86 efi=debug kernel parameter, which enables EFI debug
code and output, generic and usable by arm64 - Leif Lindholm
* Add support to the x86 EFI boot stub for 64-bit Graphics Output
Protocol frame buffer addresses - Matt Fleming
* Detect when the UEFI v2.5 EFI_PROPERTIES_TABLE feature is enabled
in the firmware and set an efi.flags bit so the kernel knows when
it can apply more strict runtime mapping attributes - Ard Biesheuvel
* Auto-load the efi-pstore module on EFI systems, just like we
currently do for the efivars module - Ben Hutchings
* Add "efi_fake_mem" kernel parameter which allows the system's EFI
memory map to be updated with additional attributes for specific
memory ranges. This is useful for testing the kernel code that handles
the EFI_MEMORY_MORE_RELIABLE memmap bit even if your firmware
doesn't include support - Taku Izumi
----------------------------------------------------------------
Ard Biesheuvel (2):
efi: Add support for UEFIv2.5 Properties table
efi: Introduce EFI_NX_PE_DATA bit and set it from properties table
Ben Hutchings (1):
efi: Auto-load the efi-pstore module
Leif Lindholm (3):
efi/x86: Move efi=debug option parsing to core
arm64: Use core efi=debug instead of uefi_debug command line parameter
efi/arm64: Clean up efi_get_fdt_params() interface
Matt Fleming (1):
efifb: Add support for 64-bit frame buffer addresses
Paul Gortmaker (1):
drivers/firmware: Make efi/esrt.c driver explicitly non-modular
Taku Izumi (3):
efi: Add EFI_MEMORY_MORE_RELIABLE support to efi_md_typeattr_format()
x86/efi: Rename print_efi_memmap() to efi_print_memmap()
efi: Add "efi_fake_mem" boot option
Documentation/arm/uefi.txt | 2 -
Documentation/kernel-parameters.txt | 15 +++
arch/arm64/kernel/efi.c | 19 +--
arch/x86/boot/compressed/eboot.c | 24 +++-
arch/x86/include/asm/efi.h | 1 +
arch/x86/kernel/setup.c | 4 +-
arch/x86/platform/efi/efi.c | 6 +-
drivers/firmware/efi/Kconfig | 22 ++++
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/efi-pstore.c | 1 +
drivers/firmware/efi/efi.c | 62 +++++++---
drivers/firmware/efi/esrt.c | 19 +--
drivers/firmware/efi/fake_mem.c | 238 ++++++++++++++++++++++++++++++++++++
drivers/video/fbdev/efifb.c | 24 +++-
include/linux/efi.h | 22 +++-
include/uapi/linux/screen_info.h | 5 +-
16 files changed, 400 insertions(+), 65 deletions(-)
create mode 100644 drivers/firmware/efi/fake_mem.c
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2015-10-12 16:00 +0200 |
| Subject | [PATCH 10/11] x86/efi: Rename print_efi_memmap() to efi_print_memmap() |
| Message-ID | <qiLNW-LL-59@gated-at.bofh.it> |
| In reply to | #1244721 |
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
This patch renames print_efi_memmap() to efi_print_memmap() and
make it global function so that we can invoke it outside of
arch/x86/platform/efi/efi.c
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---
arch/x86/include/asm/efi.h | 1 +
arch/x86/platform/efi/efi.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h
index 155162ea0e00..cfee9d4b02af 100644
--- a/arch/x86/include/asm/efi.h
+++ b/arch/x86/include/asm/efi.h
@@ -93,6 +93,7 @@ extern void __init efi_set_executable(efi_memory_desc_t *md, bool executable);
extern int __init efi_memblock_x86_reserve_range(void);
extern pgd_t * __init efi_call_phys_prolog(void);
extern void __init efi_call_phys_epilog(pgd_t *save_pgd);
+extern void __init efi_print_memmap(void);
extern void __init efi_unmap_memmap(void);
extern void __init efi_memory_uc(u64 addr, unsigned long size);
extern void __init efi_map_region(efi_memory_desc_t *md);
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 4d0ff0f27a99..c69e58fb7f19 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -222,7 +222,7 @@ int __init efi_memblock_x86_reserve_range(void)
return 0;
}
-static void __init print_efi_memmap(void)
+void __init efi_print_memmap(void)
{
#ifdef EFI_DEBUG
efi_memory_desc_t *md;
@@ -524,7 +524,7 @@ void __init efi_init(void)
return;
if (efi_enabled(EFI_DBG))
- print_efi_memmap();
+ efi_print_memmap();
efi_esrt_init();
}
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2015-10-12 16:00 +0200 |
| Subject | [PATCH 11/11] efi: Add "efi_fake_mem" boot option |
| Message-ID | <qiLNW-LL-61@gated-at.bofh.it> |
| In reply to | #1244721 |
From: Taku Izumi <izumi.taku@jp.fujitsu.com>
This patch introduces new boot option named "efi_fake_mem".
By specifying this parameter, you can add arbitrary attribute
to specific memory range.
This is useful for debugging of Address Range Mirroring feature.
For example, if "efi_fake_mem=2G@4G:0x10000,2G@0x10a0000000:0x10000"
is specified, the original (firmware provided) EFI memmap will be
updated so that the specified memory regions have
EFI_MEMORY_MORE_RELIABLE attribute (0x10000):
<original>
efi: mem36: [Conventional Memory| | | | | | |WB|WT|WC|UC] range=[0x0000000100000000-0x00000020a0000000) (129536MB)
<updated>
efi: mem36: [Conventional Memory| |MR| | | | |WB|WT|WC|UC] range=[0x0000000100000000-0x0000000180000000) (2048MB)
efi: mem37: [Conventional Memory| | | | | | |WB|WT|WC|UC] range=[0x0000000180000000-0x00000010a0000000) (61952MB)
efi: mem38: [Conventional Memory| |MR| | | | |WB|WT|WC|UC] range=[0x00000010a0000000-0x0000001120000000) (2048MB)
efi: mem39: [Conventional Memory| | | | | | |WB|WT|WC|UC] range=[0x0000001120000000-0x00000020a0000000) (63488MB)
And you will find that the following message is output:
efi: Memory: 4096M/131455M mirrored memory
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
---
Documentation/kernel-parameters.txt | 15 +++
arch/x86/kernel/setup.c | 4 +-
drivers/firmware/efi/Kconfig | 22 ++++
drivers/firmware/efi/Makefile | 1 +
drivers/firmware/efi/fake_mem.c | 238 ++++++++++++++++++++++++++++++++++++
include/linux/efi.h | 6 +
6 files changed, 285 insertions(+), 1 deletion(-)
create mode 100644 drivers/firmware/efi/fake_mem.c
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1d6f0459cd7b..cd5312f24981 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1092,6 +1092,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
you are really sure that your UEFI does sane gc and
fulfills the spec otherwise your board may brick.
+ efi_fake_mem= nn[KMG]@ss[KMG]:aa[,nn[KMG]@ss[KMG]:aa,..] [EFI; X86]
+ Add arbitrary attribute to specific memory range by
+ updating original EFI memory map.
+ Region of memory which aa attribute is added to is
+ from ss to ss+nn.
+ If efi_fake_mem=2G@4G:0x10000,2G@0x10a0000000:0x10000
+ is specified, EFI_MEMORY_MORE_RELIABLE(0x10000)
+ attribute is added to range 0x100000000-0x180000000 and
+ 0x10a0000000-0x1120000000.
+
+ Using this parameter you can do debugging of EFI memmap
+ related feature. For example, you can do debugging of
+ Address Range Mirroring feature even if your box
+ doesn't support it.
+
eisa_irq_edge= [PARISC,HW]
See header of drivers/parisc/eisa.c.
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 80f874bf999e..e3ed628f7db4 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1104,8 +1104,10 @@ void __init setup_arch(char **cmdline_p)
memblock_set_current_limit(ISA_END_ADDRESS);
memblock_x86_fill();
- if (efi_enabled(EFI_BOOT))
+ if (efi_enabled(EFI_BOOT)) {
+ efi_fake_memmap();
efi_find_mirror();
+ }
/*
* The EFI specification says that boot service code won't be called
diff --git a/drivers/firmware/efi/Kconfig b/drivers/firmware/efi/Kconfig
index 54071c148340..1de6f0ed5077 100644
--- a/drivers/firmware/efi/Kconfig
+++ b/drivers/firmware/efi/Kconfig
@@ -52,6 +52,28 @@ config EFI_RUNTIME_MAP
See also Documentation/ABI/testing/sysfs-firmware-efi-runtime-map.
+config EFI_FAKE_MEMMAP
+ bool "Enable EFI fake memory map"
+ depends on EFI && X86
+ default n
+ help
+ Saying Y here will enable "efi_fake_mem" boot option.
+ By specifying this parameter, you can add arbitrary attribute
+ to specific memory range by updating original (firmware provided)
+ EFI memmap.
+ This is useful for debugging of EFI memmap related feature.
+ e.g. Address Range Mirroring feature.
+
+config EFI_MAX_FAKE_MEM
+ int "maximum allowable number of ranges in efi_fake_mem boot option"
+ depends on EFI_FAKE_MEMMAP
+ range 1 128
+ default 8
+ help
+ Maximum allowable number of ranges in efi_fake_mem boot option.
+ Ranges can be set up to this value using comma-separated list.
+ The default value is 8.
+
config EFI_PARAMS_FROM_FDT
bool
help
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index 6fd3da938717..c24f00569acb 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -9,3 +9,4 @@ obj-$(CONFIG_UEFI_CPER) += cper.o
obj-$(CONFIG_EFI_RUNTIME_MAP) += runtime-map.o
obj-$(CONFIG_EFI_RUNTIME_WRAPPERS) += runtime-wrappers.o
obj-$(CONFIG_EFI_STUB) += libstub/
+obj-$(CONFIG_EFI_FAKE_MEMMAP) += fake_mem.o
diff --git a/drivers/firmware/efi/fake_mem.c b/drivers/firmware/efi/fake_mem.c
new file mode 100644
index 000000000000..32bcb14df2c8
--- /dev/null
+++ b/drivers/firmware/efi/fake_mem.c
@@ -0,0 +1,238 @@
+/*
+ * fake_mem.c
+ *
+ * Copyright (C) 2015 FUJITSU LIMITED
+ * Author: Taku Izumi <izumi.taku@jp.fujitsu.com>
+ *
+ * This code introduces new boot option named "efi_fake_mem"
+ * By specifying this parameter, you can add arbitrary attribute to
+ * specific memory range by updating original (firmware provided) EFI
+ * memmap.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * The full GNU General Public License is included in this distribution in
+ * the file called "COPYING".
+ */
+
+#include <linux/kernel.h>
+#include <linux/efi.h>
+#include <linux/init.h>
+#include <linux/memblock.h>
+#include <linux/types.h>
+#include <linux/sort.h>
+#include <asm/efi.h>
+
+#define EFI_MAX_FAKEMEM CONFIG_EFI_MAX_FAKE_MEM
+
+struct fake_mem {
+ struct range range;
+ u64 attribute;
+};
+static struct fake_mem fake_mems[EFI_MAX_FAKEMEM];
+static int nr_fake_mem;
+
+static int __init cmp_fake_mem(const void *x1, const void *x2)
+{
+ const struct fake_mem *m1 = x1;
+ const struct fake_mem *m2 = x2;
+
+ if (m1->range.start < m2->range.start)
+ return -1;
+ if (m1->range.start > m2->range.start)
+ return 1;
+ return 0;
+}
+
+void __init efi_fake_memmap(void)
+{
+ u64 start, end, m_start, m_end, m_attr;
+ int new_nr_map = memmap.nr_map;
+ efi_memory_desc_t *md;
+ u64 new_memmap_phy;
+ void *new_memmap;
+ void *old, *new;
+ int i;
+
+ if (!nr_fake_mem || !efi_enabled(EFI_MEMMAP))
+ return;
+
+ /* count up the number of EFI memory descriptor */
+ for (old = memmap.map; old < memmap.map_end; old += memmap.desc_size) {
+ md = old;
+ start = md->phys_addr;
+ end = start + (md->num_pages << EFI_PAGE_SHIFT) - 1;
+
+ for (i = 0; i < nr_fake_mem; i++) {
+ /* modifying range */
+ m_start = fake_mems[i].range.start;
+ m_end = fake_mems[i].range.end;
+
+ if (m_start <= start) {
+ /* split into 2 parts */
+ if (start < m_end && m_end < end)
+ new_nr_map++;
+ }
+ if (start < m_start && m_start < end) {
+ /* split into 3 parts */
+ if (m_end < end)
+ new_nr_map += 2;
+ /* split into 2 parts */
+ if (end <= m_end)
+ new_nr_map++;
+ }
+ }
+ }
+
+ /* allocate memory for new EFI memmap */
+ new_memmap_phy = memblock_alloc(memmap.desc_size * new_nr_map,
+ PAGE_SIZE);
+ if (!new_memmap_phy)
+ return;
+
+ /* create new EFI memmap */
+ new_memmap = early_memremap(new_memmap_phy,
+ memmap.desc_size * new_nr_map);
+ if (!new_memmap) {
+ memblock_free(new_memmap_phy, memmap.desc_size * new_nr_map);
+ return;
+ }
+
+ for (old = memmap.map, new = new_memmap;
+ old < memmap.map_end;
+ old += memmap.desc_size, new += memmap.desc_size) {
+
+ /* copy original EFI memory descriptor */
+ memcpy(new, old, memmap.desc_size);
+ md = new;
+ start = md->phys_addr;
+ end = md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT) - 1;
+
+ for (i = 0; i < nr_fake_mem; i++) {
+ /* modifying range */
+ m_start = fake_mems[i].range.start;
+ m_end = fake_mems[i].range.end;
+ m_attr = fake_mems[i].attribute;
+
+ if (m_start <= start && end <= m_end)
+ md->attribute |= m_attr;
+
+ if (m_start <= start &&
+ (start < m_end && m_end < end)) {
+ /* first part */
+ md->attribute |= m_attr;
+ md->num_pages = (m_end - md->phys_addr + 1) >>
+ EFI_PAGE_SHIFT;
+ /* latter part */
+ new += memmap.desc_size;
+ memcpy(new, old, memmap.desc_size);
+ md = new;
+ md->phys_addr = m_end + 1;
+ md->num_pages = (end - md->phys_addr + 1) >>
+ EFI_PAGE_SHIFT;
+ }
+
+ if ((start < m_start && m_start < end) && m_end < end) {
+ /* first part */
+ md->num_pages = (m_start - md->phys_addr) >>
+ EFI_PAGE_SHIFT;
+ /* middle part */
+ new += memmap.desc_size;
+ memcpy(new, old, memmap.desc_size);
+ md = new;
+ md->attribute |= m_attr;
+ md->phys_addr = m_start;
+ md->num_pages = (m_end - m_start + 1) >>
+ EFI_PAGE_SHIFT;
+ /* last part */
+ new += memmap.desc_size;
+ memcpy(new, old, memmap.desc_size);
+ md = new;
+ md->phys_addr = m_end + 1;
+ md->num_pages = (end - m_end) >>
+ EFI_PAGE_SHIFT;
+ }
+
+ if ((start < m_start && m_start < end) &&
+ (end <= m_end)) {
+ /* first part */
+ md->num_pages = (m_start - md->phys_addr) >>
+ EFI_PAGE_SHIFT;
+ /* latter part */
+ new += memmap.desc_size;
+ memcpy(new, old, memmap.desc_size);
+ md = new;
+ md->phys_addr = m_start;
+ md->num_pages = (end - md->phys_addr + 1) >>
+ EFI_PAGE_SHIFT;
+ md->attribute |= m_attr;
+ }
+ }
+ }
+
+ /* swap into new EFI memmap */
+ efi_unmap_memmap();
+ memmap.map = new_memmap;
+ memmap.phys_map = (void *)new_memmap_phy;
+ memmap.nr_map = new_nr_map;
+ memmap.map_end = memmap.map + memmap.nr_map * memmap.desc_size;
+ set_bit(EFI_MEMMAP, &efi.flags);
+
+ /* print new EFI memmap */
+ efi_print_memmap();
+}
+
+static int __init setup_fake_mem(char *p)
+{
+ u64 start = 0, mem_size = 0, attribute = 0;
+ int i;
+
+ if (!p)
+ return -EINVAL;
+
+ while (*p != '\0') {
+ mem_size = memparse(p, &p);
+ if (*p == '@')
+ start = memparse(p+1, &p);
+ else
+ break;
+
+ if (*p == ':')
+ attribute = simple_strtoull(p+1, &p, 0);
+ else
+ break;
+
+ if (nr_fake_mem >= EFI_MAX_FAKEMEM)
+ break;
+
+ fake_mems[nr_fake_mem].range.start = start;
+ fake_mems[nr_fake_mem].range.end = start + mem_size - 1;
+ fake_mems[nr_fake_mem].attribute = attribute;
+ nr_fake_mem++;
+
+ if (*p == ',')
+ p++;
+ }
+
+ sort(fake_mems, nr_fake_mem, sizeof(struct fake_mem),
+ cmp_fake_mem, NULL);
+
+ for (i = 0; i < nr_fake_mem; i++)
+ pr_info("efi_fake_mem: add attr=0x%016llx to [mem 0x%016llx-0x%016llx]",
+ fake_mems[i].attribute, fake_mems[i].range.start,
+ fake_mems[i].range.end);
+
+ return *p == '\0' ? 0 : -EINVAL;
+}
+
+early_param("efi_fake_mem", setup_fake_mem);
diff --git a/include/linux/efi.h b/include/linux/efi.h
index fa5106c2f9f5..4d01c1033fce 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -922,6 +922,12 @@ extern struct kobject *efi_kobj;
extern int efi_reboot_quirk_mode;
extern bool efi_poweroff_required(void);
+#ifdef CONFIG_EFI_FAKE_MEMMAP
+extern void __init efi_fake_memmap(void);
+#else
+static inline void efi_fake_memmap(void) { }
+#endif
+
/* Iterate through an efi_memory_map */
#define for_each_efi_memory_desc(m, md) \
for ((md) = (m)->map; \
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [next] | [standalone]
| From | Ingo Molnar <mingo@kernel.org> |
|---|---|
| Date | 2015-10-14 17:10 +0200 |
| Message-ID | <qjvQK-2a2-3@gated-at.bofh.it> |
| In reply to | #1244721 |
* Matt Fleming <matt@codeblueprint.co.uk> wrote: > From: Matt Fleming <matt.fleming@intel.com> > > Folks, please pull the below patches. The largest thing is probably > the introduction of Taku's "efi_fake_mem" kernel option which allows > the EFI memory map passed from the firmware to the kernel to be > modified with additional memory map attributes. > > There's also the ground work from Ard for supporting the > EFI_PROPERTIES_TABLE feature, which allows us to use more strict page > mapping attributes for the EFI runtime services regions (such as RO > for code and NX for data). Actually doing that will come in the > future. > > Other than that, it's small changes and cleanups. > > The following changes since commit 0ce423b6492a02be11662bfaa837dd16945aad3e: > > efi: Use the generic efi.memmap instead of 'memmap' (2015-10-11 11:04:18 +0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git tags/efi-next > > for you to fetch changes up to 0f96a99dab366333439e110d6ad253bc7c557c09: > > efi: Add "efi_fake_mem" boot option (2015-10-12 14:20:09 +0100) > > ---------------------------------------------------------------- > * Make the EFI System Resource Table (ESRT) driver explicitly > non-modular by ripping out the module_* code since Kconfig doesn't > allow it to be built as a module anyway - Paul Gortmaker > > * Make the x86 efi=debug kernel parameter, which enables EFI debug > code and output, generic and usable by arm64 - Leif Lindholm > > * Add support to the x86 EFI boot stub for 64-bit Graphics Output > Protocol frame buffer addresses - Matt Fleming > > * Detect when the UEFI v2.5 EFI_PROPERTIES_TABLE feature is enabled > in the firmware and set an efi.flags bit so the kernel knows when > it can apply more strict runtime mapping attributes - Ard Biesheuvel > > * Auto-load the efi-pstore module on EFI systems, just like we > currently do for the efivars module - Ben Hutchings > > * Add "efi_fake_mem" kernel parameter which allows the system's EFI > memory map to be updated with additional attributes for specific > memory ranges. This is useful for testing the kernel code that handles > the EFI_MEMORY_MORE_RELIABLE memmap bit even if your firmware > doesn't include support - Taku Izumi > > ---------------------------------------------------------------- > Ard Biesheuvel (2): > efi: Add support for UEFIv2.5 Properties table > efi: Introduce EFI_NX_PE_DATA bit and set it from properties table > > Ben Hutchings (1): > efi: Auto-load the efi-pstore module > > Leif Lindholm (3): > efi/x86: Move efi=debug option parsing to core > arm64: Use core efi=debug instead of uefi_debug command line parameter > efi/arm64: Clean up efi_get_fdt_params() interface > > Matt Fleming (1): > efifb: Add support for 64-bit frame buffer addresses > > Paul Gortmaker (1): > drivers/firmware: Make efi/esrt.c driver explicitly non-modular > > Taku Izumi (3): > efi: Add EFI_MEMORY_MORE_RELIABLE support to efi_md_typeattr_format() > x86/efi: Rename print_efi_memmap() to efi_print_memmap() > efi: Add "efi_fake_mem" boot option > > Documentation/arm/uefi.txt | 2 - > Documentation/kernel-parameters.txt | 15 +++ > arch/arm64/kernel/efi.c | 19 +-- > arch/x86/boot/compressed/eboot.c | 24 +++- > arch/x86/include/asm/efi.h | 1 + > arch/x86/kernel/setup.c | 4 +- > arch/x86/platform/efi/efi.c | 6 +- > drivers/firmware/efi/Kconfig | 22 ++++ > drivers/firmware/efi/Makefile | 1 + > drivers/firmware/efi/efi-pstore.c | 1 + > drivers/firmware/efi/efi.c | 62 +++++++--- > drivers/firmware/efi/esrt.c | 19 +-- > drivers/firmware/efi/fake_mem.c | 238 ++++++++++++++++++++++++++++++++++++ > drivers/video/fbdev/efifb.c | 24 +++- > include/linux/efi.h | 22 +++- > include/uapi/linux/screen_info.h | 5 +- > 16 files changed, 400 insertions(+), 65 deletions(-) > create mode 100644 drivers/firmware/efi/fake_mem.c Pulled, thanks Matt! Ingo -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web