| Message ID | 1440595498-30630-3-git-send-email-leif.lindholm@linaro.org |
|---|---|
| State | Accepted |
| Commit | c9494dc818755f2dd934c93faa933317fae51594 |
| Headers | show |
On Wed, Aug 26, 2015 at 06:24:55PM +0100, Matt Fleming wrote: > On Wed, 26 Aug, at 02:24:57PM, Leif Lindholm wrote: > > Now that we have an efi=debug command line option in the core code, use > > this instead of the arm64-specific uefi_debug option. > > > > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> > > --- > > Documentation/arm/uefi.txt | 2 -- > > arch/arm64/kernel/efi.c | 19 +++++-------------- > > 2 files changed, 5 insertions(+), 16 deletions(-) > > Are there no concerns with backwards-compatibility here? I expected > this patch to internally convert uefi_debug to efi=debug if old boot > loaders, kernel config, etc specify it. > > Is that something that can be safely ignored? Since it is purely a debug feature, I opted to just drop it. I don't have strong feelings, and it could certainly be kept as an arm64-only alias (but setting the EFI_DBG flag) if others disagree. / Leif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 26 August 2015 at 19:30, Leif Lindholm <leif.lindholm@linaro.org> wrote: > On Wed, Aug 26, 2015 at 06:24:55PM +0100, Matt Fleming wrote: >> On Wed, 26 Aug, at 02:24:57PM, Leif Lindholm wrote: >> > Now that we have an efi=debug command line option in the core code, use >> > this instead of the arm64-specific uefi_debug option. >> > >> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> >> > --- >> > Documentation/arm/uefi.txt | 2 -- >> > arch/arm64/kernel/efi.c | 19 +++++-------------- >> > 2 files changed, 5 insertions(+), 16 deletions(-) >> >> Are there no concerns with backwards-compatibility here? I expected >> this patch to internally convert uefi_debug to efi=debug if old boot >> loaders, kernel config, etc specify it. >> >> Is that something that can be safely ignored? > > Since it is purely a debug feature, I opted to just drop it. > I don't have strong feelings, and it could certainly be kept as an > arm64-only alias (but setting the EFI_DBG flag) if others disagree. > Let's not bother. This is strictly a debug option that only affects what gets printed to the kernel log, which itself is not (or should not be) an ABI. Also, if anyone cares deeply about always having the feature enabled both on before and after kernels, they can always pass both options.
diff --git a/Documentation/arm/uefi.txt b/Documentation/arm/uefi.txt index d60030a..7b3fdfe 100644 --- a/Documentation/arm/uefi.txt +++ b/Documentation/arm/uefi.txt @@ -60,5 +60,3 @@ linux,uefi-mmap-desc-ver | 32-bit | Version of the mmap descriptor format. -------------------------------------------------------------------------------- linux,uefi-stub-kern-ver | string | Copy of linux_banner from build. -------------------------------------------------------------------------------- - -For verbose debug messages, specify 'uefi_debug' on the kernel command line. diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index e8ca6ea..612ad5e 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -51,15 +51,6 @@ static struct mm_struct efi_mm = { INIT_MM_CONTEXT(efi_mm) }; -static int uefi_debug __initdata; -static int __init uefi_debug_setup(char *str) -{ - uefi_debug = 1; - - return 0; -} -early_param("uefi_debug", uefi_debug_setup); - static int __init is_normal_ram(efi_memory_desc_t *md) { if (md->attribute & EFI_MEMORY_WB) @@ -171,14 +162,14 @@ static __init void reserve_regions(void) efi_memory_desc_t *md; u64 paddr, npages, size; - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_info("Processing EFI memory map:\n"); for_each_efi_memory_desc(&memmap, md) { paddr = md->phys_addr; npages = md->num_pages; - if (uefi_debug) { + if (efi_enabled(EFI_DBG)) { char buf[64]; pr_info(" 0x%012llx-0x%012llx %s", @@ -194,11 +185,11 @@ static __init void reserve_regions(void) if (is_reserve_region(md)) { memblock_reserve(paddr, size); - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_cont("*"); } - if (uefi_debug) + if (efi_enabled(EFI_DBG)) pr_cont("\n"); } @@ -210,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(¶ms, uefi_debug)) + if (!efi_get_fdt_params(¶ms, efi_enabled(EFI_DBG))) return; efi_system_table = params.system_table;
Now that we have an efi=debug command line option in the core code, use this instead of the arm64-specific uefi_debug option. Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org> --- Documentation/arm/uefi.txt | 2 -- arch/arm64/kernel/efi.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 16 deletions(-)