Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f513ecd authored by Joao Pinto's avatar Joao Pinto Committed by David S. Miller
Browse files

net: stmmac: enable/disable dma irq prepared for multiple queues 



This patch prepares the DMA IRQ enable/disable process for multiple queues.

Signed-off-by: default avatarJoao Pinto <jpinto@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6deee222

drivers/net/ethernet/stmicro/stmmac/common.h

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ struct stmmac_dma_ops { 
	void (*dma_diagnostic_fr) (void *data, struct stmmac_extra_stats *x,

				   void __iomem *ioaddr);

	void (*enable_dma_transmission) (void __iomem *ioaddr);

	void (*enable_dma_irq) (void __iomem *ioaddr);

	void (*disable_dma_irq) (void __iomem *ioaddr);

	void (*enable_dma_irq)(void __iomem *ioaddr, u32 chan);

	void (*disable_dma_irq)(void __iomem *ioaddr, u32 chan);

	void (*start_tx) (void __iomem *ioaddr);

	void (*stop_tx) (void __iomem *ioaddr);

	void (*start_rx) (void __iomem *ioaddr);

drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h

+3 −3
Original line number Diff line number Diff line
@@ -185,9 +185,9 @@ 


int dwmac4_dma_reset(void __iomem *ioaddr);

void dwmac4_enable_dma_transmission(void __iomem *ioaddr, u32 tail_ptr);

void dwmac4_enable_dma_irq(void __iomem *ioaddr);

void dwmac410_enable_dma_irq(void __iomem *ioaddr);

void dwmac4_disable_dma_irq(void __iomem *ioaddr);

void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan);

void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan);

void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan);

void dwmac4_dma_start_tx(void __iomem *ioaddr);

void dwmac4_dma_stop_tx(void __iomem *ioaddr);

void dwmac4_dma_start_rx(void __iomem *ioaddr);

drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c

+6 −6
Original line number Diff line number Diff line
@@ -104,21 +104,21 @@ void dwmac4_set_rx_ring_len(void __iomem *ioaddr, u32 len) 
	writel(len, ioaddr + DMA_CHAN_RX_RING_LEN(STMMAC_CHAN0));

}



void dwmac4_enable_dma_irq(void __iomem *ioaddr)

void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan)

{

	writel(DMA_CHAN_INTR_DEFAULT_MASK, ioaddr +

	       DMA_CHAN_INTR_ENA(STMMAC_CHAN0));

	       DMA_CHAN_INTR_ENA(chan));

}



void dwmac410_enable_dma_irq(void __iomem *ioaddr)

void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan)

{

	writel(DMA_CHAN_INTR_DEFAULT_MASK_4_10,

	       ioaddr + DMA_CHAN_INTR_ENA(STMMAC_CHAN0));

	       ioaddr + DMA_CHAN_INTR_ENA(chan));

}



void dwmac4_disable_dma_irq(void __iomem *ioaddr)

void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan)

{

	writel(0, ioaddr + DMA_CHAN_INTR_ENA(STMMAC_CHAN0));

	writel(0, ioaddr + DMA_CHAN_INTR_ENA(chan));

}



int dwmac4_dma_interrupt(void __iomem *ioaddr,

drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h

+2 −2
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ 
#define DMA_CONTROL_FTF		0x00100000	/* Flush transmit FIFO */



void dwmac_enable_dma_transmission(void __iomem *ioaddr);

void dwmac_enable_dma_irq(void __iomem *ioaddr);

void dwmac_disable_dma_irq(void __iomem *ioaddr);

void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan);

void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan);

void dwmac_dma_start_tx(void __iomem *ioaddr);

void dwmac_dma_stop_tx(void __iomem *ioaddr);

void dwmac_dma_start_rx(void __iomem *ioaddr);

drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c

+2 −2
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@ void dwmac_enable_dma_transmission(void __iomem *ioaddr) 
	writel(1, ioaddr + DMA_XMT_POLL_DEMAND);

}



void dwmac_enable_dma_irq(void __iomem *ioaddr)

void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan)

{

	writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);

}



void dwmac_disable_dma_irq(void __iomem *ioaddr)

void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan)

{

	writel(0, ioaddr + DMA_INTR_ENA);

}