android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi/arm64: Clean up efi_get_fdt_params() interface

Browse Source 
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: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Ard 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: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Leif Lindholm
2015-08-26 14:24:58 +01:00
committed by Matt Fleming
parent c9494dc818
commit 7968c0e338
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/efi.c
View File

@ -201,7 +201,7 @@ void __init efi_init(void)
struct efi_fdt_params params; struct efi_fdt_params params;
/* Grab UEFI information placed in FDT by stub */ /* 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; return;
efi_system_table = params.system_table; efi_system_table = params.system_table;

6
drivers/firmware/efi/efi.c
View File

@ -492,7 +492,6 @@ static __initdata struct {
}; };
struct param_info { struct param_info {
int verbose;
int found; int found;
void *params; void *params;
}; };
@ -523,21 +522,20 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname,
else else
*(u64 *)dest = val; *(u64 *)dest = val;
if (info->verbose) if (efi_enabled(EFI_DBG))
pr_info(" %s: 0x%0*llx\n", dt_params[i].name, pr_info(" %s: 0x%0*llx\n", dt_params[i].name,
dt_params[i].size * 2, val); dt_params[i].size * 2, val);
} }
return 1; 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; struct param_info info;
int ret; int ret;
pr_info("Getting EFI parameters from FDT:\n"); pr_info("Getting EFI parameters from FDT:\n");
info.verbose = verbose;
info.found = 0; info.found = 0;
info.params = params; info.params = params;

2
include/linux/efi.h
View File

@ -902,7 +902,7 @@ extern void efi_initialize_iomem_resources(struct resource *code_resource,
struct resource *data_resource, struct resource *bss_resource); struct resource *data_resource, struct resource *bss_resource);
extern void efi_get_time(struct timespec *now); extern void efi_get_time(struct timespec *now);
extern void efi_reserve_boot_services(void); 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 efi_memory_map memmap;
extern struct kobject *efi_kobj; extern struct kobject *efi_kobj;