On Thu, 4 Nov 2021 16:56:19 +0000
Peter Hoyes <peter.ho...@arm.com> wrote:
> From: Peter Hoyes <peter.ho...@arm.com>
>
> The SMSC driver is using the old driver model.
>
> Init the virtio system in vexpress64.c so that the network device is
> discovered.
Mmmh, it looks a bit weird to explicitly call virtio_init(), when this
should be discovered through the DT, but that's probably how it's done at
the moment.
> Signed-off-by: Peter Hoyes <peter.ho...@arm.com>
Reviewed-by: Andre Przywara <andre.przyw...@arm.com>
Cheers,
Andre
> ---
> board/armltd/vexpress64/vexpress64.c | 7 +++++++
> include/configs/vexpress_aemv8.h | 4 ++--
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/board/armltd/vexpress64/vexpress64.c
> b/board/armltd/vexpress64/vexpress64.c
> index bde6ef1ba3..d2e2404849 100644
> --- a/board/armltd/vexpress64/vexpress64.c
> +++ b/board/armltd/vexpress64/vexpress64.c
> @@ -18,6 +18,10 @@
> #include <dm/platform_data/serial_pl01x.h>
> #include "pcie.h"
> #include <asm/armv8/mmu.h>
> +#ifdef CONFIG_VIRTIO_NET
> +#include <virtio_types.h>
> +#include <virtio.h>
> +#endif
>
> DECLARE_GLOBAL_DATA_PTR;
>
> @@ -64,6 +68,9 @@ __weak void vexpress64_pcie_init(void)
> int board_init(void)
> {
> vexpress64_pcie_init();
> +#ifdef CONFIG_VIRTIO_NET
> + virtio_init();
> +#endif
> return 0;
> }
>
> diff --git a/include/configs/vexpress_aemv8.h
> b/include/configs/vexpress_aemv8.h
> index 48c21082a6..af160a9a66 100644
> --- a/include/configs/vexpress_aemv8.h
> +++ b/include/configs/vexpress_aemv8.h
> @@ -88,8 +88,8 @@
> #endif
> #endif /* !CONFIG_GICV3 */
>
> -#ifndef CONFIG_TARGET_VEXPRESS64_JUNO
> -/* The Vexpress64 simulators use SMSC91C111 */
> +#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && !defined(CONFIG_DM_ETH)
> +/* The Vexpress64 BASE_FVP simulator uses SMSC91C111 */
> #define CONFIG_SMC91111 1
> #define CONFIG_SMC91111_BASE (V2M_PA_BASE + 0x01A000000)
> #endif
