4.14-stable patches

added patches:
	spi-mediatek-fix-fifo-transfer.patch

diff --git a/queue-4.14/revert-spi-mediatek-fix-fifo-rx-mode.patch b/queue-4.14/revert-spi-mediatek-fix-fifo-rx-mode.patch
deleted file mode 100644 (file)
index 0d231fd..0000000
--- a/queue-4.14/revert-spi-mediatek-fix-fifo-rx-mode.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 568f12594bc88a1b8f9e697c9bf6a3a5b6b6d134 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Thu, 5 Aug 2021 20:53:50 +0200
-Subject: Revert "spi: mediatek: fix fifo rx mode"
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-This reverts commit 5391ab22bead617d00346d86109e19c7a7288b29 which is
-commit 3a70dd2d050331ee4cf5ad9d5c0a32d83ead9a43 upstream.
-
-It has been found to have problems.
-
-Reported-by: Guenter Roeck <linux@roeck-us.net>
-Cc: Peter Hess <peter.hess@ph-home.de>
-Cc: Frank Wunderlich <frank-w@public-files.de>
-Cc: Mark Brown <broonie@kernel.org>
-Cc: Sasha Levin <sashal@kernel.org>
-Link: https://lore.kernel.org/r/efee3a58-a4d2-af22-0931-e81b877ab539@roeck-us.net
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/spi/spi-mt65xx.c |   16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
-
---- a/drivers/spi/spi-mt65xx.c
-+++ b/drivers/spi/spi-mt65xx.c
-@@ -392,23 +392,13 @@ static int mtk_spi_fifo_transfer(struct
-       mtk_spi_setup_packet(master);
- 
-       cnt = xfer->len / 4;
--      if (xfer->tx_buf)
--              iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
--
--      if (xfer->rx_buf)
--              ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
-+      iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
- 
-       remainder = xfer->len % 4;
-       if (remainder > 0) {
-               reg_val = 0;
--              if (xfer->tx_buf) {
--                      memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
--                      writel(reg_val, mdata->base + SPI_TX_DATA_REG);
--              }
--              if (xfer->rx_buf) {
--                      reg_val = readl(mdata->base + SPI_RX_DATA_REG);
--                      memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
--              }
-+              memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
-+              writel(reg_val, mdata->base + SPI_TX_DATA_REG);
-       }
- 
-       mtk_spi_enable_transfer(master);

diff --git a/queue-4.14/series b/queue-4.14/series
index 031412ba2ddb2f44e1e7b5e5a3f566cbfacecf0a..6bc42b8ac2f1f753f8947390222be43f82d55883 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -3,9 +3,9 @@ regulator-rt5033-fix-n_voltages-settings-for-buck-an.patch
 r8152-fix-potential-pm-refcount-imbalance.patch
 qed-fix-possible-unpaired-spin_-un-lock_bh-in-_qed_m.patch
 net-fix-zero-copy-head-len-calculation.patch
-revert-spi-mediatek-fix-fifo-rx-mode.patch
 revert-bluetooth-shutdown-controller-after-workqueues-are-flushed-or-cancelled.patch
 kvm-do-not-assume-pte-is-writable-after-follow_pfn.patch
 kvm-do-not-allow-mapping-valid-but-non-reference-counted-pages.patch
 kvm-use-kvm_pfn_t-for-local-pfn-variable-in-hva_to_pfn_remapped.patch
 revert-watchdog-itco_wdt-account-for-rebooting-on-second-timeout.patch
+spi-mediatek-fix-fifo-transfer.patch

diff --git a/queue-4.14/spi-mediatek-fix-fifo-transfer.patch b/queue-4.14/spi-mediatek-fix-fifo-transfer.patch
new file mode 100644 (file)
index 0000000..ef41827
--- /dev/null
+++ b/queue-4.14/spi-mediatek-fix-fifo-transfer.patch
@@ -0,0 +1,68 @@
+From 0d5c3954b35eddff0da0436c31e8d721eceb7dc2 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <linux@roeck-us.net>
+Date: Sun, 1 Aug 2021 20:00:23 -0700
+Subject: spi: mediatek: Fix fifo transfer
+
+From: Guenter Roeck <linux@roeck-us.net>
+
+commit 0d5c3954b35eddff0da0436c31e8d721eceb7dc2 upstream.
+
+Commit 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode") claims that
+fifo RX mode was never handled, and adds the presumably missing code
+to the FIFO transfer function. However, the claim that receive data
+was not handled is incorrect. It was handled as part of interrupt
+handling after the transfer was complete. The code added with the above
+mentioned commit reads data from the receive FIFO before the transfer
+is started, which is wrong. This results in an actual transfer error
+on a Hayato Chromebook.
+
+Remove the code trying to handle receive data before the transfer is
+started to fix the problem.
+
+Fixes: 3a70dd2d0503 ("spi: mediatek: fix fifo rx mode")
+Cc: Peter Hess <peter.hess@ph-home.de>
+Cc: Frank Wunderlich <frank-w@public-files.de>
+Cc: Tzung-Bi Shih <tzungbi@google.com>
+Cc: Hsin-Yi Wang <hsinyi@google.com>
+Signed-off-by: Guenter Roeck <linux@roeck-us.net>
+Tested-by: Hsin-Yi Wang <hsinyi@google.com>
+Tested-by: Tzung-Bi Shih <tzungbi@google.com>
+Link: https://lore.kernel.org/r/20210802030023.1748777-1-linux@roeck-us.net
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-mt65xx.c |   19 +++++--------------
+ 1 file changed, 5 insertions(+), 14 deletions(-)
+
+--- a/drivers/spi/spi-mt65xx.c
++++ b/drivers/spi/spi-mt65xx.c
+@@ -391,24 +391,15 @@ static int mtk_spi_fifo_transfer(struct
+       mtk_spi_prepare_transfer(master, xfer);
+       mtk_spi_setup_packet(master);
+ 
+-      cnt = xfer->len / 4;
+-      if (xfer->tx_buf)
++      if (xfer->tx_buf) {
++              cnt = xfer->len / 4;
+               iowrite32_rep(mdata->base + SPI_TX_DATA_REG, xfer->tx_buf, cnt);
+-
+-      if (xfer->rx_buf)
+-              ioread32_rep(mdata->base + SPI_RX_DATA_REG, xfer->rx_buf, cnt);
+-
+-      remainder = xfer->len % 4;
+-      if (remainder > 0) {
+-              reg_val = 0;
+-              if (xfer->tx_buf) {
++              remainder = xfer->len % 4;
++              if (remainder > 0) {
++                      reg_val = 0;
+                       memcpy(&reg_val, xfer->tx_buf + (cnt * 4), remainder);
+                       writel(reg_val, mdata->base + SPI_TX_DATA_REG);
+               }
+-              if (xfer->rx_buf) {
+-                      reg_val = readl(mdata->base + SPI_RX_DATA_REG);
+-                      memcpy(xfer->rx_buf + (cnt * 4), &reg_val, remainder);
+-              }
+       }
+ 
+       mtk_spi_enable_transfer(master);