Skip to contentSkip to conversation

api_storage: Fix non-first storage device enumeration

PATCH In review Andreas Färber 2 participants 2 messages Sep 14, 2015 – Sep 15, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 api_storage: Fix non-first storage device enumeration

When enabling CONFIG_API and chain-loading GRUB2 on jetson-tk1, only the eMMC would show up as (hd0), but not the SD card, leading to GRUB not finding its configuration and modules, falling back to a rescue shell.

This is because enum_ended would get set for !more after returning a cookie for the first MMC device in group 3.

Fix this by properly setting the "more" argument also in the case of the first storage device of a group.

---
 api/api_storage.c | 5 +++++
 1 file changed, 5 insertions(+)
api/api_storage.c +5 -0
index b76b07d..ec92ae4 100644
@@ -112,6 +112,11 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 		else
 			found = 1;
 
+		/* provide hint if there are more devices in
+		 * this group to enumerate */
+		if (1 < specs[type].max_dev)
+			*more = 1;
+
 	} else {
 		for (i = 0; i < specs[type].max_dev; i++)
 			if (di->cookie == (void *)get_dev(specs[type].name, i)) {
Signature · 1 line
2.1.4
#1 lore raw
Quoted 11 lines · Andreas F?rber

When enabling CONFIG_API and chain-loading GRUB2 on jetson-tk1, only the eMMC would show up as (hd0), but not the SD card, leading to GRUB not finding its configuration and modules, falling back to a rescue shell.

This is because enum_ended would get set for !more after returning a cookie for the first MMC device in group 3.

Fix this by properly setting the "more" argument also in the case of the first storage device of a group.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/9f72d62d/attachment.sig>