From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Date: Thu, 19 Dec 2019 19:45:31 +0000 (-0300)
Subject: UBUNTU: [Config]: built-in VFIO_PCI for amd64
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~15
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cc3b7fae145887dafdccb6ab543f9e22b6050c79;p=mirror_ubuntu-focal-kernel.git

UBUNTU: [Config]: built-in VFIO_PCI for amd64

BugLink: https://bugs.launchpad.net/bugs/1770845

This allows vfio-pci to be bound to certain devices during boot, preventing
other drivers from binding them.

In particular, USB host drivers, like xhci_hcd, are hard to unbind, as USB
devices may end up being used by applications.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
[ saf: add removed modules to modules.ignore ]
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
---

diff --git a/debian.master/abi/5.4.0-9.12/modules.ignore b/debian.master/abi/5.4.0-9.12/modules.ignore
new file mode 100644
index 000000000000..6286ecf3dcbf
--- /dev/null
+++ b/debian.master/abi/5.4.0-9.12/modules.ignore
@@ -0,0 +1,5 @@
+irqbypass
+vfio
+vfio-pci
+vfio_iommu_type1
+vfio_virqfd
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 1cc815b58cbc..7bc258ccbcfa 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -267,7 +267,7 @@ CONFIG_IOMMU_IOVA=y
 CONFIG_IPACK_BUS=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IP_DCCP_CCID3 is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
 CONFIG_JFS_FS=m
@@ -644,9 +644,10 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_VFIO=m
-CONFIG_VFIO_PCI=m
-CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=y
+CONFIG_VFIO_IOMMU_TYPE1=y
+CONFIG_VFIO_PCI=y
+CONFIG_VFIO_VIRQFD=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e24132d83808..0b8d350765eb 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9205,9 +9205,9 @@ CONFIG_UIO_MF624                                policy<{'amd64': 'm', 'arm64': '
 CONFIG_UIO_HV_GENERIC                           policy<{'amd64': 'm', 'i386': 'm'}>
 
 # Menu: Device Drivers >> VFIO Non-Privileged userspace driver framework
-CONFIG_VFIO                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'y', 's390x': 'm'}>
+CONFIG_VFIO                                     policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'y', 's390x': 'm'}>
 CONFIG_VFIO_NOIOMMU                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}>
-CONFIG_VFIO_PCI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'y', 's390x': 'm'}>
+CONFIG_VFIO_PCI                                 policy<{'amd64': 'y', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'y', 's390x': 'm'}>
 CONFIG_VFIO_PCI_VGA                             policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_VFIO_PCI_IGD                             policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_VFIO_MDEV                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm', 's390x': 'm'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index dd99ee973e53..5647f277b9a8 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -630,6 +630,7 @@ CONFIG_USB_HCD_SSB=m
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_SUPPORT=y
 CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VIRTIO_MMIO=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 5d0ddfb0461b..83f2706f0fbf 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -684,6 +684,7 @@ CONFIG_USB_USBNET=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_USB_XHCI_RCAR=m
 CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VIRTIO_MMIO=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index edc7f1945358..4aace08c2bfa 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10827,7 +10827,6 @@ CONFIG_VFIO_AMBA=m
 CONFIG_VFIO_AP=m
 CONFIG_VFIO_CCW=m
 CONFIG_VFIO_IOMMU_SPAPR_TCE=y
-CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_MDEV=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VFIO_NOIOMMU=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6a777057594e..501bac8e98ab 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -637,6 +637,7 @@ CONFIG_USB_ULPI_BUS=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_XHCI_PLATFORM=m
 CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VIRTIO_MMIO=y
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 0d768b0e2c8a..1fa06833dc42 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -550,6 +550,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 # CONFIG_VIRTIO_MMIO is not set