drop pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch from everywhere

diff --git a/queue-4.14/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-4.14/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index f6f86b8..0000000
--- a/queue-4.14/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d352002f6b67a6d88586d896cd13d5e8b5c7956a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index b9fedf9c77cb9..d0bff9a9f9a9c 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5068,6 +5068,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 44ff4d17356b2e85a7cef78a98ce1db0e69290d4..df1ddf9c9651fec22c31d7063f2201ad73592024 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -14,7 +14,6 @@ mips-fix-a-compilation-issue.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 media-ov5640-fix-analogue-gain-control.patch
 tipc-improve-function-tipc_wait_for_cond.patch
 drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch

diff --git a/queue-4.19/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-4.19/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index c74208d..0000000
--- a/queue-4.19/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e2452a2a778f1d93481d3db6d0840ef1b3425090 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index afa6acb58eec8..db2faa483d253 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5157,6 +5157,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index c156c78143aedb9b432f07f574a89a03bb13718f..4bd6cd4cd9f425a2c573f6766be4127517c363e9 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -27,7 +27,6 @@ mips-fix-a-compilation-issue.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 media-ov5640-fix-analogue-gain-control.patch
 tipc-improve-function-tipc_wait_for_cond.patch
 drm-i915-don-t-use-bar-mappings-for-ring-buffers-with-llc.patch

diff --git a/queue-5.10/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-5.10/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index 66ce826..0000000
--- a/queue-5.10/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From c010f0ad86a53a87e6ef959d807ac2924fa28491 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index c1ebd5e12b06e..3c7d7f094718f 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5328,6 +5328,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index b2253ba35406a7a0dcd53953a0af822727c5eea4..968e03bba4ee4101f7ea55e006afcebfdef13ce6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -69,7 +69,6 @@ powerpc-kcsan-exclude-udelay-to-prevent-recursive-in.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 scripts-handle-brokenpipeerror-for-python-scripts.patch
 media-ov5640-fix-analogue-gain-control.patch
 media-rc-gpio-ir-recv-add-remove-function.patch

diff --git a/queue-5.15/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-5.15/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index cadab35..0000000
--- a/queue-5.15/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From aa613736613cac3b94c9001e08919a274ab5ad03 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 643a3b292f0b6..7213d910685c7 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5354,6 +5354,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 0a03fccf9353098e3b60742982913ae99bafdcc9..a9fe0cce015182f5ae1a841e6fab818413e75a1c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -109,7 +109,6 @@ powerpc-kcsan-exclude-udelay-to-prevent-recursive-in.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 scripts-handle-brokenpipeerror-for-python-scripts.patch
 media-ov5640-fix-analogue-gain-control.patch
 media-rc-gpio-ir-recv-add-remove-function.patch

diff --git a/queue-5.4/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-5.4/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index a6c193f..0000000
--- a/queue-5.4/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 2af77a93c309da7c99f0db1d6975e4909985dd09 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 449d4ed611a68..12bf7348abc6c 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5364,6 +5364,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 9b9c1e3942baa0d6115ba4a4b6fd96b62290911b..37151a6982d1cc3c19f8195550dfe4daa2ce57f8 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -49,7 +49,6 @@ mips-fix-a-compilation-issue.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 media-ov5640-fix-analogue-gain-control.patch
 ipmi-watchdog-replace-atomic_add-and-atomic_sub.patch
 ipmi-watchdog-set-panic-count-to-proper-value-on-a-panic.patch

diff --git a/queue-6.1/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-6.1/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index 131f277..0000000
--- a/queue-6.1/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 552c77701cabcd36e6927832fe6f82b495f572f1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 494fa46f57671..44cab813bf951 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5366,6 +5366,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 6916b23c93b3321fea262845e9fad4a78ea2ebbd..bfb4076d8c75afc45e7431edc198a00ca618b94e 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -131,7 +131,6 @@ powerpc-kcsan-exclude-udelay-to-prevent-recursive-in.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 scripts-handle-brokenpipeerror-for-python-scripts.patch
 media-ov5640-fix-analogue-gain-control.patch
 media-rc-gpio-ir-recv-add-remove-function.patch

diff --git a/queue-6.2/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch b/queue-6.2/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
deleted file mode 100644 (file)
index 3f5a88d..0000000
--- a/queue-6.2/pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 59e80d6821ebd96d9030564229bed13df497f2cc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 10 Jan 2023 18:56:37 +0200
-Subject: PCI: Avoid FLR for SolidRun SNET DPU rev 1
-
-From: Alvaro Karsz <alvaro.karsz@solid-run.com>
-
-[ Upstream commit d089d69cc1f824936eeaa4fa172f8fa1a0949eaa ]
-
-This patch fixes a FLR bug on the SNET DPU rev 1 by setting the
-PCI_DEV_FLAGS_NO_FLR_RESET flag.
-
-As there is a quirk to avoid FLR (quirk_no_flr), I added a new quirk
-to check the rev ID before calling to quirk_no_flr.
-
-Without this patch, a SNET DPU rev 1 may hang when FLR is applied.
-
-Signed-off-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
-Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-Message-Id: <20230110165638.123745-3-alvaro.karsz@solid-run.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/quirks.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 494fa46f57671..44cab813bf951 100644
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -5366,6 +5366,14 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr);
- DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
- 
-+/* FLR may cause the SolidRun SNET DPU (rev 0x1) to hang */
-+static void quirk_no_flr_snet(struct pci_dev *dev)
-+{
-+      if (dev->revision == 0x1)
-+              quirk_no_flr(dev);
-+}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SOLIDRUN, 0x1000, quirk_no_flr_snet);
-+
- static void quirk_no_ext_tags(struct pci_dev *pdev)
- {
-       struct pci_host_bridge *bridge = pci_find_host_bridge(pdev->bus);
--- 
-2.39.2
-

diff --git a/queue-6.2/series b/queue-6.2/series
index 8573f9f71625827d5405a82c3a1fde68451ee8ff..4d733c9d71df836ac5337f9eb2e35d23e5cf9b21 100644 (file)
--- a/queue-6.2/series
+++ b/queue-6.2/series
@@ -127,7 +127,6 @@ powerpc-kcsan-exclude-udelay-to-prevent-recursive-in.patch
 alpha-fix-r_alpha_literal-reloc-for-large-modules.patch
 macintosh-windfarm-use-unsigned-type-for-1-bit-bitfi.patch
 pci-add-solidrun-vendor-id.patch
-pci-avoid-flr-for-solidrun-snet-dpu-rev-1.patch
 scripts-handle-brokenpipeerror-for-python-scripts.patch
 media-ov5640-fix-analogue-gain-control.patch
 media-rc-gpio-ir-recv-add-remove-function.patch