Commit d90dcc1f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI updates from Ingo Molnar:
 "The changes in this cycle were:

   - 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

   - Followup cleanups for DMI

   - libstub Makefile cleanups"

* 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  efi/libstub/arm: Omit unneeded stripping of ksymtab/kcrctab sections
  efi: Unify DMI setup code over the arm/arm64, ia64 and x86 architectures
  efi/arm: Show SMBIOS bank/device location in CPER and GHES error logs
  efifb: Omit memory map check on legacy boot
  efi/libstub: Refactor the cmd_stubcopy Makefile command
parents 2c6a392c 02562d0c

arch/ia64/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/setup.c

+2 −4
Original line number Diff line number Diff line
@@ -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();

drivers/firmware/dmi_scan.c

+15 −13
Original line number Diff line number Diff line
@@ -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)

{

drivers/firmware/efi/arm-runtime.c

+2 −4
Original line number Diff line number Diff line
@@ -162,13 +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();

	if (dmi_available)

		dmi_set_dump_stack_arch_desc();

	dmi_setup();

	return 0;

}

core_initcall(arm_dmi_init);

drivers/firmware/efi/libstub/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -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
@@ -86,12 +85,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 -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE