[PATCH v3 35/70] bootstd: Add a SCSI bootdev
Simon Glass
sjg at chromium.org
Tue Jan 17 18:47:45 CET 2023
Add a bootdev for SCSI so that these devices can be used with standard
boot.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
(no changes since v1)
drivers/scsi/Makefile | 7 +++++
drivers/scsi/scsi.c | 7 ++++-
drivers/scsi/scsi_bootdev.c | 62 +++++++++++++++++++++++++++++++++++++
test/boot/bootdev.c | 18 ++++++-----
4 files changed, 86 insertions(+), 8 deletions(-)
create mode 100644 drivers/scsi/scsi_bootdev.c
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index d1b40c61401..d8d6de59090 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -6,6 +6,13 @@
ifndef CONFIG_SPL_BUILD
obj-$(CONFIG_DM_SCSI) += scsi-uclass.o
obj-$(CONFIG_SCSI) += scsi.o
+
+ifdef CONFIG_SCSI
+ifdef CONFIG_DM_SCSI
+obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += scsi_bootdev.o
+endif
+endif
+
endif
ifdef CONFIG_SPL_BUILD
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 4a2d8d009a6..6caeb3fcdd0 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -8,6 +8,7 @@
#include <common.h>
#include <blk.h>
+#include <bootdev.h>
#include <bootstage.h>
#include <dm.h>
#include <env.h>
@@ -604,7 +605,11 @@ static int do_scsi_scan_one(struct udevice *dev, int id, int lun, bool verbose)
ret = blk_probe_or_unbind(bdev);
if (ret < 0)
/* TODO: undo create */
- return ret;
+ return log_msg_ret("pro", ret);
+
+ ret = bootdev_setup_sibling_blk(bdev, "scsi_bootdev");
+ if (ret)
+ return log_msg_ret("bd", ret);
if (verbose) {
printf(" Device %d: ", bdesc->devnum);
diff --git a/drivers/scsi/scsi_bootdev.c b/drivers/scsi/scsi_bootdev.c
new file mode 100644
index 00000000000..2367b33da9c
--- /dev/null
+++ b/drivers/scsi/scsi_bootdev.c
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Bootdevice for USB
+ *
+ * Copyright 2021 Google LLC
+ * Written by Simon Glass <sjg at chromium.org>
+ */
+
+#include <common.h>
+#include <bootdev.h>
+#include <dm.h>
+#include <init.h>
+#include <scsi.h>
+
+static int scsi_bootdev_bind(struct udevice *dev)
+{
+ struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev);
+
+ ucp->prio = BOOTDEVP_2_SCAN_FAST;
+
+ return 0;
+}
+
+static int scsi_bootdev_hunt(struct bootdev_hunter *info, bool show)
+{
+ int ret;
+
+ if (IS_ENABLED(CONFIG_PCI)) {
+ ret = pci_init();
+ if (ret)
+ return log_msg_ret("pci", ret);
+ }
+
+ ret = scsi_scan(true);
+ if (ret)
+ return log_msg_ret("scs", ret);
+
+ return 0;
+}
+
+struct bootdev_ops scsi_bootdev_ops = {
+};
+
+static const struct udevice_id scsi_bootdev_ids[] = {
+ { .compatible = "u-boot,bootdev-scsi" },
+ { }
+};
+
+U_BOOT_DRIVER(scsi_bootdev) = {
+ .name = "scsi_bootdev",
+ .id = UCLASS_BOOTDEV,
+ .ops = &scsi_bootdev_ops,
+ .bind = scsi_bootdev_bind,
+ .of_match = scsi_bootdev_ids,
+};
+
+BOOTDEV_HUNTER(scsi_bootdev_hunter) = {
+ .prio = BOOTDEVP_2_SCAN_FAST,
+ .uclass = UCLASS_SCSI,
+ .hunt = scsi_bootdev_hunt,
+ .drv = DM_DRIVER_REF(scsi_bootdev),
+};
diff --git a/test/boot/bootdev.c b/test/boot/bootdev.c
index db0e0ca20fa..5661a3c0009 100644
--- a/test/boot/bootdev.c
+++ b/test/boot/bootdev.c
@@ -240,8 +240,9 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
ut_assert_nextlinen("----");
ut_assert_nextline(" 50 ethernet eth_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: 3)");
+ ut_assert_nextline("(total hunters: 4)");
ut_assert_console_end();
ut_assertok(bootdev_hunt("usb1", false));
@@ -249,8 +250,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 third in the list, so bit 2 */
- ut_asserteq(BIT(2), std->hunters_used);
+ /* USB is fourth in the list, so bit 3 */
+ ut_asserteq(BIT(3), std->hunters_used);
return 0;
}
@@ -270,7 +271,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: 3)");
+ ut_assert_skip_to_line("(total hunters: 4)");
ut_assert_console_end();
/* Scan all hunters */
@@ -279,7 +280,9 @@ 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: mmc");
- ut_assert_nextline("Hunting with: usb");
+ ut_assert_nextline("Hunting with: scsi");
+ ut_assert_nextline("scanning bus for devices...");
+ ut_assert_skip_to_line("Hunting with: usb");
ut_assert_nextline(
"Bus usb at 1: scanning bus usb at 1 for devices... 5 USB Device(s) found");
ut_assert_console_end();
@@ -290,12 +293,13 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
ut_assert_nextlinen("----");
ut_assert_nextline(" 50 * ethernet eth_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: 3)");
+ ut_assert_nextline("(total hunters: 4)");
ut_assert_console_end();
- ut_asserteq(GENMASK(2, 0), std->hunters_used);
+ ut_asserteq(GENMASK(3, 0), std->hunters_used);
return 0;
}
--
2.39.0.246.g2a6d74b583-goog
More information about the U-Boot
mailing list