| Message ID | 20240328095824.1179072-1-l.stelmach@samsung.com |
|---|---|
| State | Accepted |
| Commit | c532ddded9093df585dd324c68932053b6241abf |
| Delegated to: | Andes |
| Headers | show |
| Series | [v2] riscv: Move virtio scan to board_late_init() | expand |
On Thu, Mar 28, 2024 at 10:58:24AM +0100, Łukasz Stelmach wrote: > [EXTERNAL MAIL] > > 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(-) Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
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; }
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(-)