mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-09-23 14:51:31 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bootstd: Add an NVMe bootdev

Browse Source 
Add a bootdev for NVMe so that these devices can be used with standard
boot.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-01-17 10:47:47 -07:00 committed by Tom Rini
parent 0d77f8f1ca
commit 758c706c68
3 changed files with 68 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/nvme/nvme-uclass.c
View File

@ -7,9 +7,63 @@
#define LOG_CATEGORY UCLASS_NVME #define LOG_CATEGORY UCLASS_NVME
#include <common.h> #include <common.h>
#include <bootdev.h>
#include <dm.h> #include <dm.h>
#include <init.h>
#include <log.h>
#include <nvme.h>
static int nvme_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 nvme_bootdev_hunt(struct bootdev_hunter *info, bool show)
{
int ret;
/* init PCI first since this is often used to provide NVMe */
if (IS_ENABLED(CONFIG_PCI)) {
ret = pci_init();
if (ret)
log_warning("Failed to init PCI (%dE)\n", ret);
}
ret = nvme_scan_namespace();
if (ret)
return log_msg_ret("scan", ret);
return 0;
}
UCLASS_DRIVER(nvme) = { UCLASS_DRIVER(nvme) = {
.name = "nvme", .name = "nvme",
.id = UCLASS_NVME, .id = UCLASS_NVME,
}; };
struct bootdev_ops nvme_bootdev_ops = {
};
static const struct udevice_id nvme_bootdev_ids[] = {
{ .compatible = "u-boot,bootdev-nvme" },
{ }
};
U_BOOT_DRIVER(nvme_bootdev) = {
.name = "nvme_bootdev",
.id = UCLASS_BOOTDEV,
.ops = &nvme_bootdev_ops,
.bind = nvme_bootdev_bind,
.of_match = nvme_bootdev_ids,
};
BOOTDEV_HUNTER(nvme_bootdev_hunter) = {
.prio = BOOTDEVP_2_SCAN_FAST,
.uclass = UCLASS_NVME,
.hunt = nvme_bootdev_hunt,
.drv = DM_DRIVER_REF(nvme_bootdev),
};

5
drivers/nvme/nvme.c
View File

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <blk.h> #include <blk.h>
#include <bootdev.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <dm.h> #include <dm.h>
#include <errno.h> #include <errno.h>
@ -893,6 +894,10 @@ int nvme_init(struct udevice *udev)
if (ret) if (ret)
goto free_id; goto free_id;
ret = bootdev_setup_sibling_blk(ns_udev, "nvme_bootdev");
if (ret)
return log_msg_ret("bootdev", ret);
ret = blk_probe_or_unbind(ns_udev); ret = blk_probe_or_unbind(ns_udev);
if (ret) if (ret)
goto free_id; goto free_id;

15
test/boot/bootdev.c
View File

@ -241,9 +241,10 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
ut_assert_nextline(" 50 ethernet eth_bootdev"); ut_assert_nextline(" 50 ethernet eth_bootdev");
ut_assert_nextline(" 40 ide ide_bootdev"); ut_assert_nextline(" 40 ide ide_bootdev");
ut_assert_nextline(" 10 mmc mmc_bootdev"); ut_assert_nextline(" 10 mmc mmc_bootdev");
ut_assert_nextline(" 30 nvme nvme_bootdev");
ut_assert_nextline(" 30 scsi scsi_bootdev"); ut_assert_nextline(" 30 scsi scsi_bootdev");
ut_assert_nextline(" 40 usb usb_bootdev"); ut_assert_nextline(" 40 usb usb_bootdev");
ut_assert_nextline("(total hunters: 5)"); ut_assert_nextline("(total hunters: 6)");
ut_assert_console_end(); ut_assert_console_end();
ut_assertok(bootdev_hunt("usb1", false)); ut_assertok(bootdev_hunt("usb1", false));
@ -251,8 +252,8 @@ static int bootdev_test_hunter(struct unit_test_state *uts)
"Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found"); "Bus usb@1: scanning bus usb@1 for devices... 5 USB Device(s) found");
ut_assert_console_end(); ut_assert_console_end();
/* USB is fifth in the list, so bit 4 */ /* USB is fifth in the list, so bit 5 */
ut_asserteq(BIT(4), std->hunters_used); ut_asserteq(BIT(5), std->hunters_used);
return 0; return 0;
} }
@ -272,7 +273,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
ut_assertok(run_command("bootdev hunt -l", 0)); ut_assertok(run_command("bootdev hunt -l", 0));
ut_assert_nextline("Prio Used Uclass Hunter"); ut_assert_nextline("Prio Used Uclass Hunter");
ut_assert_nextlinen("----"); ut_assert_nextlinen("----");
ut_assert_skip_to_line("(total hunters: 5)"); ut_assert_skip_to_line("(total hunters: 6)");
ut_assert_console_end(); ut_assert_console_end();
/* Scan all hunters */ /* Scan all hunters */
@ -283,6 +284,7 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
ut_assert_nextline("Hunting with: ide"); ut_assert_nextline("Hunting with: ide");
ut_assert_nextline("Bus 0: not available "); ut_assert_nextline("Bus 0: not available ");
ut_assert_nextline("Hunting with: mmc"); ut_assert_nextline("Hunting with: mmc");
ut_assert_nextline("Hunting with: nvme");
ut_assert_nextline("Hunting with: scsi"); ut_assert_nextline("Hunting with: scsi");
ut_assert_nextline("scanning bus for devices..."); ut_assert_nextline("scanning bus for devices...");
ut_assert_skip_to_line("Hunting with: usb"); ut_assert_skip_to_line("Hunting with: usb");
@ -297,13 +299,14 @@ static int bootdev_test_cmd_hunt(struct unit_test_state *uts)
ut_assert_nextline(" 50 * ethernet eth_bootdev"); ut_assert_nextline(" 50 * ethernet eth_bootdev");
ut_assert_nextline(" 40 * ide ide_bootdev"); ut_assert_nextline(" 40 * ide ide_bootdev");
ut_assert_nextline(" 10 * mmc mmc_bootdev"); ut_assert_nextline(" 10 * mmc mmc_bootdev");
ut_assert_nextline(" 30 * nvme nvme_bootdev");
ut_assert_nextline(" 30 * scsi scsi_bootdev"); ut_assert_nextline(" 30 * scsi scsi_bootdev");
ut_assert_nextline(" 40 * usb usb_bootdev"); ut_assert_nextline(" 40 * usb usb_bootdev");
ut_assert_nextline("(total hunters: 5)"); ut_assert_nextline("(total hunters: 6)");
ut_assert_console_end(); ut_assert_console_end();
ut_asserteq(GENMASK(4, 0), std->hunters_used); ut_asserteq(GENMASK(5, 0), std->hunters_used);
return 0; return 0;
} }