Merge ~xnox/ubuntu/+source/u-boot:fixup-fdtdir-properly into ubuntu/+source/u-boot:ubuntu/devel

[Dimitri John Ledkov]

fixup fdtdir things properly.

this is for ii opening & sruing through to back to focal

[Dave Jones (waveform)]

The patches all look sane, so +1 from me.

The one thing that worries me is I'm not sure "soc" or "board" are ever *meant* to be blank in the env, but I can't find anything to that effect in the docs/comments. Anyway, they evidently are in this case so the workaround's necessary.

review: Approve

Unmerged commits

1774cfd... by Dimitri John Ledkov on 2021-04-21

sifive-unleashed-default-fdt-files.patch: split into unleashed & unmatched separate patches, for ease of upstreaming to meta-sifive and u-boot upstreams.

e7d08ec... by Dimitri John Ledkov on 2021-04-21

Fix LP: #1925267 LP: #1923162 using upstream friendly patches:

* Fix LP: #1925267 LP: #1923162 using upstream friendly patches:
  - riscv64/qemu-skip-fdtdir.patch: drop patch,
    functionality replaced by cherrypick & fix up.
  - 0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch:
    cherrypick post-2021.01 patch to gracefully carry-on booting using
    internal FDT if there isn't a different one in FDTDIR.
  - 0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch: fix
    crash on trying to use fdtdir when either "soc" or "board" environment
    variables are not set (like on qemu-riscv64).

b046cee... by Dimitri John Ledkov on 2021-04-21

2021.01+dfsg-3ubuntu8 (patches unapplied)

Imported using git-ubuntu import.

cf5c992... by Dimitri John Ledkov on 2021-04-16

2021.01+dfsg-3ubuntu7 (patches unapplied)

Imported using git-ubuntu import.

f2b547d... by Dimitri John Ledkov on 2021-04-13

2021.01+dfsg-3ubuntu6 (patches unapplied)

Imported using git-ubuntu import.

25523ec... by Dimitri John Ledkov on 2021-03-16

2021.01+dfsg-3ubuntu5 (patches unapplied)

Imported using git-ubuntu import.

7966246... by Dimitri John Ledkov on 2021-03-15

2021.01+dfsg-3ubuntu4 (patches unapplied)

Imported using git-ubuntu import.

0bc3ac5... by Dimitri John Ledkov on 2021-03-15

2021.01+dfsg-3ubuntu3 (patches unapplied)

Imported using git-ubuntu import.

41dcfe4... by Dimitri John Ledkov on 2021-03-10

2021.01+dfsg-3ubuntu2 (patches unapplied)

Imported using git-ubuntu import.

967141b... by Dave Jones on 2021-03-10

2021.01+dfsg-3ubuntu1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/debian/changelog b/debian/changelog
index df5f9f4..d82e11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+u-boot (2021.01+dfsg-3ubuntu9) UNRELEASED; urgency=medium
+
+  * Fix LP: #1925267 LP: #1923162 using upstream friendly patches:
+    - riscv64/qemu-skip-fdtdir.patch: drop patch,
+      functionality replaced by cherrypick & fix up.
+    - 0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch:
+      cherrypick post-2021.01 patch to gracefully carry-on booting using
+      internal FDT if there isn't a different one in FDTDIR.
+    - 0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch: fix
+      crash on trying to use fdtdir when either "soc" or "board" environment
+      variables are not set (like on qemu-riscv64).
+  * sifive-unleashed-default-fdt-files.patch: split into unleashed &
+    unmatched separate patches, for ease of upstreaming to meta-sifive and
+    u-boot upstreams.
+
+ -- Dimitri John Ledkov <[e-mail]>  Wed, 21 Apr 2021 14:11:38 +0100
+
 u-boot (2021.01+dfsg-3ubuntu8) hirsute; urgency=medium
 
   * Skip processing fdtdir on qemu-riscv64_smode target, as it crashes the
diff --git a/debian/patches/0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch b/debian/patches/0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch
 new file mode 100644
index 0000000..27a0c1f
--- /dev/null
+++ b/debian/patches/0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch
@@ -0,0 +1,57 @@
+From db3667413d99b8ec1b1e7e9b34c20a8883ec413d Mon Sep 17 00:00:00 2001
+From: Anton Leontiev <[e-mail]>
+Date: Tue, 3 Sep 2019 10:52:24 +0300
+Subject: [PATCH] cmd: pxe: Use internal FDT if retrieving from FDTDIR fails
+
+As FDTDIR label doesn't specify exact file to be loaded, it should
+not fail if no file exists in the directory. In this case try to boot
+with internal FDT if it exists.
+
+Signed-off-by: Anton Leontiev <[e-mail]>
+---
+ cmd/pxe_utils.c | 21 ++++++++++++++-------
+ 1 file changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
+index 8716e782f6..235522f4bb 100644
+--- a/cmd/pxe_utils.c
++++ b/cmd/pxe_utils.c
+@@ -451,11 +451,14 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
+ 
+ 	/*
+ 	 * fdt usage is optional:
+-	 * It handles the following scenarios. All scenarios are exclusive
++	 * It handles the following scenarios.
+ 	 *
+-	 * Scenario 1: If fdt_addr_r specified and "fdt" label is defined in
+-	 * pxe file, retrieve fdt blob from server. Pass fdt_addr_r to bootm,
+-	 * and adjust argc appropriately.
++	 * Scenario 1: If fdt_addr_r specified and "fdt" or "fdtdir" label is
++	 * defined in pxe file, retrieve fdt blob from server. Pass fdt_addr_r to
++	 * bootm, and adjust argc appropriately.
++	 *
++	 * If retrieve fails and no exact fdt blob is specified in pxe file with
++	 * "fdt" label, try Scenario 2.
+ 	 *
+ 	 * Scenario 2: If there is an fdt_addr specified, pass it along to
+ 	 * bootm, and adjust argc appropriately.
+@@ -521,9 +524,13 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
+ 
+ 			free(fdtfilefree);
+ 			if (err < 0) {
+-				printf("Skipping %s for failure retrieving fdt\n",
+-				       label->name);
+-				goto cleanup;
++				bootm_argv[3] = NULL;
++
++				if (label->fdt) {
++					printf("Skipping %s for failure retrieving FDT\n",
++					       label->name);
++					goto cleanup;
++				}
+ 			}
+ 		} else {
+ 			bootm_argv[3] = NULL;
+-- 
+2.27.0
+
diff --git a/debian/patches/0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch b/debian/patches/0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch
 new file mode 100644
index 0000000..489e1a1
--- /dev/null
+++ b/debian/patches/0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch
@@ -0,0 +1,39 @@
+From 077ee0830ec3ed3b8db334717910fbbfc1b4e302 Mon Sep 17 00:00:00 2001
+From: Dimitri John Ledkov <[e-mail]>
+Date: Wed, 21 Apr 2021 11:44:34 +0100
+Subject: [PATCH] cmd: pxe_utils: sysboot: fix crash if either board or soc are
+ not set.
+
+If the environment does not have "soc" or "board" set, and fdtdir
+option is specified in extlinux.conf, the bootloader will crash whilst
+dereferencing a null pointer. Add a guard against null soc or
+board. Fixes a crash of qemu-riscv64_smode configuration, which does
+not have CONFIG_SYS_SOC defined.
+
+Signed-off-by: Dimitri John Ledkov <[e-mail]>
+---
+ cmd/pxe_utils.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/cmd/pxe_utils.c b/cmd/pxe_utils.c
+index 71c5af4c25..9a30629e26 100644
+--- a/cmd/pxe_utils.c
++++ b/cmd/pxe_utils.c
+@@ -587,6 +587,14 @@ static int label_boot(struct cmd_tbl *cmdtp, struct pxe_label *label)
+ 				f2 = "-";
+ 				f3 = env_get("board");
+ 				f4 = ".dtb";
++				if (!f1) {
++					f1 = "";
++					f2 = "";
++				}
++				if (!f3) {
++					f2 = "";
++					f3 = "";
++				}
+ 			}
+ 
+ 			len = strlen(label->fdtdir);
+-- 
+2.27.0
+
diff --git a/debian/patches/riscv64/qemu-skip-fdtdir.patch b/debian/patches/riscv64/qemu-skip-fdtdir.patch
 deleted file mode 100644
index 70b9436..0000000
--- a/debian/patches/riscv64/qemu-skip-fdtdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Skip processing fdtdir on qemu-riscv64_smode target
- it crashes the riscv qemu VM.
-Author: Dimitri John Ledkov <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1925267
-
-
---- u-boot-2021.01+dfsg.orig/cmd/pxe_utils.c
-+++ u-boot-2021.01+dfsg/cmd/pxe_utils.c
-@@ -471,6 +471,7 @@ static int label_boot(struct cmd_tbl *cm
- 
- 		if (label->fdt) {
- 			fdtfile = label->fdt;
-+#if !(defined(CONFIG_TARGET_QEMU_VIRT) && defined(CONFIG_RISCV_SMODE))
- 		} else if (label->fdtdir) {
- 			char *f1, *f2, *f3, *f4, *slash;
- 
-@@ -513,6 +514,7 @@ static int label_boot(struct cmd_tbl *cm
- 			snprintf(fdtfilefree, len, "%s%s%s%s%s%s",
- 				 label->fdtdir, slash, f1, f2, f3, f4);
- 			fdtfile = fdtfilefree;
-+#endif
- 		}
- 
- 		if (fdtfile) {
diff --git a/debian/patches/riscv64/sifive-default-fdt-files.patch b/debian/patches/riscv64/sifive-unleashed-default-fdt-files.patch
 similarity index 68%
 rename from debian/patches/riscv64/sifive-default-fdt-files.patch
 rename to debian/patches/riscv64/sifive-unleashed-default-fdt-files.patch
index 01ffec0..3407169 100644
--- a/debian/patches/riscv64/sifive-default-fdt-files.patch
+++ b/debian/patches/riscv64/sifive-unleashed-default-fdt-files.patch
@@ -10,15 +10,6 @@ Index: u-boot-2021.01+dfsg/configs/sifive_fu540_defconfig
  CONFIG_RISCV=y
  CONFIG_SPL_GPIO_SUPPORT=y
  CONFIG_SYS_MALLOC_F_LEN=0x3000
-Index: u-boot-2021.01+dfsg/configs/sifive_hifive_unmatched_fu740_defconfig
-===================================================================
---- u-boot-2021.01+dfsg.orig/configs/sifive_hifive_unmatched_fu740_defconfig
-+++ u-boot-2021.01+dfsg/configs/sifive_hifive_unmatched_fu740_defconfig
-@@ -1,3 +1,4 @@
-+CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb"
- CONFIG_RISCV=y
- CONFIG_SPL_GPIO_SUPPORT=y
- CONFIG_SYS_MALLOC_F_LEN=0x3000
 Index: u-boot-2021.01+dfsg/include/configs/sifive-fu540.h
 ===================================================================
 --- u-boot-2021.01+dfsg.orig/include/configs/sifive-fu540.h
@@ -31,15 +22,3 @@ Index: u-boot-2021.01+dfsg/include/configs/sifive-fu540.h
  	BOOTENV \
  	BOOTENV_SF
  
-Index: u-boot-2021.01+dfsg/include/configs/sifive-hifive-unmatched-fu740.h
-===================================================================
---- u-boot-2021.01+dfsg.orig/include/configs/sifive-hifive-unmatched-fu740.h
-+++ u-boot-2021.01+dfsg/include/configs/sifive-hifive-unmatched-fu740.h
-@@ -84,6 +84,7 @@
- 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
- 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
- 	"partitions=" PARTS_DEFAULT "\0" \
-+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
- 	BOOTENV
- 
- #define CONFIG_PREBOOT \
diff --git a/debian/patches/riscv64/sifive-unmatched-default-fdt-files.patch b/debian/patches/riscv64/sifive-unmatched-default-fdt-files.patch
 new file mode 100644
index 0000000..73fdbc8
--- /dev/null
+++ b/debian/patches/riscv64/sifive-unmatched-default-fdt-files.patch
@@ -0,0 +1,24 @@
+Description: set default FDT filenames to load from boot disk
+Bug: https://github.com/sifive/meta-sifive/issues/16
+
+Index: u-boot-2021.01+dfsg/configs/sifive_hifive_unmatched_fu740_defconfig
+===================================================================
+--- u-boot-2021.01+dfsg.orig/configs/sifive_hifive_unmatched_fu740_defconfig
++++ u-boot-2021.01+dfsg/configs/sifive_hifive_unmatched_fu740_defconfig
+@@ -1,3 +1,4 @@
++CONFIG_DEFAULT_FDT_FILE="sifive/hifive-unmatched-a00.dtb"
+ CONFIG_RISCV=y
+ CONFIG_SPL_GPIO_SUPPORT=y
+ CONFIG_SYS_MALLOC_F_LEN=0x3000
+Index: u-boot-2021.01+dfsg/include/configs/sifive-hifive-unmatched-fu740.h
+===================================================================
+--- u-boot-2021.01+dfsg.orig/include/configs/sifive-hifive-unmatched-fu740.h
++++ u-boot-2021.01+dfsg/include/configs/sifive-hifive-unmatched-fu740.h
+@@ -84,6 +84,7 @@
+ 	"type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \
+ 	"type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \
+ 	"partitions=" PARTS_DEFAULT "\0" \
++	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ 	BOOTENV
+ 
+ #define CONFIG_PREBOOT \
diff --git a/debian/patches/series b/debian/patches/series
index 71f2ca7..c222e62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+0001-cmd-pxe-Use-internal-FDT-if-retrieving-from-FDTDIR-f.patch
+0001-cmd-pxe_utils-sysboot-fix-crash-if-either-board-or-s.patch
 add-debian-revision-to-u-boot-version
 
 tools-generic-builds.patch
@@ -14,6 +16,7 @@ test-imagetools-test-fixes
 
 exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch
 
+riscv64/sifive-unleashed-default-fdt-files.patch
 riscv64/qemu-riscv64_smode-sifive-fu540-fix-extlinux-define-.patch
 riscv64/sifive-fu540-compressed-booti-support.patch
 riscv64/0001-clk-sifive-fu540-prci-Extract-prci-core-to-common-ba.patch
@@ -57,9 +60,8 @@ riscv64/0038-cmd-pwm-Rework-argc-sanity-checking.patch
 riscv64/0039-riscv-sifive-unmatched-enable-PWM.patch
 riscv64/0040-riscv-sifive-unmatched-update-for-rev3-16GB-1866.patch
 riscv64/0041-Fix-CRC32-checksum-for-SiFive-HiFive-EEPROM.patch
-riscv64/sifive-default-fdt-files.patch
+riscv64/sifive-unmatched-default-fdt-files.patch
 riscv64/use-preboot-unmatched.patch
-riscv64/qemu-skip-fdtdir.patch
 
 n900/bootz_and_raw_initrd.patch