summaryrefslogtreecommitdiff
path: root/scripts/package-build
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2026-10-01 18:25:38 +0200
committerChristian Breunig <christian@breunig.cc>2026-10-01 20:43:17 +0200
commit312893b89351bbf2cc683eb6ebbac7f0a789da32 (patch)
treea54f281cea94886cdebd02942cb7460143b79883 /scripts/package-build
parent73d9d2d6750e50649c1c1cf0bf3e8df7ac9e7fcb (diff)
downloadvyos-build-312893b89351bbf2cc683eb6ebbac7f0a789da32.tar.gz
vyos-build-312893b89351bbf2cc683eb6ebbac7f0a789da32.zip
Kernel: T9014: enable VIRTIO_IOMMU on arm64
Smoketest test_kernel_options.py::test_hypervisor_virtio fails on arm64. The test is not architecture gated and checks fifteen virtio options, of which VIRTIO_IOMMU was the only one not enabled on arm64 - amd64 has it as a module already. The driver is available here, it is "depends on VIRTIO && (ARM64 || X86)", and it is what QEMU virt machines use, so build it as a module to match amd64. ACPI_VIOT comes along because VIRTIO_IOMMU selects it.
Diffstat (limited to 'scripts/package-build')
-rw-r--r--scripts/package-build/linux-kernel/config/arm64/vyos_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
index 0bbfc8f6..2ce6e790 100644
--- a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
+++ b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig
@@ -736,6 +736,7 @@ CONFIG_ACPI_PPTT=y
CONFIG_ACPI_PCC=y
# CONFIG_ACPI_FFH is not set
# CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_VIOT=y
CONFIG_ACPI_PRMT=y
# CONFIG_VIRTUALIZATION is not set
CONFIG_HAVE_LIVEPATCH=y
@@ -6287,7 +6288,7 @@ CONFIG_QCOM_IOMMU=y
CONFIG_ROCKCHIP_IOMMU=y
# CONFIG_SUN50I_IOMMU is not set
# CONFIG_IPMMU_VMSA is not set
-# CONFIG_VIRTIO_IOMMU is not set
+CONFIG_VIRTIO_IOMMU=m
#
# Remoteproc drivers