Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7968c0e3 authored by Leif Lindholm's avatar Leif Lindholm Committed by Matt Fleming
Browse files

efi/arm64: Clean up efi_get_fdt_params() interface 



As we now have a common debug infrastructure between core and arm64 efi,
drop the bit of the interface passing verbose output flags around.

Signed-off-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Acked-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent c9494dc8

arch/arm64/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ void __init efi_init(void) 
	struct efi_fdt_params params;



	/* Grab UEFI information placed in FDT by stub */

	if (!efi_get_fdt_params(&params, efi_enabled(EFI_DBG)))

	if (!efi_get_fdt_params(&params))

		return;



	efi_system_table = params.system_table;

drivers/firmware/efi/efi.c

+2 −4
Original line number Diff line number Diff line
@@ -492,7 +492,6 @@ static __initdata struct { 
};



struct param_info {

	int verbose;

	int found;

	void *params;

};
@@ -523,21 +522,20 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, 
		else

			*(u64 *)dest = val;



		if (info->verbose)

		if (efi_enabled(EFI_DBG))

			pr_info("  %s: 0x%0*llx\n", dt_params[i].name,

				dt_params[i].size * 2, val);

	}

	return 1;

}



int __init efi_get_fdt_params(struct efi_fdt_params *params, int verbose)

int __init efi_get_fdt_params(struct efi_fdt_params *params)

{

	struct param_info info;

	int ret;



	pr_info("Getting EFI parameters from FDT:\n");



	info.verbose = verbose;

	info.found = 0;

	info.params = params;

include/linux/efi.h

+1 −1
Original line number Diff line number Diff line
@@ -902,7 +902,7 @@ extern void efi_initialize_iomem_resources(struct resource *code_resource, 
		struct resource *data_resource, struct resource *bss_resource);

extern void efi_get_time(struct timespec *now);

extern void efi_reserve_boot_services(void);

extern int efi_get_fdt_params(struct efi_fdt_params *params, int verbose);

extern int efi_get_fdt_params(struct efi_fdt_params *params);

extern struct efi_memory_map memmap;

extern struct kobject *efi_kobj;