bootstd: Skip over bad device during bootflows scanning

mibodhi · trini · commit ee2ce29223c5 · 2023-11-10T11:01:50.000-05:00
During bootstd scanning for bootdevs, if bootdev_hunt_drv() encounters
a device not found error (e.g. ENOENT), let it return a successful status
so that bootstd will continue scanning the next devices, not stopping
prematurely.

Background:

During scanning for bootflows, it's possible for bootstd to encounter a
faulty device controller. Also when the same u-boot is used for another
variant of the same board, some device controller such as SATA might
not exist.

I've found this issue while converting the Marvell Sheevaplug board to
use bootstd. This board has 2 variants, the original Sheevaplug has MMC and
USB only, but the later variant comes with USB, MMC, and eSATA ports. We
have been using the same u-boot (starting with CONFIG_IDE and later with DM
CONFIG_SATA) for both variants. This worked well with the old
envs-scripting booting scheme.

Signed-off-by: Tony Dinh &lt;mibodhi@gmail.com&gt;
Reviewed-by: Simon Glass &lt;sjg@chromium.org&gt;
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c
@@ -784,7 +784,7 @@ static int bootdev_hunt_drv(struct bootdev_hunter *info, uint seq, bool show)
 		if (info->hunt) {
 			ret = info->hunt(info, show);
 			log_debug("  - hunt result %d\n", ret);
-			if (ret)
+			if (ret && ret != -ENOENT)
 				return ret;
 		}
 		std->hunters_used |= BIT(seq);
diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
@@ -65,7 +65,7 @@ int sata_rescan(bool verbose)
 	ret = uclass_find_first_device(UCLASS_AHCI, &dev);
 	if (ret || !dev) {
 		printf("Cannot find SATA device (err=%d)\n", ret);
-		return -ENOSYS;
+		return -ENOENT;
 	}
 
 	ret = device_remove(dev, DM_REMOVE_NORMAL);
diff --git a/include/bootdev.h b/include/bootdev.h
@@ -65,7 +65,7 @@ struct bootdev_hunter;
  *
  * @info: Info structure describing this hunter
  * @show: true to show information from the hunter
- * Returns: 0 if OK, -ve on error
+ * Returns: 0 if OK, -ENOENT on device not found, otherwise -ve on error
  */
 typedef int (*bootdev_hunter_func)(struct bootdev_hunter *info, bool show);
 

Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,7 @@ static int bootdev_hunt_drv(struct bootdev_hunter *info, uint seq, bool show)`
`784`	`784`	`if (info->hunt) {`
`785`	`785`	`ret = info->hunt(info, show);`
`786`	`786`	`log_debug(" - hunt result %d\n", ret);`
`787`		`- if (ret)`
	`787`	`+ if (ret && ret != -ENOENT)`
`788`	`788`	`return ret;`
`789`	`789`	`}`
`790`	`790`	`std->hunters_used \|= BIT(seq);`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ int sata_rescan(bool verbose)`
`65`	`65`	`ret = uclass_find_first_device(UCLASS_AHCI, &dev);`
`66`	`66`	`if (ret \|\| !dev) {`
`67`	`67`	`printf("Cannot find SATA device (err=%d)\n", ret);`
`68`		`- return -ENOSYS;`
	`68`	`+ return -ENOENT;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`ret = device_remove(dev, DM_REMOVE_NORMAL);`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ struct bootdev_hunter;`
`65`	`65`	`*`
`66`	`66`	`* @info: Info structure describing this hunter`
`67`	`67`	`* @show: true to show information from the hunter`
`68`		`- * Returns: 0 if OK, -ve on error`
	`68`	`+ * Returns: 0 if OK, -ENOENT on device not found, otherwise -ve on error`
`69`	`69`	`*/`
`70`	`70`	`typedef int (bootdev_hunter_func)(struct bootdev_hunter info, bool show);`
`71`	`71`