[Minios-devel] [UNIKRAFT PATCH RFC 6/7] build: Enable the platform bus and virtio_mmio device on arm64

[Jia He <justin.he@xxxxxxx>]

Enable the config for KVM_PF and add virtio mmio to the build system.

Signed-off-by: Jia He <justin.he@xxxxxxx>
---
 plat/kvm/Config.uk   | 20 +++++++++++++++++++-
 plat/kvm/Makefile.uk | 12 ++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/plat/kvm/Config.uk b/plat/kvm/Config.uk
index 47ae8e2..283894d 100644
--- a/plat/kvm/Config.uk
+++ b/plat/kvm/Config.uk
@@ -51,10 +51,18 @@ config KVM_PCI
        help
                 PCI bus driver for probing and operating PCI devices
 
+config KVM_PF
+       bool "Platform Bus Driver"
+       default y
+       depends on (ARCH_ARM_64)
+       select LIBUKBUS
+       help
+               Platform bus driver for probing and operating platform devices
+
 config VIRTIO_BUS
       bool  "Virtio bus driver"
       default y
-      depends on (ARCH_X86_64)
+      depends on (ARCH_X86_64 || ARCH_ARM_64)
       depends on LIBUKBUS
       select LIBUKALLOC
       select LIBUKSGLIST
@@ -72,12 +80,22 @@ config VIRTIO_PCI
        help
                Support virtio devices on PCI bus
 
+config VIRTIO_MMIO
+       bool "Virtio mmio device support"
+       default y if (VIRTIO_NET)
+       default n
+       depends on KVM_PF
+       select VIRTIO_BUS
+       help
+               Support virtio devices on mmio bus
+
 config VIRTIO_NET
        bool "Virtio Net device"
        default y if LIBUKNETDEV
        default n
        depends on LIBUKNETDEV
        imply VIRTIO_PCI if ARCH_X86_64
+       imply VIRTIO_MMIO if ARCH_ARM_64
        select VIRTIO_BUS
        select LIBUKSGLIST
        help
diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
index 63bd5b0..2732cc5 100644
--- a/plat/kvm/Makefile.uk
+++ b/plat/kvm/Makefile.uk
@@ -8,6 +8,7 @@ $(eval $(call addplat_s,kvm,$(CONFIG_PLAT_KVM)))
 ##
 $(eval $(call addplatlib,kvm,libkvmplat))
 $(eval $(call addplatlib_s,kvm,libkvmpci,$(CONFIG_KVM_PCI)))
+$(eval $(call addplatlib_s,kvm,libkvmpf,$(CONFIG_KVM_PF)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtio,$(CONFIG_VIRTIO_BUS)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtionet,$(CONFIG_VIRTIO_NET)))
 $(eval $(call addplatlib_s,kvm,libkvmvirtio9p,$(CONFIG_VIRTIO_9P)))
@@ -109,6 +110,15 @@ LIBKVMPCI_CINCLUDES-$(CONFIG_ARCH_X86_64)   += 
-I$(LIBKVMPLAT_BASE)/include
 LIBKVMPCI_CINCLUDES-$(CONFIG_ARCH_X86_64)   += -I$(UK_PLAT_COMMON_BASE)/include
 LIBKVMPCI_SRCS-$(CONFIG_ARCH_X86_64)        += 
$(UK_PLAT_COMMON_BASE)/pci_bus.c|common
 
+##
+## Platform bus library definitions
+##
+LIBKVMPF_ASINCLUDES-$(CONFIG_ARCH_ARM_64)  += -I$(UK_PLAT_COMMON_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(UK_PLAT_COMMON_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(LIBKVMPLAT_BASE)/include
+LIBKVMPF_CINCLUDES-$(CONFIG_ARCH_ARM_64)   += -I$(UK_PLAT_DRIVERS_BASE)/include
+LIBKVMPF_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/platform_bus.c|common
+
 ##
 ## Virtio library definitions
 ##
@@ -124,6 +134,8 @@ LIBKVMVIRTIO_SRCS-$(CONFIG_VIRTIO_BUS) +=\
                        $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_ring.c
 LIBKVMVIRTIO_SRCS-$(CONFIG_VIRTIO_PCI) +=\
                        $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_pci.c
+LIBKVMVIRTIO_SRCS-$(CONFIG_VIRTIO_MMIO)        +=\
+                       $(UK_PLAT_DRIVERS_BASE)/virtio/virtio_mmio.c
 ##
 ## Virtio Net library definition
 ##
-- 
2.17.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel