[PATCH v2 37/71] bootstd: Add an IDE bootdev

[Simon Glass]

Add a bootdev for IDE so that these devices can be used with standard
boot.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 configs/sandbox_flattree_defconfig |  8 ++++++
 drivers/block/ide.c                | 44 ++++++++++++++++++++++++++++++
 test/boot/bootdev.c                | 16 +++++++----
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig
index eaaec42b1fe..6e8faf56797 100644
--- a/configs/sandbox_flattree_defconfig
+++ b/configs/sandbox_flattree_defconfig
@@ -40,6 +40,7 @@ CONFIG_CMD_MEMTEST=y
 CONFIG_CMD_DEMO=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_GPT=y
+CONFIG_CMD_IDE=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_OSD=y
@@ -90,6 +91,13 @@ CONFIG_ADC=y
 CONFIG_ADC_SANDBOX=y
 CONFIG_AXI=y
 CONFIG_AXI_SANDBOX=y
+CONFIG_SYS_IDE_MAXBUS=1
+CONFIG_SYS_ATA_BASE_ADDR=0x100
+CONFIG_SYS_ATA_STRIDE=4
+CONFIG_SYS_ATA_DATA_OFFSET=0
+CONFIG_SYS_ATA_REG_OFFSET=1
+CONFIG_SYS_ATA_ALT_OFFSET=2
+CONFIG_SYS_ATA_IDE0_OFFSET=0
 CONFIG_CLK=y
 CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_CLK_K210=y
diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index 13a1cb4b9e4..80c8b64de2f 100644
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -9,6 +9,7 @@
 #include <common.h>
 #include <ata.h>
 #include <blk.h>
+#include <bootdev.h>
 #include <dm.h>
 #include <ide.h>
 #include <log.h>
@@ -1055,6 +1056,45 @@ U_BOOT_DRIVER(ide_blk) = {
 	.probe		= ide_blk_probe,
 };
 
+static int ide_bootdev_bind(struct udevice *dev)
+{
+	struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
+
+	ucp->prio = BOOTDEVP_3_SCAN_SLOW;
+
+	return 0;
+}
+
+static int ide_bootdev_hunt(struct bootdev_hunter *info, bool show)
+{
+	ide_init();
+
+	return 0;
+}
+
+struct bootdev_ops ide_bootdev_ops = {
+};
+
+static const struct udevice_id ide_bootdev_ids[] = {
+	{ .compatible = "u-boot,bootdev-ide" },
+	{ }
+};
+
+U_BOOT_DRIVER(ide_bootdev) = {
+	.name		= "ide_bootdev",
+	.id		= UCLASS_BOOTDEV,
+	.ops		= &ide_bootdev_ops,
+	.bind		= ide_bootdev_bind,
+	.of_match	= ide_bootdev_ids,
+};
+
+BOOTDEV_HUNTER(ide_bootdev_hunter) = {
+	.prio		= BOOTDEVP_3_SCAN_SLOW,
+	.uclass		= UCLASS_IDE,
+	.hunt		= ide_bootdev_hunt,
+	.drv		= DM_DRIVER_REF(ide_bootdev),
+};
+
 static int ide_probe(struct udevice *udev)
 {
 	struct udevice *blk_dev;
@@ -1086,6 +1126,10 @@ static int ide_probe(struct udevice *udev)
 			ret = blk_probe_or_unbind(blk_dev);
 			if (ret)
 				return ret;
+
+			ret = bootdev_setup_for_dev(udev, "ide_bootdev");
+			if (ret)
+				return log_msg_ret("bootdev", ret);
 		}
 	}
 
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index 5661a3c0009..a3acdcbdba3 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -239,10 +239,11 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
 	ut_assert_nextline("Prio  Used  Uclass           Hunter");
 	ut_assert_nextlinen("----");
 	ut_assert_nextline("  50        ethernet         eth_bootdev");
+	ut_assert_nextline("  40        ide              ide_bootdev");
 	ut_assert_nextline("  10        mmc              mmc_bootdev");
 	ut_assert_nextline("  30        scsi             scsi_bootdev");
 	ut_assert_nextline("  40        usb              usb_bootdev");
-	ut_assert_nextline("(total hunters: 4)");
+	ut_assert_nextline("(total hunters: 5)");
 	ut_assert_console_end();
 
 	ut_assertok(bootdev_hunt("usb1", false));
@@ -250,8 +251,8 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
 		"Bus usb at 1: scanning bus usb at 1 for devices... 5 USB Device(s) found");
 	ut_assert_console_end();
 
-	/* USB is fourth in the list, so bit 3 */
-	ut_asserteq(BIT(3), std->hunters_used);
+	/* USB is fifth in the list, so bit 4 */
+	ut_asserteq(BIT(4), std->hunters_used);
 
 	return 0;
 }
@@ -271,7 +272,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
 	ut_assertok(run_command("bootdev hunt -l", 0));
 	ut_assert_nextline("Prio  Used  Uclass           Hunter");
 	ut_assert_nextlinen("----");
-	ut_assert_skip_to_line("(total hunters: 4)");
+	ut_assert_skip_to_line("(total hunters: 5)");
 	ut_assert_console_end();
 
 	/* Scan all hunters */
@@ -279,6 +280,8 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
 
 	ut_assertok(run_command("bootdev hunt", 0));
 	ut_assert_nextline("Hunting with: ethernet");
+	ut_assert_nextline("Hunting with: ide");
+	ut_assert_nextline("Bus 0: not available  ");
 	ut_assert_nextline("Hunting with: mmc");
 	ut_assert_nextline("Hunting with: scsi");
 	ut_assert_nextline("scanning bus for devices...");
@@ -292,14 +295,15 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
 	ut_assert_nextlinen("Prio");
 	ut_assert_nextlinen("----");
 	ut_assert_nextline("  50     *  ethernet         eth_bootdev");
+	ut_assert_nextline("  40     *  ide              ide_bootdev");
 	ut_assert_nextline("  10     *  mmc              mmc_bootdev");
 	ut_assert_nextline("  30     *  scsi             scsi_bootdev");
 	ut_assert_nextline("  40     *  usb              usb_bootdev");
 
-	ut_assert_nextline("(total hunters: 4)");
+	ut_assert_nextline("(total hunters: 5)");
 	ut_assert_console_end();
 
-	ut_asserteq(GENMASK(3, 0), std->hunters_used);
+	ut_asserteq(GENMASK(4, 0), std->hunters_used);
 
 	return 0;
 }
-- 
2.39.0.314.g84b9a713c41-goog