From: Sasha Levin <sashal@kernel.org>
Date: Sat, 3 Nov 2018 02:01:10 +0000 (-0400)
Subject: queue net-mlx5-fix-build-break-when-config_smp-n.patch for 4.14
X-Git-Tag: v4.19.1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9288fa987b26a222dcab57010714e8833ee023a8;p=thirdparty%2Fkernel%2Fstable-queue.git

queue net-mlx5-fix-build-break-when-config_smp-n.patch for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/net-mlx5-fix-build-break-when-config_smp-n.patch b/queue-4.14/net-mlx5-fix-build-break-when-config_smp-n.patch
new file mode 100644
index 00000000000..263db25b8bf
--- /dev/null
+++ b/queue-4.14/net-mlx5-fix-build-break-when-config_smp-n.patch
@@ -0,0 +1,62 @@
+From f195543ec31aab9b1eac5954068980c818c7a1c0 Mon Sep 17 00:00:00 2001
+From: Saeed Mahameed <saeedm@mellanox.com>
+Date: Mon, 14 May 2018 15:38:10 -0700
+Subject: net/mlx5: Fix build break when CONFIG_SMP=n
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+[ Upstream commit e3ca34880652250f524022ad89e516f8ba9a805b ]
+
+Avoid using the kernel's irq_descriptor and return IRQ vector affinity
+directly from the driver.
+
+This fixes the following build break when CONFIG_SMP=n
+
+include/linux/mlx5/driver.h: In function ‘mlx5_get_vector_affinity_hint’:
+include/linux/mlx5/driver.h:1299:13: error:
+        ‘struct irq_desc’ has no member named ‘affinity_hint’
+
+Fixes: 6082d9c9c94a ("net/mlx5: Fix mlx5_get_vector_affinity function")
+Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+CC: Randy Dunlap <rdunlap@infradead.org>
+CC: Guenter Roeck <linux@roeck-us.net>
+CC: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Israel Rukshin <israelr@mellanox.com>
+Reported-by: kbuild test robot <lkp@intel.com>
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Tested-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ include/linux/mlx5/driver.h | 12 +-----------
+ 1 file changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
+index 5eff332092bc..fb677e4f902d 100644
+--- a/include/linux/mlx5/driver.h
++++ b/include/linux/mlx5/driver.h
+@@ -1195,17 +1195,7 @@ enum {
+ static inline const struct cpumask *
+ mlx5_get_vector_affinity_hint(struct mlx5_core_dev *dev, int vector)
+ {
+-	struct irq_desc *desc;
+-	unsigned int irq;
+-	int eqn;
+-	int err;
+-
+-	err = mlx5_vector2eqn(dev, vector, &eqn, &irq);
+-	if (err)
+-		return NULL;
+-
+-	desc = irq_to_desc(irq);
+-	return desc->affinity_hint;
++	return dev->priv.irq_info[vector].mask;
+ }
+ 
+ #endif /* MLX5_DRIVER_H */
+-- 
+2.17.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
index e2850fc0c2c..90c36718b80 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -141,3 +141,4 @@ rtnetlink-disallow-fdb-configuration-for-non-ethernet-device.patch
 net-ipmr-fix-unresolved-entry-dumps.patch
 net-bcmgenet-poll-internal-phy-for-genetv5.patch
 net-sched-cls_api-add-missing-validation-of-netlink-attributes.patch
+net-mlx5-fix-build-break-when-config_smp-n.patch