From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 23 Oct 2025 15:37:44 +0000 (+0200)
Subject: 6.17-stable patches
X-Git-Tag: v5.4.301~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ca8f625f8127d114fc9433e1066e2fe08a6a4c2;p=thirdparty%2Fkernel%2Fstable-queue.git

6.17-stable patches

added patches:
	vfio-cdx-update-driver-to-build-without-config_generic_msi_irq.patch
---

diff --git a/queue-6.17/series b/queue-6.17/series
index 9573e13e6a..57f472fec3 100644
--- a/queue-6.17/series
+++ b/queue-6.17/series
@@ -1 +1,2 @@
 sched-fair-block-delayed-tasks-on-throttled-hierarchy-during-dequeue.patch
+vfio-cdx-update-driver-to-build-without-config_generic_msi_irq.patch
diff --git a/queue-6.17/vfio-cdx-update-driver-to-build-without-config_generic_msi_irq.patch b/queue-6.17/vfio-cdx-update-driver-to-build-without-config_generic_msi_irq.patch
new file mode 100644
index 0000000000..e588e33e3a
--- /dev/null
+++ b/queue-6.17/vfio-cdx-update-driver-to-build-without-config_generic_msi_irq.patch
@@ -0,0 +1,66 @@
+From 9f3acb3d9a1872e2fa36af068ca2e93a8a864089 Mon Sep 17 00:00:00 2001
+From: Nipun Gupta <nipun.gupta@amd.com>
+Date: Tue, 26 Aug 2025 10:08:52 +0530
+Subject: vfio/cdx: update driver to build without CONFIG_GENERIC_MSI_IRQ
+
+From: Nipun Gupta <nipun.gupta@amd.com>
+
+commit 9f3acb3d9a1872e2fa36af068ca2e93a8a864089 upstream.
+
+Define dummy MSI related APIs in VFIO CDX driver to build the
+driver without enabling CONFIG_GENERIC_MSI_IRQ flag.
+
+Reported-by: kernel test robot <lkp@intel.com>
+Closes: https://lore.kernel.org/oe-kbuild-all/202508070308.opy5dIFX-lkp@intel.com/
+Reviewed-by: Nikhil Agarwal <nikhil.agarwal@amd.com>
+Reviewed-by: Alex Williamson <alex.williamson@redhat.com>
+Signed-off-by: Nipun Gupta <nipun.gupta@amd.com>
+Link: https://lore.kernel.org/r/20250826043852.2206008-2-nipun.gupta@amd.com
+Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
+Cc: Nathan Chancellor <nathan@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/vfio/cdx/Makefile  |    6 +++++-
+ drivers/vfio/cdx/private.h |   14 ++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+--- a/drivers/vfio/cdx/Makefile
++++ b/drivers/vfio/cdx/Makefile
+@@ -5,4 +5,8 @@
+ 
+ obj-$(CONFIG_VFIO_CDX) += vfio-cdx.o
+ 
+-vfio-cdx-objs := main.o intr.o
++vfio-cdx-objs := main.o
++
++ifdef CONFIG_GENERIC_MSI_IRQ
++vfio-cdx-objs += intr.o
++endif
+--- a/drivers/vfio/cdx/private.h
++++ b/drivers/vfio/cdx/private.h
+@@ -38,11 +38,25 @@ struct vfio_cdx_device {
+ 	u8			config_msi;
+ };
+ 
++#ifdef CONFIG_GENERIC_MSI_IRQ
+ int vfio_cdx_set_irqs_ioctl(struct vfio_cdx_device *vdev,
+ 			    u32 flags, unsigned int index,
+ 			    unsigned int start, unsigned int count,
+ 			    void *data);
+ 
+ void vfio_cdx_irqs_cleanup(struct vfio_cdx_device *vdev);
++#else
++static int vfio_cdx_set_irqs_ioctl(struct vfio_cdx_device *vdev,
++				   u32 flags, unsigned int index,
++				   unsigned int start, unsigned int count,
++				   void *data)
++{
++	return -EINVAL;
++}
++
++static void vfio_cdx_irqs_cleanup(struct vfio_cdx_device *vdev)
++{
++}
++#endif
+ 
+ #endif /* VFIO_CDX_PRIVATE_H */