* [PATCH 1/5] efi/libstub: refactor cmd_stubcopy
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
@ 2019-03-28 19:34 ` Ard Biesheuvel
2019-03-29 6:43 ` [tip:efi/core] efi/libstub: Refactor the cmd_stubcopy Makefile command tip-bot for Masahiro Yamada
2019-03-28 19:34 ` [PATCH 2/5] efifb: omit memory map check on legacy boot Ard Biesheuvel
` (4 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-03-28 19:34 UTC (permalink / raw)
To: linux-efi, Ingo Molnar, Thomas Gleixner
Cc: Masahiro Yamada, Ard Biesheuvel, linux-kernel
From: Masahiro Yamada <yamada.masahiro@socionext.com>
It took me a while to understand what is going on in the nested
if-blocks.
Simplify it by removing unneeded code.
- if_changed automatically adds 'set -e', so any failure in the
series of commands makes it immediately fail as a whole.
So, the outer if block is entirely redundant.
- Since commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special
target"), GNU Make automatically deletes the target on any failure
in its recipe. The explicit 'rm -f $@' is redundant.
- surrounding commands with ( ) will spawn a subshell to execute them
in it, but it is rarely useful to do so.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/firmware/efi/libstub/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index b0103e16fc1b..ae9081988c88 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -86,12 +86,13 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
# this time, use objcopy and leave all sections in place.
#
quiet_cmd_stubcopy = STUBCPY $@
- cmd_stubcopy = if $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
- then if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); \
- then (echo >&2 "$@: absolute symbol references not allowed in the EFI stub"; \
- rm -f $@; /bin/false); \
- else $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@; fi \
- else /bin/false; fi
+ cmd_stubcopy = \
+ $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
+ if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then \
+ echo "$@: absolute symbol references not allowed in the EFI stub" >&2; \
+ /bin/false; \
+ fi; \
+ $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@
#
# ARM discards the .data section because it disallows r/w data in the
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [tip:efi/core] efi/libstub: Refactor the cmd_stubcopy Makefile command
2019-03-28 19:34 ` [PATCH 1/5] efi/libstub: refactor cmd_stubcopy Ard Biesheuvel
@ 2019-03-29 6:43 ` tip-bot for Masahiro Yamada
0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Masahiro Yamada @ 2019-03-29 6:43 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, ard.biesheuvel, linux-kernel, peterz, mingo, tglx,
yamada.masahiro, matt, hpa
Commit-ID: e8d368ad20f514dce86a64931fe4a6f06a0a6703
Gitweb: https://git.kernel.org/tip/e8d368ad20f514dce86a64931fe4a6f06a0a6703
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
AuthorDate: Thu, 28 Mar 2019 20:34:25 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Mar 2019 07:34:59 +0100
efi/libstub: Refactor the cmd_stubcopy Makefile command
It took me a while to understand what is going on in the nested
if-blocks.
Simplify it by removing unneeded code.
- if_changed automatically adds 'set -e', so any failure in the
series of commands makes it immediately fail as a whole.
So, the outer if block is entirely redundant.
- Since commit 9c2af1c7377a ("kbuild: add .DELETE_ON_ERROR special target"),
GNU Make automatically deletes the target on any failure
in its recipe. The explicit 'rm -f $@' is redundant.
- Surrounding commands with ( ) will spawn a subshell to execute them
in it, but it is rarely useful to do so.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-2-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/firmware/efi/libstub/Makefile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index b0103e16fc1b..ae9081988c88 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -86,12 +86,13 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
# this time, use objcopy and leave all sections in place.
#
quiet_cmd_stubcopy = STUBCPY $@
- cmd_stubcopy = if $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
- then if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); \
- then (echo >&2 "$@: absolute symbol references not allowed in the EFI stub"; \
- rm -f $@; /bin/false); \
- else $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@; fi \
- else /bin/false; fi
+ cmd_stubcopy = \
+ $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
+ if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then \
+ echo "$@: absolute symbol references not allowed in the EFI stub" >&2; \
+ /bin/false; \
+ fi; \
+ $(OBJCOPY) $(STUBCOPY_FLAGS-y) $< $@
#
# ARM discards the .data section because it disallows r/w data in the
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/5] efifb: omit memory map check on legacy boot
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
2019-03-28 19:34 ` [PATCH 1/5] efi/libstub: refactor cmd_stubcopy Ard Biesheuvel
@ 2019-03-28 19:34 ` Ard Biesheuvel
2019-03-29 6:44 ` [tip:efi/core] efifb: Omit " tip-bot for Ard Biesheuvel
2019-03-28 19:34 ` [PATCH 3/5] efi/arm: Show SMBIOS bank/device location in cper and ghes error logs Ard Biesheuvel
` (3 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-03-28 19:34 UTC (permalink / raw)
To: linux-efi, Ingo Molnar, Thomas Gleixner
Cc: Ard Biesheuvel, linux-kernel, Peter Jones, Takashi Iwai
Since 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes
when mapping the FB"), efifb_probe() checks its memory range via
efi_mem_desc_lookup(), and this leads to a spurious error message
"EFI_MEMMAP is not enabled" at every boot on KVM. This is quite
annoying since the error message appears even if you set "quiet" boot
option.
Since this happens on legacy boot, which strangely enough exposes
a EFI framebuffer via screen_info, let's double check that we are
doing an EFI boot before attempting to access the EFI memory map.
Cc: Peter Jones <pjones@redhat.com>
Tested-by: Takashi Iwai <tiwai@suse.de>
Reported-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/video/fbdev/efifb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index ba906876cc45..9e529cc2b4ff 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -464,7 +464,8 @@ static int efifb_probe(struct platform_device *dev)
info->apertures->ranges[0].base = efifb_fix.smem_start;
info->apertures->ranges[0].size = size_remap;
- if (!efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
+ if (efi_enabled(EFI_BOOT) &&
+ !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
if ((efifb_fix.smem_start + efifb_fix.smem_len) >
(md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {
pr_err("efifb: video memory @ 0x%lx spans multiple EFI memory regions\n",
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [tip:efi/core] efifb: Omit memory map check on legacy boot
2019-03-28 19:34 ` [PATCH 2/5] efifb: omit memory map check on legacy boot Ard Biesheuvel
@ 2019-03-29 6:44 ` tip-bot for Ard Biesheuvel
0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Ard Biesheuvel @ 2019-03-29 6:44 UTC (permalink / raw)
To: linux-tip-commits
Cc: ard.biesheuvel, peterz, pjones, linux-kernel, torvalds, tiwai,
tglx, hpa, matt, mingo
Commit-ID: c2999c281ea2d2ebbdfce96cecc7b52e2ae7c406
Gitweb: https://git.kernel.org/tip/c2999c281ea2d2ebbdfce96cecc7b52e2ae7c406
Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
AuthorDate: Thu, 28 Mar 2019 20:34:26 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Mar 2019 07:34:59 +0100
efifb: Omit memory map check on legacy boot
Since the following commit:
38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB")
efifb_probe() checks its memory range via efi_mem_desc_lookup(),
and this leads to a spurious error message:
EFI_MEMMAP is not enabled
at every boot on KVM. This is quite annoying since the error message
appears even if you set "quiet" boot option.
Since this happens on legacy boot, which strangely enough exposes
a EFI framebuffer via screen_info, let's double check that we are
doing an EFI boot before attempting to access the EFI memory map.
Reported-by: Takashi Iwai <tiwai@suse.de>
Tested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Jones <pjones@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-3-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/video/fbdev/efifb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index ba906876cc45..9e529cc2b4ff 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -464,7 +464,8 @@ static int efifb_probe(struct platform_device *dev)
info->apertures->ranges[0].base = efifb_fix.smem_start;
info->apertures->ranges[0].size = size_remap;
- if (!efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
+ if (efi_enabled(EFI_BOOT) &&
+ !efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
if ((efifb_fix.smem_start + efifb_fix.smem_len) >
(md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {
pr_err("efifb: video memory @ 0x%lx spans multiple EFI memory regions\n",
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/5] efi/arm: Show SMBIOS bank/device location in cper and ghes error logs
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
2019-03-28 19:34 ` [PATCH 1/5] efi/libstub: refactor cmd_stubcopy Ard Biesheuvel
2019-03-28 19:34 ` [PATCH 2/5] efifb: omit memory map check on legacy boot Ard Biesheuvel
@ 2019-03-28 19:34 ` Ard Biesheuvel
2019-03-29 6:44 ` [tip:efi/core] efi/arm: Show SMBIOS bank/device location in CPER and GHES " tip-bot for Marcin Benka
2019-03-28 19:34 ` [PATCH 4/5] efi: Unify dmi setup code over architectures arm/arm64, ia64 and x86 Ard Biesheuvel
` (2 subsequent siblings)
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-03-28 19:34 UTC (permalink / raw)
To: linux-efi, Ingo Molnar, Thomas Gleixner
Cc: Marcin Benka, Ard Biesheuvel, linux-kernel, Robert Richter
From: Marcin Benka <mbenka@marvell.com>
Run dmi_memdev_walk() for arch arm* as other archs do. This improves
error logging as the memory device handle is translated now to the
DIMM entry's name provided by the DMI handle.
Before:
{1}[Hardware Error]: DIMM location: not present. DMI handle: 0x0038
After:
{1}[Hardware Error]: DIMM location: N0 DIMM_A0
Signed-off-by: Marcin Benka <mbenka@marvell.com>
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/firmware/efi/arm-runtime.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 0c1af675c338..4a0dfe4ab829 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -167,6 +167,7 @@ static int __init arm_dmi_init(void)
* itself, depends on dmi_scan_machine() having been called already.
*/
dmi_scan_machine();
+ dmi_memdev_walk();
if (dmi_available)
dmi_set_dump_stack_arch_desc();
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [tip:efi/core] efi/arm: Show SMBIOS bank/device location in CPER and GHES error logs
2019-03-28 19:34 ` [PATCH 3/5] efi/arm: Show SMBIOS bank/device location in cper and ghes error logs Ard Biesheuvel
@ 2019-03-29 6:44 ` tip-bot for Marcin Benka
0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Marcin Benka @ 2019-03-29 6:44 UTC (permalink / raw)
To: linux-tip-commits
Cc: torvalds, mbenka, ard.biesheuvel, peterz, hpa, mingo, rrichter,
matt, linux-kernel, tglx
Commit-ID: 5e83cfe947444c7f201f8c39ce0189922ec9f578
Gitweb: https://git.kernel.org/tip/5e83cfe947444c7f201f8c39ce0189922ec9f578
Author: Marcin Benka <mbenka@marvell.com>
AuthorDate: Thu, 28 Mar 2019 20:34:27 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Mar 2019 07:35:00 +0100
efi/arm: Show SMBIOS bank/device location in CPER and GHES error logs
Run dmi_memdev_walk() for arch arm* as other architectures do.
This improves error logging as the memory device handle is
translated now to the DIMM entry's name provided by the DMI handle.
Before:
{1}[Hardware Error]: DIMM location: not present. DMI handle: 0x0038
After:
{1}[Hardware Error]: DIMM location: N0 DIMM_A0
Signed-off-by: Marcin Benka <mbenka@marvell.com>
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-4-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/firmware/efi/arm-runtime.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 0c1af675c338..4a0dfe4ab829 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -167,6 +167,7 @@ static int __init arm_dmi_init(void)
* itself, depends on dmi_scan_machine() having been called already.
*/
dmi_scan_machine();
+ dmi_memdev_walk();
if (dmi_available)
dmi_set_dump_stack_arch_desc();
return 0;
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/5] efi: Unify dmi setup code over architectures arm/arm64, ia64 and x86
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
` (2 preceding siblings ...)
2019-03-28 19:34 ` [PATCH 3/5] efi/arm: Show SMBIOS bank/device location in cper and ghes error logs Ard Biesheuvel
@ 2019-03-28 19:34 ` Ard Biesheuvel
2019-03-29 6:45 ` [tip:efi/core] efi: Unify DMI setup code over the arm/arm64, ia64 and x86 architectures tip-bot for Robert Richter
2019-03-28 19:34 ` [PATCH 5/5] efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections Ard Biesheuvel
2019-03-29 6:35 ` [GIT PULL 0/5] EFI changes for v5.2 Ingo Molnar
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-03-28 19:34 UTC (permalink / raw)
To: linux-efi, Ingo Molnar, Thomas Gleixner
Cc: Robert Richter, Ard Biesheuvel, linux-kernel, Jean Delvare
From: Robert Richter <rrichter@marvell.com>
All architectures (arm/arm64, ia64 and x86) do the same here, so unify
the code.
Note: We do not need to call dump_stack_set_arch_desc() in case of
!dmi_available. Both strings, dmi_ids_string and dump_stack_arch_
desc_str are initialized zero and thus nothing would change.
Signed-off-by: Robert Richter <rrichter@marvell.com>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
arch/ia64/kernel/setup.c | 4 +---
arch/x86/kernel/setup.c | 6 ++----
drivers/firmware/dmi_scan.c | 28 +++++++++++++++-------------
drivers/firmware/efi/arm-runtime.c | 7 ++-----
include/linux/dmi.h | 8 ++------
5 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 583a3746d70b..c9cfa760cd57 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -1058,9 +1058,7 @@ check_bugs (void)
static int __init run_dmi_scan(void)
{
- dmi_scan_machine();
- dmi_memdev_walk();
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
return 0;
}
core_initcall(run_dmi_scan);
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 3d872a527cd9..3773905cd2c1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1005,13 +1005,11 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
- dmi_scan_machine();
- dmi_memdev_walk();
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
/*
* VMware detection requires dmi to be available, so this
- * needs to be done after dmi_scan_machine(), for the boot CPU.
+ * needs to be done after dmi_setup(), for the boot CPU.
*/
init_hypervisor_platform();
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 099d83e4e910..fae2d5c43314 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -416,11 +416,8 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)
nr++;
}
-void __init dmi_memdev_walk(void)
+static void __init dmi_memdev_walk(void)
{
- if (!dmi_available)
- return;
-
if (dmi_walk_early(count_mem_devices) == 0 && dmi_memdev_nr) {
dmi_memdev = dmi_alloc(sizeof(*dmi_memdev) * dmi_memdev_nr);
if (dmi_memdev)
@@ -614,7 +611,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
return 1;
}
-void __init dmi_scan_machine(void)
+static void __init dmi_scan_machine(void)
{
char __iomem *p, *q;
char buf[32];
@@ -769,15 +766,20 @@ static int __init dmi_init(void)
subsys_initcall(dmi_init);
/**
- * dmi_set_dump_stack_arch_desc - set arch description for dump_stack()
+ * dmi_setup - scan and setup DMI system information
*
- * Invoke dump_stack_set_arch_desc() with DMI system information so that
- * DMI identifiers are printed out on task dumps. Arch boot code should
- * call this function after dmi_scan_machine() if it wants to print out DMI
- * identifiers on task dumps.
+ * Scan the DMI system information. This setups DMI identifiers
+ * (dmi_system_id) for printing it out on task dumps and prepares
+ * DIMM entry information (dmi_memdev_info) from the SMBIOS table
+ * for using this when reporting memory errors.
*/
-void __init dmi_set_dump_stack_arch_desc(void)
+void __init dmi_setup(void)
{
+ dmi_scan_machine();
+ if (!dmi_available)
+ return;
+
+ dmi_memdev_walk();
dump_stack_set_arch_desc("%s", dmi_ids_string);
}
@@ -841,7 +843,7 @@ static bool dmi_is_end_of_table(const struct dmi_system_id *dmi)
* returns non zero or we hit the end. Callback function is called for
* each successful match. Returns the number of matches.
*
- * dmi_scan_machine must be called before this function is called.
+ * dmi_setup must be called before this function is called.
*/
int dmi_check_system(const struct dmi_system_id *list)
{
@@ -871,7 +873,7 @@ EXPORT_SYMBOL(dmi_check_system);
* Walk the blacklist table until the first match is found. Return the
* pointer to the matching entry or NULL if there's no match.
*
- * dmi_scan_machine must be called before this function is called.
+ * dmi_setup must be called before this function is called.
*/
const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)
{
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 4a0dfe4ab829..e2ac5fa5531b 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -162,14 +162,11 @@ void efi_virtmap_unload(void)
static int __init arm_dmi_init(void)
{
/*
- * On arm64/ARM, DMI depends on UEFI, and dmi_scan_machine() needs to
+ * On arm64/ARM, DMI depends on UEFI, and dmi_setup() needs to
* be called early because dmi_id_init(), which is an arch_initcall
* itself, depends on dmi_scan_machine() having been called already.
*/
- dmi_scan_machine();
- dmi_memdev_walk();
- if (dmi_available)
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
return 0;
}
core_initcall(arm_dmi_init);
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index c46fdb36700b..8de8c4f15163 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -102,9 +102,7 @@ const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list);
extern const char * dmi_get_system_info(int field);
extern const struct dmi_device * dmi_find_device(int type, const char *name,
const struct dmi_device *from);
-extern void dmi_scan_machine(void);
-extern void dmi_memdev_walk(void);
-extern void dmi_set_dump_stack_arch_desc(void);
+extern void dmi_setup(void);
extern bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp);
extern int dmi_get_bios_year(void);
extern int dmi_name_in_vendors(const char *str);
@@ -122,9 +120,7 @@ static inline int dmi_check_system(const struct dmi_system_id *list) { return 0;
static inline const char * dmi_get_system_info(int field) { return NULL; }
static inline const struct dmi_device * dmi_find_device(int type, const char *name,
const struct dmi_device *from) { return NULL; }
-static inline void dmi_scan_machine(void) { return; }
-static inline void dmi_memdev_walk(void) { }
-static inline void dmi_set_dump_stack_arch_desc(void) { }
+static inline void dmi_setup(void) { }
static inline bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp)
{
if (yearp)
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [tip:efi/core] efi: Unify DMI setup code over the arm/arm64, ia64 and x86 architectures
2019-03-28 19:34 ` [PATCH 4/5] efi: Unify dmi setup code over architectures arm/arm64, ia64 and x86 Ard Biesheuvel
@ 2019-03-29 6:45 ` tip-bot for Robert Richter
0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Robert Richter @ 2019-03-29 6:45 UTC (permalink / raw)
To: linux-tip-commits
Cc: matt, hpa, torvalds, tglx, linux-kernel, mingo, ard.biesheuvel,
rrichter, jdelvare, peterz
Commit-ID: 0fca08122eaf5c956a2cbe12775245d747f8b1ac
Gitweb: https://git.kernel.org/tip/0fca08122eaf5c956a2cbe12775245d747f8b1ac
Author: Robert Richter <rrichter@marvell.com>
AuthorDate: Thu, 28 Mar 2019 20:34:28 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Mar 2019 07:35:00 +0100
efi: Unify DMI setup code over the arm/arm64, ia64 and x86 architectures
All architectures (arm/arm64, ia64 and x86) do the same here, so unify
the code.
Note: We do not need to call dump_stack_set_arch_desc() in case of
!dmi_available. Both strings, dmi_ids_string and dump_stack_arch_
desc_str are initialized zero and thus nothing would change.
Signed-off-by: Robert Richter <rrichter@marvell.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-5-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/ia64/kernel/setup.c | 4 +---
arch/x86/kernel/setup.c | 6 ++----
drivers/firmware/dmi_scan.c | 28 +++++++++++++++-------------
drivers/firmware/efi/arm-runtime.c | 7 ++-----
include/linux/dmi.h | 8 ++------
5 files changed, 22 insertions(+), 31 deletions(-)
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 583a3746d70b..c9cfa760cd57 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -1058,9 +1058,7 @@ check_bugs (void)
static int __init run_dmi_scan(void)
{
- dmi_scan_machine();
- dmi_memdev_walk();
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
return 0;
}
core_initcall(run_dmi_scan);
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 3d872a527cd9..3773905cd2c1 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -1005,13 +1005,11 @@ void __init setup_arch(char **cmdline_p)
if (efi_enabled(EFI_BOOT))
efi_init();
- dmi_scan_machine();
- dmi_memdev_walk();
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
/*
* VMware detection requires dmi to be available, so this
- * needs to be done after dmi_scan_machine(), for the boot CPU.
+ * needs to be done after dmi_setup(), for the boot CPU.
*/
init_hypervisor_platform();
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 099d83e4e910..fae2d5c43314 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -416,11 +416,8 @@ static void __init save_mem_devices(const struct dmi_header *dm, void *v)
nr++;
}
-void __init dmi_memdev_walk(void)
+static void __init dmi_memdev_walk(void)
{
- if (!dmi_available)
- return;
-
if (dmi_walk_early(count_mem_devices) == 0 && dmi_memdev_nr) {
dmi_memdev = dmi_alloc(sizeof(*dmi_memdev) * dmi_memdev_nr);
if (dmi_memdev)
@@ -614,7 +611,7 @@ static int __init dmi_smbios3_present(const u8 *buf)
return 1;
}
-void __init dmi_scan_machine(void)
+static void __init dmi_scan_machine(void)
{
char __iomem *p, *q;
char buf[32];
@@ -769,15 +766,20 @@ static int __init dmi_init(void)
subsys_initcall(dmi_init);
/**
- * dmi_set_dump_stack_arch_desc - set arch description for dump_stack()
+ * dmi_setup - scan and setup DMI system information
*
- * Invoke dump_stack_set_arch_desc() with DMI system information so that
- * DMI identifiers are printed out on task dumps. Arch boot code should
- * call this function after dmi_scan_machine() if it wants to print out DMI
- * identifiers on task dumps.
+ * Scan the DMI system information. This setups DMI identifiers
+ * (dmi_system_id) for printing it out on task dumps and prepares
+ * DIMM entry information (dmi_memdev_info) from the SMBIOS table
+ * for using this when reporting memory errors.
*/
-void __init dmi_set_dump_stack_arch_desc(void)
+void __init dmi_setup(void)
{
+ dmi_scan_machine();
+ if (!dmi_available)
+ return;
+
+ dmi_memdev_walk();
dump_stack_set_arch_desc("%s", dmi_ids_string);
}
@@ -841,7 +843,7 @@ static bool dmi_is_end_of_table(const struct dmi_system_id *dmi)
* returns non zero or we hit the end. Callback function is called for
* each successful match. Returns the number of matches.
*
- * dmi_scan_machine must be called before this function is called.
+ * dmi_setup must be called before this function is called.
*/
int dmi_check_system(const struct dmi_system_id *list)
{
@@ -871,7 +873,7 @@ EXPORT_SYMBOL(dmi_check_system);
* Walk the blacklist table until the first match is found. Return the
* pointer to the matching entry or NULL if there's no match.
*
- * dmi_scan_machine must be called before this function is called.
+ * dmi_setup must be called before this function is called.
*/
const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)
{
diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c
index 4a0dfe4ab829..e2ac5fa5531b 100644
--- a/drivers/firmware/efi/arm-runtime.c
+++ b/drivers/firmware/efi/arm-runtime.c
@@ -162,14 +162,11 @@ void efi_virtmap_unload(void)
static int __init arm_dmi_init(void)
{
/*
- * On arm64/ARM, DMI depends on UEFI, and dmi_scan_machine() needs to
+ * On arm64/ARM, DMI depends on UEFI, and dmi_setup() needs to
* be called early because dmi_id_init(), which is an arch_initcall
* itself, depends on dmi_scan_machine() having been called already.
*/
- dmi_scan_machine();
- dmi_memdev_walk();
- if (dmi_available)
- dmi_set_dump_stack_arch_desc();
+ dmi_setup();
return 0;
}
core_initcall(arm_dmi_init);
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index c46fdb36700b..8de8c4f15163 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -102,9 +102,7 @@ const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list);
extern const char * dmi_get_system_info(int field);
extern const struct dmi_device * dmi_find_device(int type, const char *name,
const struct dmi_device *from);
-extern void dmi_scan_machine(void);
-extern void dmi_memdev_walk(void);
-extern void dmi_set_dump_stack_arch_desc(void);
+extern void dmi_setup(void);
extern bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp);
extern int dmi_get_bios_year(void);
extern int dmi_name_in_vendors(const char *str);
@@ -122,9 +120,7 @@ static inline int dmi_check_system(const struct dmi_system_id *list) { return 0;
static inline const char * dmi_get_system_info(int field) { return NULL; }
static inline const struct dmi_device * dmi_find_device(int type, const char *name,
const struct dmi_device *from) { return NULL; }
-static inline void dmi_scan_machine(void) { return; }
-static inline void dmi_memdev_walk(void) { }
-static inline void dmi_set_dump_stack_arch_desc(void) { }
+static inline void dmi_setup(void) { }
static inline bool dmi_get_date(int field, int *yearp, int *monthp, int *dayp)
{
if (yearp)
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 5/5] efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
` (3 preceding siblings ...)
2019-03-28 19:34 ` [PATCH 4/5] efi: Unify dmi setup code over architectures arm/arm64, ia64 and x86 Ard Biesheuvel
@ 2019-03-28 19:34 ` Ard Biesheuvel
2019-03-29 6:46 ` [tip:efi/core] efi/libstub/arm: Omit " tip-bot for Ard Biesheuvel
2019-03-29 6:35 ` [GIT PULL 0/5] EFI changes for v5.2 Ingo Molnar
5 siblings, 1 reply; 12+ messages in thread
From: Ard Biesheuvel @ 2019-03-28 19:34 UTC (permalink / raw)
To: linux-efi, Ingo Molnar, Thomas Gleixner
Cc: Ard Biesheuvel, linux-kernel, Nick Desaulniers
Commit f922c4abdf764 ("module: allow symbol exports to be disabled")
introduced a way to inhibit generation of kcrctab/ksymtab sections
when building ordinary kernel code to be used in a different execution
context (decompressor, EFI stub, etc)
That means we no longer have to strip those sections explicitly when
building the EFI libstub objects, so drop this from the Makefile.
Cc: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
drivers/firmware/efi/libstub/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index ae9081988c88..b1f7b64652db 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -71,7 +71,6 @@ CFLAGS_arm64-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
extra-$(CONFIG_EFI_ARMSTUB) := $(lib-y)
lib-$(CONFIG_EFI_ARMSTUB) := $(patsubst %.o,%.stub.o,$(lib-y))
-STUBCOPY_RM-y := -R *ksymtab* -R *kcrctab*
STUBCOPY_FLAGS-$(CONFIG_ARM64) += --prefix-alloc-sections=.init \
--prefix-symbols=__efistub_
STUBCOPY_RELOC-$(CONFIG_ARM64) := R_AARCH64_ABS
@@ -87,7 +86,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
#
quiet_cmd_stubcopy = STUBCPY $@
cmd_stubcopy = \
- $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
+ $(STRIP) --strip-debug -o $@ $<; \
if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then \
echo "$@: absolute symbol references not allowed in the EFI stub" >&2; \
/bin/false; \
--
2.20.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [tip:efi/core] efi/libstub/arm: Omit unneeded stripping of ksymtab/kcrctab sections
2019-03-28 19:34 ` [PATCH 5/5] efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections Ard Biesheuvel
@ 2019-03-29 6:46 ` tip-bot for Ard Biesheuvel
0 siblings, 0 replies; 12+ messages in thread
From: tip-bot for Ard Biesheuvel @ 2019-03-29 6:46 UTC (permalink / raw)
To: linux-tip-commits
Cc: mingo, ard.biesheuvel, matt, torvalds, peterz, tglx,
linux-kernel, hpa, ndesaulniers
Commit-ID: 02562d0ca1084a688ac5c92e0e92947f62f13093
Gitweb: https://git.kernel.org/tip/02562d0ca1084a688ac5c92e0e92947f62f13093
Author: Ard Biesheuvel <ard.biesheuvel@linaro.org>
AuthorDate: Thu, 28 Mar 2019 20:34:29 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 29 Mar 2019 07:35:00 +0100
efi/libstub/arm: Omit unneeded stripping of ksymtab/kcrctab sections
Commit f922c4abdf764 ("module: allow symbol exports to be disabled")
introduced a way to inhibit generation of kcrctab/ksymtab sections
when building ordinary kernel code to be used in a different execution
context (decompressor, EFI stub, etc)
That means we no longer have to strip those sections explicitly when
building the EFI libstub objects, so drop this from the Makefile.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20190328193429.21373-6-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/firmware/efi/libstub/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/firmware/efi/libstub/Makefile b/drivers/firmware/efi/libstub/Makefile
index ae9081988c88..b1f7b64652db 100644
--- a/drivers/firmware/efi/libstub/Makefile
+++ b/drivers/firmware/efi/libstub/Makefile
@@ -71,7 +71,6 @@ CFLAGS_arm64-stub.o := -DTEXT_OFFSET=$(TEXT_OFFSET)
extra-$(CONFIG_EFI_ARMSTUB) := $(lib-y)
lib-$(CONFIG_EFI_ARMSTUB) := $(patsubst %.o,%.stub.o,$(lib-y))
-STUBCOPY_RM-y := -R *ksymtab* -R *kcrctab*
STUBCOPY_FLAGS-$(CONFIG_ARM64) += --prefix-alloc-sections=.init \
--prefix-symbols=__efistub_
STUBCOPY_RELOC-$(CONFIG_ARM64) := R_AARCH64_ABS
@@ -87,7 +86,7 @@ $(obj)/%.stub.o: $(obj)/%.o FORCE
#
quiet_cmd_stubcopy = STUBCPY $@
cmd_stubcopy = \
- $(STRIP) --strip-debug $(STUBCOPY_RM-y) -o $@ $<; \
+ $(STRIP) --strip-debug -o $@ $<; \
if $(OBJDUMP) -r $@ | grep $(STUBCOPY_RELOC-y); then \
echo "$@: absolute symbol references not allowed in the EFI stub" >&2; \
/bin/false; \
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT PULL 0/5] EFI changes for v5.2
2019-03-28 19:34 [GIT PULL 0/5] EFI changes for v5.2 Ard Biesheuvel
` (4 preceding siblings ...)
2019-03-28 19:34 ` [PATCH 5/5] efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections Ard Biesheuvel
@ 2019-03-29 6:35 ` Ingo Molnar
5 siblings, 0 replies; 12+ messages in thread
From: Ingo Molnar @ 2019-03-29 6:35 UTC (permalink / raw)
To: Ard Biesheuvel
Cc: linux-efi, Thomas Gleixner, linux-kernel, Jean Delvare,
Marcin Benka, Masahiro Yamada, Nick Desaulniers, Peter Jones,
Robert Richter, Takashi Iwai
* Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:
> The following changes since commit 8c2ffd9174779014c3fe1f96d9dc3641d9175f00:
>
> Linux 5.1-rc2 (2019-03-24 14:02:26 -0700)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git tags/efi-next
>
> for you to fetch changes up to a72f65180feb446cc59616aab400475679b6ffce:
>
> efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections (2019-03-28 09:22:32 +0100)
>
> ----------------------------------------------------------------
> EFI updates for v5.2:
> - Squash a spurious warning when using the EFI framebuffer on a non-EFI boot.
> - Use DMI data to annotate RAS memory errors on ARM just like we do on Intel.
> - Some followup cleanups for DMI.
> - Some libstub Makefile cleanups.
>
> ----------------------------------------------------------------
> Ard Biesheuvel (2):
> efifb: omit memory map check on legacy boot
> efi/libstub/arm: omit unneeded stripping of ksymtab/kcrctab sections
>
> Marcin Benka (1):
> efi/arm: Show SMBIOS bank/device location in cper and ghes error logs
>
> Masahiro Yamada (1):
> efi/libstub: refactor cmd_stubcopy
>
> Robert Richter (1):
> efi: Unify dmi setup code over architectures arm/arm64, ia64 and x86
>
> arch/ia64/kernel/setup.c | 4 +---
> arch/x86/kernel/setup.c | 6 ++----
> drivers/firmware/dmi_scan.c | 28 +++++++++++++++-------------
> drivers/firmware/efi/arm-runtime.c | 6 ++----
> drivers/firmware/efi/libstub/Makefile | 14 +++++++-------
> drivers/video/fbdev/efifb.c | 3 ++-
> include/linux/dmi.h | 8 ++------
> 7 files changed, 31 insertions(+), 38 deletions(-)
Applied to tip:efi/core, thanks a lot Ard!
Ingo
^ permalink raw reply [flat|nested] 12+ messages in thread