smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sandbox: Use a unique name for each USB controller

Browse Source 
Add a number after the node name so that it is clear which controller is
being used.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2025-05-01 07:37:12 -06:00
parent 0b8ea16ea9
commit ec10861dce
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sandbox/dts/test.dts
View File

@@ -1496,7 +1496,7 @@
usb_0: usb@0 {
compatible = "sandbox,usb";
status = "disabled";
hub {
hub0 {
compatible = "sandbox,usb-hub";
#address-cells = <1>;
#size-cells = <0>;
@@ -1510,7 +1510,7 @@
usb_1: usb@1 {
compatible = "sandbox,usb";
iommus = <&iommu>;
hub {
hub1 {
compatible = "usb-hub";
usb,device-class = <9>;
#address-cells = <1>;

12
test/boot/bootdev.c
View File

@@ -231,7 +231,7 @@ static int bootdev_test_order(struct unit_test_state *uts)
ut_asserteq(6, iter.num_devs);
ut_asserteq_str("mmc1.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[2]->name);
bootflow_iter_uninit(&iter);
@@ -277,7 +277,7 @@ static int bootdev_test_order(struct unit_test_state *uts)
ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("mmc1.bootdev", iter.dev_used[1]->name);
ut_asserteq_str("mmc0.bootdev", iter.dev_used[2]->name);
ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[3]->name);
bootflow_iter_uninit(&iter);
@@ -343,11 +343,11 @@ static int bootdev_test_prio(struct unit_test_state *uts)
ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
ut_asserteq(7, iter.num_devs);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[0]->name);
ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[3]->name);
ut_assertok(bootdev_get_sibling_blk(iter.dev_used[3], &blk));
ut_asserteq_str("hub.p1.usb_mass_storage.lun0", blk->name);
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0", blk->name);
/* adjust the priority of the first USB bootdev to the highest */
ucp = dev_get_uclass_plat(iter.dev_used[3]);
@@ -366,7 +366,7 @@ static int bootdev_test_prio(struct unit_test_state *uts)
ut_asserteq(-ENODEV, bootflow_scan_next(&iter, &bflow));
ut_asserteq(8, iter.num_devs);
ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev",
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev",
iter.dev_used[0]->name);
ut_asserteq_str("mmc2.bootdev", iter.dev_used[1]->name);
@@ -612,7 +612,7 @@ static int bootdev_test_hunt_label(struct unit_test_state *uts)
test_set_skip_delays(true);
ut_assertok(bootdev_hunt_and_find_by_label("usb", &dev, &mflags));
ut_assertnonnull(dev);
ut_asserteq_str("hub.p1.usb_mass_storage.lun0.bootdev", dev->name);
ut_asserteq_str("hub1.p1.usb_mass_storage.lun0.bootdev", dev->name);
ut_asserteq(BOOTFLOW_METHF_SINGLE_UCLASS, mflags);
ut_assert_nextlinen("Bus usb@1: scanning bus usb@1");
ut_assert_console_end();

6
test/boot/bootflow.c
View File

@@ -1307,9 +1307,9 @@ static int bootflow_efi(struct unit_test_state *uts)
ut_assert_nextlinen("---");
ut_assert_nextlinen(" 0 extlinux");
ut_assert_nextlinen(
" 1 efi ready usb_mass_ 1 hub.p2.usb_mass_storage.l /EFI/BOOT/BOOTSBOX.EFI");
" 1 efi ready usb_mass_ 1 hub1.p2.usb_mass_storage. /EFI/BOOT/BOOTSBOX.EFI");
ut_assert_nextlinen(
" 2 extlinux ready usb_mass_ 1 hub.p4.usb_mass_storage.l /extlinux/extlinux.conf");
" 2 extlinux ready usb_mass_ 1 hub1.p4.usb_mass_storage. /extlinux/extlinux.conf");
ut_assert_nextlinen("---");
ut_assert_skip_to_line("(3 bootflows, 3 valid)");
ut_assert_console_end();
@@ -1325,7 +1325,7 @@ static int bootflow_efi(struct unit_test_state *uts)
ut_asserteq(1, run_command("bootflow boot", 0));
ut_assert_nextline(
"** Booting bootflow 'hub.p2.usb_mass_storage.lun0.bootdev.part_1' with efi");
"** Booting bootflow 'hub1.p2.usb_mass_storage.lun0.bootdev.part_1' with efi");
if (IS_ENABLED(CONFIG_LOGF_FUNC))
ut_assert_skip_to_line(" efi_run_image() Booting /\\EFI\\BOOT\\BOOTSBOX.EFI");
else

4
test/dm/usb.c
View File

@@ -109,12 +109,12 @@ static int dm_test_usb_fdt_node(struct unit_test_state *uts)
state_set_skip_delays(true);
ut_assertok(usb_init());
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 0, &dev));
node = ofnode_path("/usb@1/hub/usbstor@1");
node = ofnode_path("/usb@1/hub1/usbstor@1");
ut_asserteq(1, ofnode_equal(node, dev_ofnode(dev)));
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 1, &dev));
ut_asserteq(1, ofnode_equal(ofnode_null(), dev_ofnode(dev)));
ut_assertok(uclass_get_device(UCLASS_MASS_STORAGE, 2, &dev));
node = ofnode_path("/usb@1/hub/usbstor@3");
node = ofnode_path("/usb@1/hub1/usbstor@3");
ut_asserteq(1, ofnode_equal(node, dev_ofnode(dev)));
ut_assertok(usb_stop());