[Unstable/Focal] UBUNTU: [Config]: built-in VFIO_PCI for amd64

[Thadeu Lima de Souza Cascardo]

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 at canonical.com>
---
 debian.master/config/amd64/config.common.amd64 | 9 +++++----
 debian.master/config/annotations               | 4 ++--
 debian.master/config/arm64/config.common.arm64 | 1 +
 debian.master/config/armhf/config.common.armhf | 1 +
 debian.master/config/config.common.ubuntu      | 1 -
 debian.master/config/i386/config.common.i386   | 1 +
 debian.master/config/s390x/config.common.s390x | 1 +
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 4b64fad18f10..2bbd7db15b75 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -268,7 +268,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
@@ -643,9 +643,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 dea7c3632f17..6372cb3ab63d 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -9200,9 +9200,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 621a6f29614b..bd4ebc1f0a8c 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -632,6 +632,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 5dacffbde2be..c9bf33e629e1 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -685,6 +685,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 68dc916e4e85..53441a6cd0c6 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10946,7 +10946,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 79edadbfa4c0..e427ab2ec240 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 3284a42dd750..c8369129a08b 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -549,6 +549,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
-- 
2.24.0