Drop mips-lantiq-do-not-enable-irqs-in-dma-open.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/mips-lantiq-do-not-enable-irqs-in-dma-open.patch b/queue-4.14/mips-lantiq-do-not-enable-irqs-in-dma-open.patch
deleted file mode 100644 (file)
index 826c34d..0000000
--- a/queue-4.14/mips-lantiq-do-not-enable-irqs-in-dma-open.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 78123a79f3c0d96ebc1cd7109bfde80336ff65c2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 9 Sep 2018 22:16:42 +0200
-Subject: MIPS: lantiq: Do not enable IRQs in dma open
-
-From: Hauke Mehrtens <hauke@hauke-m.de>
-
-[ Upstream commit cc973aecf0b0541918c5ecabe6c90d1f709b5f89 ]
-
-When a DMA channel is opened the IRQ should not get activated
-automatically, this allows it to pull data out manually without the help
-of interrupts. This is needed for a workaround in the vrx200 Ethernet
-driver.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Acked-by: Paul Burton <paul.burton@mips.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/lantiq/xway/dma.c        | 1 -
- drivers/net/ethernet/lantiq_etop.c | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
-index 805b3a6ab2d60..dcc16d8de8c37 100644
---- a/arch/mips/lantiq/xway/dma.c
-+++ b/arch/mips/lantiq/xway/dma.c
-@@ -106,7 +106,6 @@ ltq_dma_open(struct ltq_dma_channel *ch)
-       spin_lock_irqsave(&ltq_dma_lock, flag);
-       ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-       ltq_dma_w32_mask(0, DMA_CHAN_ON, LTQ_DMA_CCTRL);
--      ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
-       spin_unlock_irqrestore(&ltq_dma_lock, flag);
- }
- EXPORT_SYMBOL_GPL(ltq_dma_open);
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index afc8100694405..c978a857a25c2 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -438,6 +438,7 @@ ltq_etop_open(struct net_device *dev)
-               if (!IS_TX(i) && (!IS_RX(i)))
-                       continue;
-               ltq_dma_open(&ch->dma);
-+              ltq_dma_enable_irq(&ch->dma);
-               napi_enable(&ch->napi);
-       }
-       phy_start(dev->phydev);
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 4b01f173d94455fc8c131100557cb09b9f79fcce..48f7d94d6003dd72ddcf4e78ccb1bf5d50043beb 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -109,7 +109,6 @@ media-dvb-fix-compat-ioctl-translation.patch
 arm64-dts-meson-libretech-update-board-model.patch
 alsa-intel8x0m-register-irq-handler-after-register-i.patch
 pinctrl-at91-pio4-fix-has_config-check-in-atmel_pctl.patch
-mips-lantiq-do-not-enable-irqs-in-dma-open.patch
 llc-avoid-blocking-in-llc_sap_close.patch
 arm-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch
 soc-qcom-wcnss_ctrl-avoid-string-overflow.patch

diff --git a/queue-4.19/mips-lantiq-do-not-enable-irqs-in-dma-open.patch b/queue-4.19/mips-lantiq-do-not-enable-irqs-in-dma-open.patch
deleted file mode 100644 (file)
index 5d9d145..0000000
--- a/queue-4.19/mips-lantiq-do-not-enable-irqs-in-dma-open.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5356ef2a5148d8b92fefc277b727245bf1458bbe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 9 Sep 2018 22:16:42 +0200
-Subject: MIPS: lantiq: Do not enable IRQs in dma open
-
-From: Hauke Mehrtens <hauke@hauke-m.de>
-
-[ Upstream commit cc973aecf0b0541918c5ecabe6c90d1f709b5f89 ]
-
-When a DMA channel is opened the IRQ should not get activated
-automatically, this allows it to pull data out manually without the help
-of interrupts. This is needed for a workaround in the vrx200 Ethernet
-driver.
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-Acked-by: Paul Burton <paul.burton@mips.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/mips/lantiq/xway/dma.c        | 1 -
- drivers/net/ethernet/lantiq_etop.c | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
-index 664f2f7f55c1c..982859f2b2a38 100644
---- a/arch/mips/lantiq/xway/dma.c
-+++ b/arch/mips/lantiq/xway/dma.c
-@@ -106,7 +106,6 @@ ltq_dma_open(struct ltq_dma_channel *ch)
-       spin_lock_irqsave(&ltq_dma_lock, flag);
-       ltq_dma_w32(ch->nr, LTQ_DMA_CS);
-       ltq_dma_w32_mask(0, DMA_CHAN_ON, LTQ_DMA_CCTRL);
--      ltq_dma_w32_mask(0, 1 << ch->nr, LTQ_DMA_IRNEN);
-       spin_unlock_irqrestore(&ltq_dma_lock, flag);
- }
- EXPORT_SYMBOL_GPL(ltq_dma_open);
-diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
-index e08301d833e2e..379db19a303c8 100644
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -439,6 +439,7 @@ ltq_etop_open(struct net_device *dev)
-               if (!IS_TX(i) && (!IS_RX(i)))
-                       continue;
-               ltq_dma_open(&ch->dma);
-+              ltq_dma_enable_irq(&ch->dma);
-               napi_enable(&ch->napi);
-       }
-       phy_start(dev->phydev);
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index ba0f31751c32e4add32103558adf3a5b1c0d3e61..42f4dceb1741347c3de84039950a333aa4f778cf 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -199,7 +199,6 @@ arm64-dts-renesas-r8a77965-attach-the-sys-dmac-to-th.patch
 arm64-dts-renesas-r8a77965-fix-hs-usb-compatible.patch
 arm64-dts-renesas-r8a77965-fix-clock-reset-for-usb2_.patch
 pinctrl-at91-pio4-fix-has_config-check-in-atmel_pctl.patch
-mips-lantiq-do-not-enable-irqs-in-dma-open.patch
 llc-avoid-blocking-in-llc_sap_close.patch
 arm-dts-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch
 soc-qcom-geni-don-t-ignore-clk_round_rate-errors-in-.patch