Commit 6dbb2e91 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-next' 



Jose Abreu says:

====================
net: stmmac: Improvements for -next

Misc improvements for stmmac.

1) Adds more information regarding HW Caps in the DebugFS file.

2) Allows interrupts to be independently enabled or disabled so that we don't
have to schedule both TX and RX NAPIs.

3) Stops using a magic number in coalesce timer re-arm.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f256578 3755b21b

drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c

+20 −4
Original line number Diff line number Diff line
@@ -335,14 +335,30 @@ static void sun8i_dwmac_dump_mac_regs(struct mac_device_info *hw, 
	}

}



static void sun8i_dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan)

static void sun8i_dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan,

				       bool rx, bool tx)

{

	writel(EMAC_RX_INT | EMAC_TX_INT, ioaddr + EMAC_INT_EN);

	u32 value = readl(ioaddr + EMAC_INT_EN);



	if (rx)

		value |= EMAC_RX_INT;

	if (tx)

		value |= EMAC_TX_INT;



	writel(value, ioaddr + EMAC_INT_EN);

}



static void sun8i_dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan)

static void sun8i_dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan,

					bool rx, bool tx)

{

	writel(0, ioaddr + EMAC_INT_EN);

	u32 value = readl(ioaddr + EMAC_INT_EN);



	if (rx)

		value &= ~EMAC_RX_INT;

	if (tx)

		value &= ~EMAC_TX_INT;



	writel(value, ioaddr + EMAC_INT_EN);

}



static void sun8i_dwmac_dma_start_tx(void __iomem *ioaddr, u32 chan)

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

+8 −3
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ 
/* DMA default interrupt mask for 4.00 */

#define DMA_CHAN_INTR_DEFAULT_MASK	(DMA_CHAN_INTR_NORMAL | \

					 DMA_CHAN_INTR_ABNORMAL)

#define DMA_CHAN_INTR_DEFAULT_RX	(DMA_CHAN_INTR_ENA_RIE)

#define DMA_CHAN_INTR_DEFAULT_TX	(DMA_CHAN_INTR_ENA_TIE)



#define DMA_CHAN_INTR_NORMAL_4_10	(DMA_CHAN_INTR_ENA_NIE_4_10 | \

					 DMA_CHAN_INTR_ENA_RIE | \
@@ -178,6 +180,8 @@ 
/* DMA default interrupt mask for 4.10a */

#define DMA_CHAN_INTR_DEFAULT_MASK_4_10	(DMA_CHAN_INTR_NORMAL_4_10 | \

					 DMA_CHAN_INTR_ABNORMAL_4_10)

#define DMA_CHAN_INTR_DEFAULT_RX_4_10	(DMA_CHAN_INTR_ENA_RIE)

#define DMA_CHAN_INTR_DEFAULT_TX_4_10	(DMA_CHAN_INTR_ENA_TIE)



/* channel 0 specific fields */

#define DMA_CHAN0_DBG_STAT_TPS		GENMASK(15, 12)
@@ -186,9 +190,10 @@ 
#define DMA_CHAN0_DBG_STAT_RPS_SHIFT	8



int dwmac4_dma_reset(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_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

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

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

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

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

+39 −8
Original line number Diff line number Diff line
@@ -97,21 +97,52 @@ void dwmac4_set_rx_ring_len(void __iomem *ioaddr, u32 len, u32 chan) 
	writel(len, ioaddr + DMA_CHAN_RX_RING_LEN(chan));

}



void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan)

void dwmac4_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

	writel(DMA_CHAN_INTR_DEFAULT_MASK, ioaddr +

	       DMA_CHAN_INTR_ENA(chan));

	u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan));



	if (rx)

		value |= DMA_CHAN_INTR_DEFAULT_RX;

	if (tx)

		value |= DMA_CHAN_INTR_DEFAULT_TX;



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

}



void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan)

void dwmac410_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

	writel(DMA_CHAN_INTR_DEFAULT_MASK_4_10,

	       ioaddr + DMA_CHAN_INTR_ENA(chan));

	u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan));



	if (rx)

		value |= DMA_CHAN_INTR_DEFAULT_RX_4_10;

	if (tx)

		value |= DMA_CHAN_INTR_DEFAULT_TX_4_10;



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

}



void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan)

void dwmac4_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

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

	u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan));



	if (rx)

		value &= ~DMA_CHAN_INTR_DEFAULT_RX;

	if (tx)

		value &= ~DMA_CHAN_INTR_DEFAULT_TX;



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

}



void dwmac410_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

	u32 value = readl(ioaddr + DMA_CHAN_INTR_ENA(chan));



	if (rx)

		value &= ~DMA_CHAN_INTR_DEFAULT_RX_4_10;

	if (tx)

		value &= ~DMA_CHAN_INTR_DEFAULT_TX_4_10;



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

}



int dwmac4_dma_interrupt(void __iomem *ioaddr,

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

+4 −2
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 


/* DMA default interrupt mask */

#define DMA_INTR_DEFAULT_MASK	(DMA_INTR_NORMAL | DMA_INTR_ABNORMAL)

#define DMA_INTR_DEFAULT_RX	(DMA_INTR_ENA_RIE)

#define DMA_INTR_DEFAULT_TX	(DMA_INTR_ENA_TIE)



/* DMA Status register defines */

#define DMA_STATUS_GLPII	0x40000000	/* GMAC LPI interrupt */
@@ -130,8 +132,8 @@ 
#define NUM_DWMAC1000_DMA_REGS	23



void dwmac_enable_dma_transmission(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_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);

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

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

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

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

+18 −4
Original line number Diff line number Diff line
@@ -37,14 +37,28 @@ void dwmac_enable_dma_transmission(void __iomem *ioaddr) 
	writel(1, ioaddr + DMA_XMT_POLL_DEMAND);

}



void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan)

void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

	writel(DMA_INTR_DEFAULT_MASK, ioaddr + DMA_INTR_ENA);

	u32 value = readl(ioaddr + DMA_INTR_ENA);



	if (rx)

		value |= DMA_INTR_DEFAULT_RX;

	if (tx)

		value |= DMA_INTR_DEFAULT_TX;



	writel(value, ioaddr + DMA_INTR_ENA);

}



void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan)

void dwmac_disable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx)

{

	writel(0, ioaddr + DMA_INTR_ENA);

	u32 value = readl(ioaddr + DMA_INTR_ENA);



	if (rx)

		value &= ~DMA_INTR_DEFAULT_RX;

	if (tx)

		value &= ~DMA_INTR_DEFAULT_TX;



	writel(value, ioaddr + DMA_INTR_ENA);

}



void dwmac_dma_start_tx(void __iomem *ioaddr, u32 chan)

CRA Git | Maintained and supported by SUSTech CRA and CCSE