[SRU][M][PATCH v2 1/1] UBUNTU: [Config] CONFIG_VFIO_PCI_ZDEV_KVM=y

[frank.heimes at canonical.com]

From: Frank Heimes <frank.heimes at canonical.com>

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

Enable VFIO zPCI pass-through for s390x (CONFIG_VFIO_PCI_ZDEV_KVM=y),
to allow pass-through of any kind of s390x-specific vfio-pci devices,
like RoCE devices, ISM devices, NVMe drives.

Signed-off-by: Frank Heimes <frank.heimes at canonical.com>
---
 debian.master/config/annotations | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index af66f5cd0431..f8d51a75c376 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -735,6 +738,9 @@ CONFIG_VFIO                                     note<'LP: #1636733'>
 CONFIG_VFIO_PCI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm', 's390x': 'm'}>
 CONFIG_VFIO_PCI                                 note<'LP: #1636733'>
 
+CONFIG_VFIO_PCI_ZDEV_KVM                        policy<{'s390x': 'y'}>
+CONFIG_VFIO_PCI_ZDEV_KVM                        note<'LP: #2042853'>
+
 CONFIG_VIDEO_VIMC                               policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 'riscv64': 'm'}>
 CONFIG_VIDEO_VIMC                               note<'LP: #1831482'>
 
@@ -14322,7 +14326,6 @@ CONFIG_VFIO_PCI_IGD                             policy<{'amd64': 'y'}>
 CONFIG_VFIO_PCI_INTX                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_VFIO_PCI_MMAP                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 'riscv64': 'y'}>
 CONFIG_VFIO_PCI_VGA                             policy<{'amd64': 'y'}>
-CONFIG_VFIO_PCI_ZDEV_KVM                        policy<{'s390x': 'n'}>
 CONFIG_VFIO_PLATFORM                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET              policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VFIO_PLATFORM_BASE                       policy<{'arm64': 'm', 'armhf': 'm'}>
-- 
2.25.1