[PATCH v1 0/2] Trivial fixes for Rockchip's SPL boot order
This series contains some trivial fixes.
The first patch fixes a spelling mistake in a comment.
The second patch adds the full devicetree node path (rather than just the ID) in the debug message when a boot device can't be found.
This series may be found at [0].
[0]: https://gitlab.collabora.com/obbardc/u-boot/-/tree/wip/obbardc/rockchip-spl-...
Christopher Obbard (2): rockchip: spl-boot-order: Fix spelling succes→success rockchip: spl-boot-order: Improve debugging message when device isn't found
arch/arm/mach-rockchip/spl-boot-order.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Fix a simple spelling mistake in a comment.
Signed-off-by: Christopher Obbard chris.obbard@collabora.com ---
arch/arm/mach-rockchip/spl-boot-order.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 2c39a215c10..e548a7dc718 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -29,7 +29,7 @@ * -ENOSYS, if the device matching the node can not be mapped onto a * SPL boot device (e.g. the third MMC device) * -1, for unspecified failures - * a positive integer (from the BOOT_DEVICE_... family) on succes. + * a positive integer (from the BOOT_DEVICE_... family) on success. */
static int spl_node_to_boot_device(int node)
Hello Christopher,
On 2024-03-02 15:50, Christopher Obbard wrote:
Fix a simple spelling mistake in a comment.
I'd suggest that the main part of the patch subject is adjusted a bit, e.g. to something like "fix a typo".
Otherwise, looking good to me.
Reviewed-by: Dragan Simic dsimic@manjaro.org
Signed-off-by: Christopher Obbard chris.obbard@collabora.com
arch/arm/mach-rockchip/spl-boot-order.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index 2c39a215c10..e548a7dc718 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -29,7 +29,7 @@
- -ENOSYS, if the device matching the node can not be mapped onto a
SPL boot device (e.g. the third MMC device)- -1, for unspecified failures
- a positive integer (from the BOOT_DEVICE_... family) on succes.
*/
- a positive integer (from the BOOT_DEVICE_... family) on success.
static int spl_node_to_boot_device(int node)
Hi Christopher,
On 3/2/24 15:50, Christopher Obbard wrote:
[You don't often get email from chris.obbard@collabora.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
Fix a simple spelling mistake in a comment.
Signed-off-by: Christopher Obbard chris.obbard@collabora.com
Reviewed-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Thanks, Quentin
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path as well as the ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-device
With this patch applied this becomes e.g:
board_boot_order: could not map node @73c (/spi@ff1d0000/flash@0) to a boot-device
Signed-off-by: Christopher Obbard chris.obbard@collabora.com ---
arch/arm/mach-rockchip/spl-boot-order.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index e548a7dc718..b23666fb017 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -151,8 +151,8 @@ void board_boot_order(u32 *spl_boot_list) /* Try to map this back onto SPL boot devices */ boot_device = spl_node_to_boot_device(node); if (boot_device < 0) { - debug("%s: could not map node @%x to a boot-device\n", - __func__, node); + debug("%s: could not map node @%x (%s) to a boot-device\n", + __func__, node, conf); continue; }
Hello Christopher,
On 2024-03-02 15:50, Christopher Obbard wrote:
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path as well as the ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-deviceWith this patch applied this becomes e.g:
board_boot_order: could not map node @73c (/spi@ff1d0000/flash@0) to a boot-device
I'd suggest that the main part of the patch subject is adjusted a bit, e.g. to something like "show DT path for missing device".
Otherwise, looking good to me.
Reviewed-by: Dragan Simic dsimic@manjaro.org
Signed-off-by: Christopher Obbard chris.obbard@collabora.com
arch/arm/mach-rockchip/spl-boot-order.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/spl-boot-order.c b/arch/arm/mach-rockchip/spl-boot-order.c index e548a7dc718..b23666fb017 100644 --- a/arch/arm/mach-rockchip/spl-boot-order.c +++ b/arch/arm/mach-rockchip/spl-boot-order.c @@ -151,8 +151,8 @@ void board_boot_order(u32 *spl_boot_list) /* Try to map this back onto SPL boot devices */ boot_device = spl_node_to_boot_device(node); if (boot_device < 0) {
debug("%s: could not map node @%x to a boot-device\n",__func__, node);
debug("%s: could not map node @%x (%s) to a boot-device\n",__func__, node, conf); continue;
Hi Christopher,
On 3/2/24 15:50, Christopher Obbard wrote:
[You don't often get email from chris.obbard@collabora.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]
When debugging the SPL boot order, the node ID of a device which hasn't been found is printed but it can be quite hard to relate that to the specific devicetree node. To aid debugging, print the node path as well as the ID.
Original debug message:
board_boot_order: could not map node @73c to a boot-deviceWith this patch applied this becomes e.g:
board_boot_order: could not map node @73c (/spi@ff1d0000/flash@0) to a boot-device
Does it actually make sense to print the node "number" here (I have no clue what it represents and if it's useful for debugging)? Can't we just replace @%x with the node path (conf) directly instead?
Cheers, Quentin
participants (3)
-
Christopher Obbard -
Dragan Simic -
Quentin Schulz