From f5d9435f43a440613bce954bb0930995aa4331e1 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Tue, 26 Nov 2024 21:59:50 +0100 Subject: [PATCH 1/2] sys-kernel/coreos-modules: Enable VFIO for arm64 VFIO was configured as x86-only, but it also works and is useful on ARM. CONFIG_VFIO_PCI_VGA is x86-specific, so it remains in the amd64 config. --- changelog/changes/2024-11-26-enable-vfio-on-arm.md | 1 + .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 2 -- .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog/changes/2024-11-26-enable-vfio-on-arm.md diff --git a/changelog/changes/2024-11-26-enable-vfio-on-arm.md b/changelog/changes/2024-11-26-enable-vfio-on-arm.md new file mode 100644 index 0000000000..61f5767878 --- /dev/null +++ b/changelog/changes/2024-11-26-enable-vfio-on-arm.md @@ -0,0 +1 @@ +- The VFIO kernel modules are now also available in ARM64 builds. \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index 62ab9e7390..0b2fee68c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -112,8 +112,6 @@ CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m CONFIG_UPROBE_EVENTS=y CONFIG_USB_OHCI_HCD_SSB=y -CONFIG_VFIO=m -CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y CONFIG_VHOST_VSOCK=m CONFIG_VMWARE_BALLOON=m diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 83771370bc..f7c83de695 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -921,6 +921,8 @@ CONFIG_USB_XHCI_HCD=m CONFIG_USER_NS=y CONFIG_VETH=m CONFIG_VFAT_FS=m +CONFIG_VFIO=m +CONFIG_VFIO_PCI=m CONFIG_VHOST_NET=m CONFIG_VIA_RHINE=m CONFIG_VIA_RHINE_MMIO=y From 2677c1cebe3eaecd1b9c8747ea40b3255b2e6f47 Mon Sep 17 00:00:00 2001 From: Lukas Stockner Date: Tue, 10 Dec 2024 13:52:56 +0100 Subject: [PATCH 2/2] Update changelog/changes/2024-11-26-enable-vfio-on-arm.md Co-authored-by: Mathieu Tortuyaux --- changelog/changes/2024-11-26-enable-vfio-on-arm.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/changes/2024-11-26-enable-vfio-on-arm.md b/changelog/changes/2024-11-26-enable-vfio-on-arm.md index 61f5767878..25e4a4d152 100644 --- a/changelog/changes/2024-11-26-enable-vfio-on-arm.md +++ b/changelog/changes/2024-11-26-enable-vfio-on-arm.md @@ -1 +1 @@ -- The VFIO kernel modules are now also available in ARM64 builds. \ No newline at end of file +- The VFIO kernel modules are now also available in ARM64 builds. ([flatcar/scripts#2484](https://github.com/flatcar/scripts/pull/2484)) \ No newline at end of file