[PATCH Yakkety SRU] UBUNTU: [Config] CONFIG_VFIO_PCI=y for ppc64el

Tim Gardner tim.gardner at canonical.com
Thu Oct 27 17:10:04 UTC 2016


BugLink: http://bugs.launchpad.net/bugs/1636733

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian.master/config/amd64/config.common.amd64     | 3 +++
 debian.master/config/annotations                   | 7 +++++--
 debian.master/config/arm64/config.common.arm64     | 3 +++
 debian.master/config/armhf/config.common.armhf     | 3 +++
 debian.master/config/config.common.ubuntu          | 5 -----
 debian.master/config/i386/config.common.i386       | 3 +++
 debian.master/config/powerpc/config.common.powerpc | 5 +++++
 debian.master/config/ppc64el/config.common.ppc64el | 7 ++++++-
 8 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 6614ae0..cc8bb11 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -254,6 +254,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_ISA_BUS_API=y
 CONFIG_ISL29003=m
 CONFIG_ISL29020=m
@@ -651,6 +652,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VITESSE_PHY=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index e9b40fc..6287c43 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -6827,12 +6827,15 @@ CONFIG_UIO_PRUSS                                policy<{'amd64': 'm', 'arm64': '
 CONFIG_UIO_MF624                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc': 'm', 'ppc64el': 'm'}>
 
 # Menu: Device Drivers >> VFIO Non-Privileged userspace driver framework
-CONFIG_VFIO                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-generic': 'm', 'ppc64el': 'm'}>
-CONFIG_VFIO_PCI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-generic': 'm', 'ppc64el': 'm'}>
+CONFIG_VFIO                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-generic': 'm', 'ppc64el': 'y'}>
+CONFIG_VFIO_PCI                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'powerpc-generic': 'm', 'ppc64el': 'y'}>
 CONFIG_VFIO_PCI_VGA                             policy<{'amd64': 'y', 'i386': 'y'}>
 CONFIG_VFIO_PLATFORM                            policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VFIO_AMBA                                policy<{'arm64': 'm', 'armhf': 'm'}>
 CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET         policy<{'arm64': 'm', 'armhf': 'm'}>
+#
+CONFIG_VFIO					mark<ENFORCED>note<LP#1636733>
+CONFIG_VFIO_PCI					mark<ENFORCED>note<LP#1636733>
 
 # Menu: Device Drivers >> VME bridge support
 CONFIG_VME_BUS                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a7e10eb..801759e 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -283,6 +283,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_ISA_BUS_API is not set
 CONFIG_ISL29003=m
@@ -710,6 +711,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
 # CONFIG_VIDEO_RCAR_VIN is not set
 # CONFIG_VIDEO_RENESAS_JPU is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 263fb04..e02a56e 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -266,6 +266,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_ISA_BUS_API is not set
 CONFIG_ISL29003=m
@@ -683,6 +684,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
 CONFIG_VIDEO_RCAR_VIN=m
 CONFIG_VIDEO_RENESAS_JPU=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 470e337..da45ab8 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3911,7 +3911,6 @@ CONFIG_IRLAN=m
 CONFIG_IRNET=m
 CONFIG_IRQCHIP=y
 # CONFIG_IRQSOFF_TRACER is not set
-CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_IRQ_CROSSBAR=y
 CONFIG_IRQ_DOMAIN=y
 # CONFIG_IRQ_DOMAIN_DEBUG is not set
@@ -8837,8 +8836,6 @@ CONFIG_VF610_ADC=m
 CONFIG_VF610_DAC=m
 CONFIG_VFAT_FS=y
 CONFIG_VFIO_AMBA=m
-CONFIG_VFIO_IOMMU_SPAPR_TCE=m
-CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_IGD=y
 CONFIG_VFIO_PCI_INTX=y
 CONFIG_VFIO_PCI_MMAP=y
@@ -8846,8 +8843,6 @@ CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_PLATFORM=m
 CONFIG_VFIO_PLATFORM_AMDXGBE_RESET=m
 CONFIG_VFIO_PLATFORM_CALXEDAXGMAC_RESET=m
-CONFIG_VFIO_SPAPR_EEH=m
-CONFIG_VFIO_VIRQFD=m
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 6e01089..57c6990 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -250,6 +250,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IPX_INTERN is not set
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
 CONFIG_ISA=y
 CONFIG_ISA_BUS_API=y
 CONFIG_ISL29003=m
@@ -643,6 +644,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_IOMMU_TYPE1=m
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VITESSE_PHY=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 011e182..a1ce7f6 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -229,6 +229,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 # CONFIG_IRQ_ALL_CPUS is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_ISA is not set
 # CONFIG_ISA_BUS_API is not set
@@ -619,8 +620,12 @@ CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_USELIB=y
 CONFIG_UWB=m
 CONFIG_VFIO=m
+CONFIG_VFIO_IOMMU_SPAPR_TCE=m
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 # CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_SPAPR_EEH=m
+CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index c4a37cd..0d84090 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -259,6 +259,7 @@ CONFIG_IPV6_MIP6=m
 # CONFIG_IP_DCCP_CCID3 is not set
 # CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
 CONFIG_IRQ_ALL_CPUS=y
+CONFIG_IRQ_BYPASS_MANAGER=y
 # CONFIG_IRQ_FORCED_THREADING_DEFAULT is not set
 # CONFIG_ISA_BUS_API is not set
 CONFIG_ISL29003=m
@@ -689,9 +690,13 @@ CONFIG_USB_SUPPORT=y
 CONFIG_USB_SWITCH_FSA9480=m
 CONFIG_USELIB=y
 CONFIG_UWB=m
-CONFIG_VFIO=m
+CONFIG_VFIO=y
+CONFIG_VFIO_IOMMU_SPAPR_TCE=y
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
 CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=y
+CONFIG_VFIO_SPAPR_EEH=y
+CONFIG_VFIO_VIRQFD=y
 CONFIG_VGASTATE=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
-- 
2.7.4





More information about the kernel-team mailing list