[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAKv+Gu9KwJfr6x8A607CsbAvpLUG2pqLPzcXsqhvmQnrcGy_ug@mail.gmail.com>
Date: Wed, 26 Aug 2015 16:04:57 +0200
From: Ard Biesheuvel <ard.biesheuvel@...aro.org>
To: Leif Lindholm <leif.lindholm@...aro.org>
Cc: "linux-efi@...r.kernel.org" <linux-efi@...r.kernel.org>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Matt Fleming <matt.fleming@...el.com>,
Mark Salter <msalter@...hat.com>
Subject: Re: [PATCH 3/3] efi/arm64: clean up efi_get_fdt_params() interface
On 26 August 2015 at 15:24, Leif Lindholm <leif.lindholm@...aro.org> wrote:
> 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@...aro.org>
> ---
> arch/arm64/kernel/efi.c | 2 +-
> drivers/firmware/efi/efi.c | 6 ++----
> include/linux/efi.h | 2 +-
> 3 files changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c
> index 612ad5e..ab5eeb6 100644
> --- a/arch/arm64/kernel/efi.c
> +++ b/arch/arm64/kernel/efi.c
> @@ -201,7 +201,7 @@ void __init efi_init(void)
> struct efi_fdt_params params;
>
Actually, one nit: struct efi_fdt_params has a verbose field that was
never used in the first place, but was added [supposedly] to convey
the same as EFI_DBG that we have now. So I think you should remove
that as well.
--
Ard.
> /* Grab UEFI information placed in FDT by stub */
> - if (!efi_get_fdt_params(¶ms, efi_enabled(EFI_DBG)))
> + if (!efi_get_fdt_params(¶ms))
> return;
>
> efi_system_table = params.system_table;
> diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
> index 78de0bd..aca6aaf 100644
> --- a/drivers/firmware/efi/efi.c
> +++ b/drivers/firmware/efi/efi.c
> @@ -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;
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 85ef051..b1a5b74 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -901,7 +901,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;
>
> --
> 2.1.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists