drop scsi-qedi-allocate-irqs-based-on-msix_cnt.patch from 4.14 and 4.19

diff --git a/queue-4.14/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch b/queue-4.14/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
deleted file mode 100644 (file)
index 724dcf8..0000000
--- a/queue-4.14/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0c8d6332455e6a063b9fecb7b2116c536edc82b5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Nov 2018 01:25:18 -0800
-Subject: scsi: qedi: Allocate IRQs based on msix_cnt
-
-From: Nilesh Javali <nilesh.javali@cavium.com>
-
-[ Upstream commit 1a291bce5eaf5374627d337157544aa6499ce34a ]
-
-The driver load on some systems failed with error,
-[0004:01:00.5]:[qedi_request_msix_irq:2524]:8: request_irq failed.
-
-Allocate the IRQs based on MSIX count obtained from qed module instead of
-number of queues.
-
-Signed-off-by: Nilesh Javali <nilesh.javali@cavium.com>
-Reviewed-by: Lee Duncan <lduncan@suse.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/scsi/qedi/qedi_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
-index 24b945b555ba3..6e318a995dcc4 100644
---- a/drivers/scsi/qedi/qedi_main.c
-+++ b/drivers/scsi/qedi/qedi_main.c
-@@ -1099,7 +1099,7 @@ static int qedi_request_msix_irq(struct qedi_ctx *qedi)
-       int i, rc, cpu;
- 
-       cpu = cpumask_first(cpu_online_mask);
--      for (i = 0; i < MIN_NUM_CPUS_MSIX(qedi); i++) {
-+      for (i = 0; i < qedi->int_info.msix_cnt; i++) {
-               rc = request_irq(qedi->int_info.msix[i].vector,
-                                qedi_msix_handler, 0, "qedi",
-                                &qedi->fp_array[i]);
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index f0b79ce655679e9c98e4dffb8ada98869410cd18..ae67ad8fa72c641590ab683fcb88cddf817fe061 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -81,7 +81,6 @@ arm-dts-sun8i-v3s-change-pinctrl-nodes-to-avoid-warn.patch
 dlm-null-check-before-kmem_cache_destroy-is-not-need.patch
 arm-debug-enable-uart1-for-socfpga-cyclone5.patch
 nfsd-fix-a-warning-in-__cld_pipe_upcall.patch
-scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
 asoc-au8540-use-64-bit-arithmetic-instead-of-32-bit.patch
 arm-omap1-2-fix-soc-name-printing.patch
 arm64-dts-meson-gxl-libretech-cc-fix-gpio-lines-name.patch

diff --git a/queue-4.19/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch b/queue-4.19/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
deleted file mode 100644 (file)
index 1ff1a6c..0000000
--- a/queue-4.19/scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 858d07cc26891658bb0c2c3aeee3ca4f84012655 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 21 Nov 2018 01:25:18 -0800
-Subject: scsi: qedi: Allocate IRQs based on msix_cnt
-
-From: Nilesh Javali <nilesh.javali@cavium.com>
-
-[ Upstream commit 1a291bce5eaf5374627d337157544aa6499ce34a ]
-
-The driver load on some systems failed with error,
-[0004:01:00.5]:[qedi_request_msix_irq:2524]:8: request_irq failed.
-
-Allocate the IRQs based on MSIX count obtained from qed module instead of
-number of queues.
-
-Signed-off-by: Nilesh Javali <nilesh.javali@cavium.com>
-Reviewed-by: Lee Duncan <lduncan@suse.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/scsi/qedi/qedi_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/scsi/qedi/qedi_main.c b/drivers/scsi/qedi/qedi_main.c
-index 763c7628356b1..a81ea8f6c2087 100644
---- a/drivers/scsi/qedi/qedi_main.c
-+++ b/drivers/scsi/qedi/qedi_main.c
-@@ -1304,7 +1304,7 @@ static int qedi_request_msix_irq(struct qedi_ctx *qedi)
-       int i, rc, cpu;
- 
-       cpu = cpumask_first(cpu_online_mask);
--      for (i = 0; i < MIN_NUM_CPUS_MSIX(qedi); i++) {
-+      for (i = 0; i < qedi->int_info.msix_cnt; i++) {
-               rc = request_irq(qedi->int_info.msix[i].vector,
-                                qedi_msix_handler, 0, "qedi",
-                                &qedi->fp_array[i]);
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 0aa8f34e12b2ff43ba71b1c4ea0da035c37853a8..03181b65e91dd87f1239f2e080e48ff38550ddbf 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -139,7 +139,6 @@ nfsd-fix-a-warning-in-__cld_pipe_upcall.patch
 bpf-btf-implement-btf_name_valid_identifier.patch
 bpf-btf-check-name-validity-for-various-types.patch
 tools-bpftool-fix-a-bitfield-pretty-print-issue.patch
-scsi-qedi-allocate-irqs-based-on-msix_cnt.patch
 asoc-au8540-use-64-bit-arithmetic-instead-of-32-bit.patch
 gpio-of-parse-mmc-specific-cd-and-wp-properties.patch
 arm-omap1-2-fix-soc-name-printing.patch