From: "Łukasz Stelmach" <l.stelmach@samsung.com>
To: u-boot@lists.denx.de, Leo Liang <ycliang@andestech.com>
Cc: "Marek Szyprowski" <m.szyprowski@samsung.com>,
"Seung-Woo Kim" <sw0312.kim@samsung.com>,
"Jaehoon Chung" <jh80.chung@samsung.com>,
"Łukasz Stelmach" <l.stelmach@samsung.com>
Subject: [PATCH v2] riscv: Move virtio scan to board_late_init()
Date: Thu, 28 Mar 2024 10:58:24 +0100 [thread overview]
Message-ID: <20240328095824.1179072-1-l.stelmach@samsung.com> (raw)
In-Reply-To: CGME20240328095912eucas1p1f064f0460cf71edcfd82ca1782906a44@eucas1p1.samsung.com
When virtio_init() gets called from board_init() PCI isn't ready. Thus,
virtio-over-PCI (e.g. network interfaces) devices can't be detected and
used without additional `virtio scan` scan in the shell or a script.
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---
Changes since v1:
- remove virtio_init() call from board_init()
- select BOARD_LATE_INIT for TARGET_QEMU_VIRT
arch/riscv/Kconfig | 1 +
board/emulation/qemu-riscv/qemu-riscv.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index ac52c5e6daf..c5c2e8a9c9d 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -22,6 +22,7 @@ config TARGET_OPENPITON_RISCV64
config TARGET_QEMU_VIRT
bool "Support QEMU Virt Board"
+ select BOARD_LATE_INIT
config TARGET_SIFIVE_UNLEASHED
bool "Support SiFive Unleashed Board"
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 181abbbf97d..173245b40e3 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -31,12 +31,6 @@ int is_flash_available(void)
int board_init(void)
{
- /*
- * Make sure virtio bus is enumerated so that peripherals
- * on the virtio bus can be discovered by their drivers
- */
- virtio_init();
-
return 0;
}
@@ -46,6 +40,12 @@ int board_late_init(void)
if (CONFIG_IS_ENABLED(USB_KEYBOARD))
usb_init();
+ /*
+ * Make sure virtio bus is enumerated so that peripherals
+ * on the virtio bus can be discovered by their drivers
+ */
+ virtio_init();
+
return 0;
}
--
2.39.2
next parent reply other threads:[~2024-03-28 11:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20240328095912eucas1p1f064f0460cf71edcfd82ca1782906a44@eucas1p1.samsung.com>
2024-03-28 9:58 ` Łukasz Stelmach [this message]
2024-03-28 11:59 ` [PATCH v2] riscv: Move virtio scan to board_late_init() Leo Liang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240328095824.1179072-1-l.stelmach@samsung.com \
--to=l.stelmach@samsung.com \
--cc=jh80.chung@samsung.com \
--cc=m.szyprowski@samsung.com \
--cc=sw0312.kim@samsung.com \
--cc=u-boot@lists.denx.de \
--cc=ycliang@andestech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).