drop queue-5.10/dmaengine-ti-k3-udma-reset-udma_chan_rt-byte-counter.patch

broke the build

diff --git a/queue-5.10/dmaengine-ti-k3-udma-reset-udma_chan_rt-byte-counter.patch b/queue-5.10/dmaengine-ti-k3-udma-reset-udma_chan_rt-byte-counter.patch
deleted file mode 100644 (file)
index 616e381..0000000
--- a/queue-5.10/dmaengine-ti-k3-udma-reset-udma_chan_rt-byte-counter.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 0a90e68477f43bcea708c72752991f85ea71c229 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 2 Aug 2022 11:18:35 +0530
-Subject: dmaengine: ti: k3-udma: Reset UDMA_CHAN_RT byte counters to prevent
- overflow
-
-From: Vaishnav Achath <vaishnav.a@ti.com>
-
-[ Upstream commit 7c94dcfa8fcff2dba53915f1dabfee49a3df8b88 ]
-
-UDMA_CHAN_RT_*BCNT_REG stores the real-time channel bytecount statistics.
-These registers are 32-bit hardware counters and the driver uses these
-counters to monitor the operational progress status for a channel, when
-transferring more than 4GB of data it was observed that these counters
-overflow and completion calculation of a operation gets affected and the
-transfer hangs indefinitely.
-
-This commit adds changes to decrease the byte count for every complete
-transaction so that these registers never overflow and the proper byte
-count statistics is maintained for ongoing transaction by the RT counters.
-
-Earlier uc->bcnt used to maintain a count of the completed bytes at driver
-side, since the RT counters maintain the statistics of current transaction
-now, the maintenance of uc->bcnt is not necessary.
-
-Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
-Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
-Link: https://lore.kernel.org/r/20220802054835.19482-1-vaishnav.a@ti.com
-Signed-off-by: Vinod Koul <vkoul@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/dma/ti/k3-udma.c | 25 +++++++++++++++++--------
- 1 file changed, 17 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
-index d3902784cae2..eacc4377e4a0 100644
---- a/drivers/dma/ti/k3-udma.c
-+++ b/drivers/dma/ti/k3-udma.c
-@@ -235,8 +235,6 @@ struct udma_chan {
- 
-       struct udma_tx_drain tx_drain;
- 
--      u32 bcnt; /* number of bytes completed since the start of the channel */
--
-       /* Channel configuration parameters */
-       struct udma_chan_config config;
- 
-@@ -656,6 +654,20 @@ static void udma_reset_rings(struct udma_chan *uc)
-       }
- }
- 
-+static void udma_decrement_byte_counters(struct udma_chan *uc, u32 val)
-+{
-+      if (uc->desc->dir == DMA_DEV_TO_MEM) {
-+              udma_rchanrt_write(uc, UDMA_CHAN_RT_BCNT_REG, val);
-+              udma_rchanrt_write(uc, UDMA_CHAN_RT_SBCNT_REG, val);
-+              udma_rchanrt_write(uc, UDMA_CHAN_RT_PEER_BCNT_REG, val);
-+      } else {
-+              udma_tchanrt_write(uc, UDMA_CHAN_RT_BCNT_REG, val);
-+              udma_tchanrt_write(uc, UDMA_CHAN_RT_SBCNT_REG, val);
-+              if (!uc->bchan)
-+                      udma_tchanrt_write(uc, UDMA_CHAN_RT_PEER_BCNT_REG, val);
-+      }
-+}
-+
- static void udma_reset_counters(struct udma_chan *uc)
- {
-       u32 val;
-@@ -687,8 +699,6 @@ static void udma_reset_counters(struct udma_chan *uc)
-               val = udma_rchanrt_read(uc, UDMA_CHAN_RT_PEER_BCNT_REG);
-               udma_rchanrt_write(uc, UDMA_CHAN_RT_PEER_BCNT_REG, val);
-       }
--
--      uc->bcnt = 0;
- }
- 
- static int udma_reset_chan(struct udma_chan *uc, bool hard)
-@@ -1006,7 +1016,7 @@ static void udma_check_tx_completion(struct work_struct *work)
-               if (uc->desc) {
-                       struct udma_desc *d = uc->desc;
- 
--                      uc->bcnt += d->residue;
-+                      udma_decrement_byte_counters(uc, d->residue);
-                       udma_start(uc);
-                       vchan_cookie_complete(&d->vd);
-                       break;
-@@ -1060,7 +1070,7 @@ static irqreturn_t udma_ring_irq_handler(int irq, void *data)
-                               vchan_cyclic_callback(&d->vd);
-                       } else {
-                               if (udma_is_desc_really_done(uc, d)) {
--                                      uc->bcnt += d->residue;
-+                                      udma_decrement_byte_counters(uc, d->residue);
-                                       udma_start(uc);
-                                       vchan_cookie_complete(&d->vd);
-                               } else {
-@@ -1097,7 +1107,7 @@ static irqreturn_t udma_udma_irq_handler(int irq, void *data)
-                       vchan_cyclic_callback(&d->vd);
-               } else {
-                       /* TODO: figure out the real amount of data */
--                      uc->bcnt += d->residue;
-+                      udma_decrement_byte_counters(uc, d->residue);
-                       udma_start(uc);
-                       vchan_cookie_complete(&d->vd);
-               }
-@@ -2741,7 +2751,6 @@ static enum dma_status udma_tx_status(struct dma_chan *chan,
-                       bcnt = udma_tchanrt_read(uc, UDMA_CHAN_RT_BCNT_REG);
-               }
- 
--              bcnt -= uc->bcnt;
-               if (bcnt && !(bcnt % uc->desc->residue))
-                       residue = 0;
-               else
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 1622defecf0c5be6701dc330b3e87c3cfc9b0653..3bc14e1573c3fe9c37141b5a0969292e5c146f58 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -408,7 +408,6 @@ media-cx88-fix-a-null-ptr-deref-bug-in-buffer_prepar.patch
 clk-zynqmp-pll-rectify-rate-rounding-in-zynqmp_pll_r.patch
 usb-host-xhci-plat-suspend-and-resume-clocks.patch
 usb-host-xhci-plat-suspend-resume-clks-for-brcm.patch
-dmaengine-ti-k3-udma-reset-udma_chan_rt-byte-counter.patch
 scsi-3w-9xxx-avoid-disabling-device-if-failing-to-en.patch
 nbd-fix-hung-when-signal-interrupts-nbd_start_device.patch
 power-supply-adp5061-fix-out-of-bounds-read-in-adp50.patch