diff mbox series

[v7,02/11] virtio: Ensure PCI is set up first

Message ID 20230402140231.v7.2.I10d83b8073de5058efabbf2ba2498fe008624293@changeid
State Superseded
Delegated to: Tom Rini
Headers show
Series [v7,01/11] bootstd: Tweak bootflow logic for device tree | expand

Commit Message

Simon Glass April 2, 2023, 2:02 a.m. UTC 
Sometimes virtio may rely on PCI, or at least that is what the
distro_bootcmd script suggests. Add this in.

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

(no changes since v5)

Changes in v5:
Add new patch to ensure PCI is set up first

 drivers/virtio/virtio-uclass.c | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/drivers/virtio/virtio-uclass.c b/drivers/virtio/virtio-uclass.c
index de9bc90359ca..918cc15b019f 100644
--- a/drivers/virtio/virtio-uclass.c
+++ b/drivers/virtio/virtio-uclass.c
@@ -373,6 +373,12 @@  static int virtio_bootdev_hunt(struct bootdev_hunter *info, bool show)
 {
 	int ret;
 
+	if (IS_ENABLED(CONFIG_PCI)) {
+		ret = uclass_probe_all(UCLASS_PCI);
+		if (ret && ret != -ENOENT)
+			return log_msg_ret("pci", ret);
+	}
+
 	ret = uclass_probe_all(UCLASS_VIRTIO);
 	if (ret && ret != -ENOENT)
 		return log_msg_ret("vir", ret);