MIPS: lantiq: Do not enable IRQs in dma open

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>

diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c
index 664f2f7f55c1c06f34e58a551fa917a27f1f9dff..982859f2b2a388684236704a41bb7bc52878b9db 100644 (file)
--- 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 5a7af52d9debaf72ec2eb687c2472db9f340f927..32ac9045cdaeb43e7c13ba1b5be7d4542f81548e 100644 (file)
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -432,6 +432,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);