trivial: allow zynqmp to use vpci

Signed-off-by: Chris Guikema <[email protected]>
seL4 · Nov 2, 2022 · 9e09ea4 · 9e09ea4
1 parent b3fcb0d
commit 9e09ea4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/components/VM_Arm/CMakeLists.txt b/components/VM_Arm/CMakeLists.txt
@@ -32,7 +32,7 @@ config_option(
     VM_PCI_SUPPORT
     "Enable virtual pci device support"
     DEPENDS
-    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt OR KernelPlatformOdroidc2"
+    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt OR KernelPlatformOdroidc2 OR KernelPlatformZynqmp"
     DEFAULT
     OFF
 )
@@ -52,7 +52,7 @@ config_option(
     VM_VIRTIO_NET_VIRTQUEUE
     "Enable virtio net virtqueue forwarding module"
     DEPENDS
-    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt;VmPCISupport"
+    "KernelPlatformExynos5410 OR KernelPlatformExynos5422 OR KernelPlatformTx2 OR KernelPlatformQEMUArmVirt OR KernelPlatformZynqmp;VmPCISupport"
     DEFAULT
     OFF
 )

diff --git a/libs/libvirtio/plat_include/zynqmp/virtio/virtio_plat.h b/libs/libvirtio/plat_include/zynqmp/virtio/virtio_plat.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2019, DornerWorks
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#define IRQ_SPI_OFFSET 32
+
+/* 158 chosen because it doesn't correspond to a physical interrupt */
+#define VIRTIO_NET_PLAT_INTERRUPT_LINE (158 + IRQ_SPI_OFFSET)
+#define VIRTIO_CON_PLAT_INTERRUPT_LINE (158 + IRQ_SPI_OFFSET)