* [PATCHv2] efi: efi-stub: notify on DTB absence
@ 2014-10-23 15:33 Mark Rutland
2014-10-23 16:05 ` Mark Salter
2014-10-23 18:59 ` Roy Franz
0 siblings, 2 replies; 3+ messages in thread
From: Mark Rutland @ 2014-10-23 15:33 UTC (permalink / raw)
To: linux-arm-kernel
Cc: linux-kernel, leif.lindholm, ard.biesheuvel, msalter,
matt.fleming, roy.franz, Mark Rutland
Since v1 [1]:
* Add a positive acknowledgement for a configuration table DTB
* Fixed a couple of typos in the commit message
Ard, Leif, Roy, I've assumed your acks from v1 are still valid with the
additional print. Please shout if that's not the case.
Thanks,
Mark.
[1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/295521.html
---->8----
In the absence of a DTB configuration table, the EFI stub will happily
continue attempting to boot a kernel, despite the fact that this kernel
may not function without a description of the hardware. In this case, as
with a typo'd "dtb=" option (e.g. "dbt=") or many other possible
failures, the only output seen by the user will be the rather terse
output from the EFI stub:
EFI stub: Booting Linux Kernel...
To aid those attempting to debug such failures, this patch adds a notice
when no DTB is found, making the output more helpful:
EFI stub: Booting Linux Kernel...
EFI stub: Generating empty DTB
Additionally, a positive acknowledgement is added when a user-specified
DTB is in use:
EFI stub: Booting Linux Kernel...
EFI stub: Using DTB from command line
Similarly, a positive acknowledgement is added when a DTB from a
configuration table is in use:
EFI stub: Booting Linux Kernel...
EFI stub: Using DTB from configuration table
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Matt Fleming <matt.fleming@intel.com>
Acked-by: Roy Franz <roy.franz@linaro.org>
---
drivers/firmware/efi/libstub/arm-stub.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 480339b..21fa50e 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -243,9 +243,18 @@ unsigned long __init efi_entry(void *handle, efi_system_table_t *sys_table,
goto fail_free_cmdline;
}
}
- if (!fdt_addr)
+
+ if (fdt_addr) {
+ pr_efi(sys_table, "Using DTB from command line\n");
+ } else {
/* Look for a device tree configuration table entry. */
fdt_addr = (uintptr_t)get_fdt(sys_table);
+ if (fdt_addr)
+ pr_efi(sys_table, "Using DTB from configuration table\n");
+ }
+
+ if (!fdt_addr)
+ pr_efi(sys_table, "Generating empty DTB\n");
status = handle_cmdline_files(sys_table, image, cmdline_ptr,
"initrd=", dram_base + SZ_512M,
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCHv2] efi: efi-stub: notify on DTB absence
2014-10-23 15:33 [PATCHv2] efi: efi-stub: notify on DTB absence Mark Rutland
@ 2014-10-23 16:05 ` Mark Salter
2014-10-23 18:59 ` Roy Franz
1 sibling, 0 replies; 3+ messages in thread
From: Mark Salter @ 2014-10-23 16:05 UTC (permalink / raw)
To: Mark Rutland
Cc: linux-arm-kernel, linux-kernel, leif.lindholm, ard.biesheuvel,
matt.fleming, roy.franz
On Thu, 2014-10-23 at 16:33 +0100, Mark Rutland wrote:
> Since v1 [1]:
> * Add a positive acknowledgement for a configuration table DTB
> * Fixed a couple of typos in the commit message
>
> Ard, Leif, Roy, I've assumed your acks from v1 are still valid with the
> additional print. Please shout if that's not the case.
>
> Thanks,
> Mark.
>
> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/295521.html
>
> ---->8----
> In the absence of a DTB configuration table, the EFI stub will happily
> continue attempting to boot a kernel, despite the fact that this kernel
> may not function without a description of the hardware. In this case, as
> with a typo'd "dtb=" option (e.g. "dbt=") or many other possible
> failures, the only output seen by the user will be the rather terse
> output from the EFI stub:
>
> EFI stub: Booting Linux Kernel...
>
> To aid those attempting to debug such failures, this patch adds a notice
> when no DTB is found, making the output more helpful:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Generating empty DTB
>
> Additionally, a positive acknowledgement is added when a user-specified
> DTB is in use:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Using DTB from command line
>
> Similarly, a positive acknowledgement is added when a DTB from a
> configuration table is in use:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Using DTB from configuration table
>
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Mark Salter <msalter@redhat.com>
> Cc: Matt Fleming <matt.fleming@intel.com>
> Acked-by: Roy Franz <roy.franz@linaro.org>
> ---
> drivers/firmware/efi/libstub/arm-stub.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
> index 480339b..21fa50e 100644
> --- a/drivers/firmware/efi/libstub/arm-stub.c
> +++ b/drivers/firmware/efi/libstub/arm-stub.c
> @@ -243,9 +243,18 @@ unsigned long __init efi_entry(void *handle, efi_system_table_t *sys_table,
> goto fail_free_cmdline;
> }
> }
> - if (!fdt_addr)
> +
> + if (fdt_addr) {
> + pr_efi(sys_table, "Using DTB from command line\n");
> + } else {
> /* Look for a device tree configuration table entry. */
> fdt_addr = (uintptr_t)get_fdt(sys_table);
> + if (fdt_addr)
> + pr_efi(sys_table, "Using DTB from configuration table\n");
> + }
> +
> + if (!fdt_addr)
> + pr_efi(sys_table, "Generating empty DTB\n");
Nitpicking: I'd put that as an else to the config table fdt_addr check
above. In any case,
Acked-by: Mark Salter <msalter@redhat.com>
>
> status = handle_cmdline_files(sys_table, image, cmdline_ptr,
> "initrd=", dram_base + SZ_512M,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCHv2] efi: efi-stub: notify on DTB absence
2014-10-23 15:33 [PATCHv2] efi: efi-stub: notify on DTB absence Mark Rutland
2014-10-23 16:05 ` Mark Salter
@ 2014-10-23 18:59 ` Roy Franz
1 sibling, 0 replies; 3+ messages in thread
From: Roy Franz @ 2014-10-23 18:59 UTC (permalink / raw)
To: Mark Rutland
Cc: linux-arm-kernel, Linux Kernel Mailing List, Leif Lindholm,
Ard Biesheuvel, Mark Salter, Matt Fleming
On Thu, Oct 23, 2014 at 8:33 AM, Mark Rutland <mark.rutland@arm.com> wrote:
> Since v1 [1]:
> * Add a positive acknowledgement for a configuration table DTB
> * Fixed a couple of typos in the commit message
>
> Ard, Leif, Roy, I've assumed your acks from v1 are still valid with the
> additional print. Please shout if that's not the case.
>
> Thanks,
> Mark.
>
> [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2014-October/295521.html
>
> ---->8----
> In the absence of a DTB configuration table, the EFI stub will happily
> continue attempting to boot a kernel, despite the fact that this kernel
> may not function without a description of the hardware. In this case, as
> with a typo'd "dtb=" option (e.g. "dbt=") or many other possible
> failures, the only output seen by the user will be the rather terse
> output from the EFI stub:
>
> EFI stub: Booting Linux Kernel...
>
> To aid those attempting to debug such failures, this patch adds a notice
> when no DTB is found, making the output more helpful:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Generating empty DTB
>
> Additionally, a positive acknowledgement is added when a user-specified
> DTB is in use:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Using DTB from command line
>
> Similarly, a positive acknowledgement is added when a DTB from a
> configuration table is in use:
>
> EFI stub: Booting Linux Kernel...
> EFI stub: Using DTB from configuration table
>
> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
> Acked-by: Leif Lindholm <leif.lindholm@linaro.org>
> Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Mark Salter <msalter@redhat.com>
> Cc: Matt Fleming <matt.fleming@intel.com>
> Acked-by: Roy Franz <roy.franz@linaro.org>
> ---
> drivers/firmware/efi/libstub/arm-stub.c | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
> index 480339b..21fa50e 100644
> --- a/drivers/firmware/efi/libstub/arm-stub.c
> +++ b/drivers/firmware/efi/libstub/arm-stub.c
> @@ -243,9 +243,18 @@ unsigned long __init efi_entry(void *handle, efi_system_table_t *sys_table,
> goto fail_free_cmdline;
> }
> }
> - if (!fdt_addr)
> +
> + if (fdt_addr) {
> + pr_efi(sys_table, "Using DTB from command line\n");
> + } else {
> /* Look for a device tree configuration table entry. */
> fdt_addr = (uintptr_t)get_fdt(sys_table);
> + if (fdt_addr)
> + pr_efi(sys_table, "Using DTB from configuration table\n");
> + }
> +
> + if (!fdt_addr)
> + pr_efi(sys_table, "Generating empty DTB\n");
>
> status = handle_cmdline_files(sys_table, image, cmdline_ptr,
> "initrd=", dram_base + SZ_512M,
> --
> 1.9.1
>
Acked-by: Roy Franz <roy.franz@linaro.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-23 18:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-23 15:33 [PATCHv2] efi: efi-stub: notify on DTB absence Mark Rutland
2014-10-23 16:05 ` Mark Salter
2014-10-23 18:59 ` Roy Franz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).