]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop broken spi patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 7 Aug 2019 16:49:47 +0000 (18:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 7 Aug 2019 16:49:47 +0000 (18:49 +0200)
queue-4.14/series
queue-4.14/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch [deleted file]
queue-4.19/series
queue-4.19/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch [deleted file]
queue-4.4/series
queue-4.4/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch [deleted file]
queue-4.9/series
queue-4.9/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch [deleted file]
queue-5.2/series
queue-5.2/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch [deleted file]

index 20e81da2a02947fa1628afdfba47b30d90e624e3..f7e9a7a244a422d21ea8108c5bed2ee59034e67a 100644 (file)
@@ -5,4 +5,3 @@ tcp-be-more-careful-in-tcp_fragment.patch
 arm64-cpufeature-fix-feature-comparison-for-ctr_el0.-cwg-erg.patch
 hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
-spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
diff --git a/queue-4.14/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch b/queue-4.14/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
deleted file mode 100644 (file)
index 93120c7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d8bef50365847134b51c1ec46786bc2873e4e47 Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Wed, 3 Jul 2019 12:29:31 +0200
-Subject: spi: bcm2835: Fix 3-wire mode if DMA is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Lukas Wunner <lukas@wunner.de>
-
-commit 8d8bef50365847134b51c1ec46786bc2873e4e47 upstream.
-
-Commit 6935224da248 ("spi: bcm2835: enable support of 3-wire mode")
-added 3-wire support to the BCM2835 SPI driver by setting the REN bit
-(Read Enable) in the CS register when receiving data.  The REN bit puts
-the transmitter in high-impedance state.  The driver recognizes that
-data is to be received by checking whether the rx_buf of a transfer is
-non-NULL.
-
-Commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers
-meeting certain conditions") subsequently broke 3-wire support because
-it set the SPI_MASTER_MUST_RX flag which causes spi_map_msg() to replace
-rx_buf with a dummy buffer if it is NULL.  As a result, rx_buf is
-*always* non-NULL if DMA is enabled.
-
-Reinstate 3-wire support by not only checking whether rx_buf is non-NULL,
-but also checking that it is not the dummy buffer.
-
-Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions")
-Reported-by: Nuno Sá <nuno.sa@analog.com>
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v4.2+
-Cc: Martin Sperl <kernel@martin.sperl.org>
-Acked-by: Stefan Wahren <wahrenst@gmx.net>
-Link: https://lore.kernel.org/r/328318841455e505370ef8ecad97b646c033dc8a.1562148527.git.lukas@wunner.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm2835.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -554,7 +554,8 @@ static int bcm2835_spi_transfer_one(stru
-       bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
-       /* handle all the 3-wire mode */
--      if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
-+      if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
-+          tfr->rx_buf != ctlr->dummy_rx)
-               cs |= BCM2835_SPI_CS_REN;
-       else
-               cs &= ~BCM2835_SPI_CS_REN;
index 5638e8de4bd8b9a588d8b2caeb17a72a717f851b..c11910f113a2f8e098ea58f52bc5d82172ba7670 100644 (file)
@@ -8,5 +8,4 @@ libnvdimm-bus-prepare-the-nd_ioctl-path-to-be-re-ent.patch
 libnvdimm-bus-fix-wait_nvdimm_bus_probe_idle-abba-de.patch
 hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
-spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
 ib-directly-cast-the-sockaddr-union-to-aockaddr.patch
diff --git a/queue-4.19/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch b/queue-4.19/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
deleted file mode 100644 (file)
index 93120c7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d8bef50365847134b51c1ec46786bc2873e4e47 Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Wed, 3 Jul 2019 12:29:31 +0200
-Subject: spi: bcm2835: Fix 3-wire mode if DMA is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Lukas Wunner <lukas@wunner.de>
-
-commit 8d8bef50365847134b51c1ec46786bc2873e4e47 upstream.
-
-Commit 6935224da248 ("spi: bcm2835: enable support of 3-wire mode")
-added 3-wire support to the BCM2835 SPI driver by setting the REN bit
-(Read Enable) in the CS register when receiving data.  The REN bit puts
-the transmitter in high-impedance state.  The driver recognizes that
-data is to be received by checking whether the rx_buf of a transfer is
-non-NULL.
-
-Commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers
-meeting certain conditions") subsequently broke 3-wire support because
-it set the SPI_MASTER_MUST_RX flag which causes spi_map_msg() to replace
-rx_buf with a dummy buffer if it is NULL.  As a result, rx_buf is
-*always* non-NULL if DMA is enabled.
-
-Reinstate 3-wire support by not only checking whether rx_buf is non-NULL,
-but also checking that it is not the dummy buffer.
-
-Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions")
-Reported-by: Nuno Sá <nuno.sa@analog.com>
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v4.2+
-Cc: Martin Sperl <kernel@martin.sperl.org>
-Acked-by: Stefan Wahren <wahrenst@gmx.net>
-Link: https://lore.kernel.org/r/328318841455e505370ef8ecad97b646c033dc8a.1562148527.git.lukas@wunner.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm2835.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -554,7 +554,8 @@ static int bcm2835_spi_transfer_one(stru
-       bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
-       /* handle all the 3-wire mode */
--      if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
-+      if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
-+          tfr->rx_buf != ctlr->dummy_rx)
-               cs |= BCM2835_SPI_CS_REN;
-       else
-               cs &= ~BCM2835_SPI_CS_REN;
index badf127fec7a69fd71f0946c44c4b1fb63a14467..f45323247ceecb9ec636b40c76f8938c3d43699b 100644 (file)
@@ -3,5 +3,4 @@ arm64-cpufeature-fix-feature-comparison-for-ctr_el0..patch
 netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch
 netfilter-nfnetlink_acct-validate-nfacct_quota-param.patch-161
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
-spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
 tcp-be-more-careful-in-tcp_fragment.patch
diff --git a/queue-4.4/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch b/queue-4.4/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
deleted file mode 100644 (file)
index 93120c7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d8bef50365847134b51c1ec46786bc2873e4e47 Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Wed, 3 Jul 2019 12:29:31 +0200
-Subject: spi: bcm2835: Fix 3-wire mode if DMA is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Lukas Wunner <lukas@wunner.de>
-
-commit 8d8bef50365847134b51c1ec46786bc2873e4e47 upstream.
-
-Commit 6935224da248 ("spi: bcm2835: enable support of 3-wire mode")
-added 3-wire support to the BCM2835 SPI driver by setting the REN bit
-(Read Enable) in the CS register when receiving data.  The REN bit puts
-the transmitter in high-impedance state.  The driver recognizes that
-data is to be received by checking whether the rx_buf of a transfer is
-non-NULL.
-
-Commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers
-meeting certain conditions") subsequently broke 3-wire support because
-it set the SPI_MASTER_MUST_RX flag which causes spi_map_msg() to replace
-rx_buf with a dummy buffer if it is NULL.  As a result, rx_buf is
-*always* non-NULL if DMA is enabled.
-
-Reinstate 3-wire support by not only checking whether rx_buf is non-NULL,
-but also checking that it is not the dummy buffer.
-
-Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions")
-Reported-by: Nuno Sá <nuno.sa@analog.com>
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v4.2+
-Cc: Martin Sperl <kernel@martin.sperl.org>
-Acked-by: Stefan Wahren <wahrenst@gmx.net>
-Link: https://lore.kernel.org/r/328318841455e505370ef8ecad97b646c033dc8a.1562148527.git.lukas@wunner.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm2835.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -554,7 +554,8 @@ static int bcm2835_spi_transfer_one(stru
-       bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
-       /* handle all the 3-wire mode */
--      if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
-+      if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
-+          tfr->rx_buf != ctlr->dummy_rx)
-               cs |= BCM2835_SPI_CS_REN;
-       else
-               cs &= ~BCM2835_SPI_CS_REN;
index c13aecfa0b10d0ca1db83aeb5cb205521bd05b70..bf3ff0948bb7c937455d15543d29e3edc962c451 100644 (file)
@@ -7,4 +7,3 @@ arm64-cpufeature-fix-feature-comparison-for-ctr_el0..patch
 tcp-be-more-careful-in-tcp_fragment.patch
 hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
-spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
diff --git a/queue-4.9/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch b/queue-4.9/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
deleted file mode 100644 (file)
index 93120c7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d8bef50365847134b51c1ec46786bc2873e4e47 Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Wed, 3 Jul 2019 12:29:31 +0200
-Subject: spi: bcm2835: Fix 3-wire mode if DMA is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Lukas Wunner <lukas@wunner.de>
-
-commit 8d8bef50365847134b51c1ec46786bc2873e4e47 upstream.
-
-Commit 6935224da248 ("spi: bcm2835: enable support of 3-wire mode")
-added 3-wire support to the BCM2835 SPI driver by setting the REN bit
-(Read Enable) in the CS register when receiving data.  The REN bit puts
-the transmitter in high-impedance state.  The driver recognizes that
-data is to be received by checking whether the rx_buf of a transfer is
-non-NULL.
-
-Commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers
-meeting certain conditions") subsequently broke 3-wire support because
-it set the SPI_MASTER_MUST_RX flag which causes spi_map_msg() to replace
-rx_buf with a dummy buffer if it is NULL.  As a result, rx_buf is
-*always* non-NULL if DMA is enabled.
-
-Reinstate 3-wire support by not only checking whether rx_buf is non-NULL,
-but also checking that it is not the dummy buffer.
-
-Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions")
-Reported-by: Nuno Sá <nuno.sa@analog.com>
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v4.2+
-Cc: Martin Sperl <kernel@martin.sperl.org>
-Acked-by: Stefan Wahren <wahrenst@gmx.net>
-Link: https://lore.kernel.org/r/328318841455e505370ef8ecad97b646c033dc8a.1562148527.git.lukas@wunner.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm2835.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -554,7 +554,8 @@ static int bcm2835_spi_transfer_one(stru
-       bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
-       /* handle all the 3-wire mode */
--      if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
-+      if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
-+          tfr->rx_buf != ctlr->dummy_rx)
-               cs |= BCM2835_SPI_CS_REN;
-       else
-               cs &= ~BCM2835_SPI_CS_REN;
index ae7c50730372192878d314016bdefce906a36f6e..20148a1b49c2eaeb2e9be6fdb06a2f6025977b59 100644 (file)
@@ -5,4 +5,3 @@ alsa-usb-audio-sanity-checks-for-each-pipe-and-ep-ty.patch
 alsa-usb-audio-fix-gpf-in-snd_usb_pipe_sanity_check.patch
 hid-wacom-fix-bit-shift-for-cintiq-companion-2.patch
 hid-add-quirk-for-hp-x1200-pixart-oem-mouse.patch
-spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
diff --git a/queue-5.2/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch b/queue-5.2/spi-bcm2835-fix-3-wire-mode-if-dma-is-enabled.patch
deleted file mode 100644 (file)
index 3542e75..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8d8bef50365847134b51c1ec46786bc2873e4e47 Mon Sep 17 00:00:00 2001
-From: Lukas Wunner <lukas@wunner.de>
-Date: Wed, 3 Jul 2019 12:29:31 +0200
-Subject: spi: bcm2835: Fix 3-wire mode if DMA is enabled
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Lukas Wunner <lukas@wunner.de>
-
-commit 8d8bef50365847134b51c1ec46786bc2873e4e47 upstream.
-
-Commit 6935224da248 ("spi: bcm2835: enable support of 3-wire mode")
-added 3-wire support to the BCM2835 SPI driver by setting the REN bit
-(Read Enable) in the CS register when receiving data.  The REN bit puts
-the transmitter in high-impedance state.  The driver recognizes that
-data is to be received by checking whether the rx_buf of a transfer is
-non-NULL.
-
-Commit 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers
-meeting certain conditions") subsequently broke 3-wire support because
-it set the SPI_MASTER_MUST_RX flag which causes spi_map_msg() to replace
-rx_buf with a dummy buffer if it is NULL.  As a result, rx_buf is
-*always* non-NULL if DMA is enabled.
-
-Reinstate 3-wire support by not only checking whether rx_buf is non-NULL,
-but also checking that it is not the dummy buffer.
-
-Fixes: 3ecd37edaa2a ("spi: bcm2835: enable dma modes for transfers meeting certain conditions")
-Reported-by: Nuno Sá <nuno.sa@analog.com>
-Signed-off-by: Lukas Wunner <lukas@wunner.de>
-Cc: stable@vger.kernel.org # v4.2+
-Cc: Martin Sperl <kernel@martin.sperl.org>
-Acked-by: Stefan Wahren <wahrenst@gmx.net>
-Link: https://lore.kernel.org/r/328318841455e505370ef8ecad97b646c033dc8a.1562148527.git.lukas@wunner.de
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/spi/spi-bcm2835.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-bcm2835.c
-+++ b/drivers/spi/spi-bcm2835.c
-@@ -764,7 +764,8 @@ static int bcm2835_spi_transfer_one(stru
-       bcm2835_wr(bs, BCM2835_SPI_CLK, cdiv);
-       /* handle all the 3-wire mode */
--      if ((spi->mode & SPI_3WIRE) && (tfr->rx_buf))
-+      if (spi->mode & SPI_3WIRE && tfr->rx_buf &&
-+          tfr->rx_buf != ctlr->dummy_rx)
-               cs |= BCM2835_SPI_CS_REN;
-       else
-               cs &= ~BCM2835_SPI_CS_REN;