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

Merge branch 'stmmac-eam' 



Thierry Reding says:

====================
net: stmmac: Enhanced addressing mode for DWMAC 4.10

The DWMAC 4.10 supports the same enhanced addressing mode as later
generations. Parse this capability from the hardware feature registers
and set the EAME (Enhanced Addressing Mode Enable) bit when necessary.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 151ea094 560c07cb

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

+1 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ enum power_event { 
#define GMAC_HW_HASH_TB_SZ		GENMASK(25, 24)

#define GMAC_HW_FEAT_AVSEL		BIT(20)

#define GMAC_HW_TSOEN			BIT(18)

#define GMAC_HW_ADDR64			GENMASK(15, 14)

#define GMAC_HW_TXFIFOSIZE		GENMASK(10, 6)

#define GMAC_HW_RXFIFOSIZE		GENMASK(4, 0)

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

+2 −2
Original line number Diff line number Diff line
@@ -431,8 +431,8 @@ static void dwmac4_get_addr(struct dma_desc *p, unsigned int *addr) 


static void dwmac4_set_addr(struct dma_desc *p, dma_addr_t addr)

{

	p->des0 = cpu_to_le32(addr);

	p->des1 = 0;

	p->des0 = cpu_to_le32(lower_32_bits(addr));

	p->des1 = cpu_to_le32(upper_32_bits(addr));

}



static void dwmac4_clear(struct dma_desc *p)

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

+28 −0
Original line number Diff line number Diff line
@@ -79,6 +79,10 @@ static void dwmac4_dma_init_rx_chan(void __iomem *ioaddr, 
	value = value | (rxpbl << DMA_BUS_MODE_RPBL_SHIFT);

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



	if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) && likely(dma_cfg->eame))

		writel(upper_32_bits(dma_rx_phy),

		       ioaddr + DMA_CHAN_RX_BASE_ADDR_HI(chan));



	writel(lower_32_bits(dma_rx_phy), ioaddr + DMA_CHAN_RX_BASE_ADDR(chan));

}
@@ -97,6 +101,10 @@ static void dwmac4_dma_init_tx_chan(void __iomem *ioaddr, 


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



	if (IS_ENABLED(CONFIG_ARCH_DMA_ADDR_T_64BIT) && likely(dma_cfg->eame))

		writel(upper_32_bits(dma_tx_phy),

		       ioaddr + DMA_CHAN_TX_BASE_ADDR_HI(chan));



	writel(lower_32_bits(dma_tx_phy), ioaddr + DMA_CHAN_TX_BASE_ADDR(chan));

}
@@ -132,6 +140,9 @@ static void dwmac4_dma_init(void __iomem *ioaddr, 
	if (dma_cfg->aal)

		value |= DMA_SYS_BUS_AAL;



	if (dma_cfg->eame)

		value |= DMA_SYS_BUS_EAME;



	writel(value, ioaddr + DMA_SYS_BUS_MODE);

}
@@ -356,6 +367,23 @@ static void dwmac4_get_hw_feature(void __iomem *ioaddr, 
	dma_cap->hash_tb_sz = (hw_cap & GMAC_HW_HASH_TB_SZ) >> 24;

	dma_cap->av = (hw_cap & GMAC_HW_FEAT_AVSEL) >> 20;

	dma_cap->tsoen = (hw_cap & GMAC_HW_TSOEN) >> 18;



	dma_cap->addr64 = (hw_cap & GMAC_HW_ADDR64) >> 14;

	switch (dma_cap->addr64) {

	case 0:

		dma_cap->addr64 = 32;

		break;

	case 1:

		dma_cap->addr64 = 40;

		break;

	case 2:

		dma_cap->addr64 = 48;

		break;

	default:

		dma_cap->addr64 = 32;

		break;

	}



	/* RX and TX FIFO sizes are encoded as log2(n / 128). Undo that by

	 * shifting and store the sizes in bytes.

	 */

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

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
#define DMA_SYS_BUS_MB			BIT(14)

#define DMA_AXI_1KBBE			BIT(13)

#define DMA_SYS_BUS_AAL			BIT(12)

#define DMA_SYS_BUS_EAME		BIT(11)

#define DMA_AXI_BLEN256			BIT(7)

#define DMA_AXI_BLEN128			BIT(6)

#define DMA_AXI_BLEN64			BIT(5)
@@ -91,7 +92,9 @@ 
#define DMA_CHAN_CONTROL(x)		DMA_CHANX_BASE_ADDR(x)

#define DMA_CHAN_TX_CONTROL(x)		(DMA_CHANX_BASE_ADDR(x) + 0x4)

#define DMA_CHAN_RX_CONTROL(x)		(DMA_CHANX_BASE_ADDR(x) + 0x8)

#define DMA_CHAN_TX_BASE_ADDR_HI(x)	(DMA_CHANX_BASE_ADDR(x) + 0x10)

#define DMA_CHAN_TX_BASE_ADDR(x)	(DMA_CHANX_BASE_ADDR(x) + 0x14)

#define DMA_CHAN_RX_BASE_ADDR_HI(x)	(DMA_CHANX_BASE_ADDR(x) + 0x18)

#define DMA_CHAN_RX_BASE_ADDR(x)	(DMA_CHANX_BASE_ADDR(x) + 0x1c)

#define DMA_CHAN_TX_END_ADDR(x)		(DMA_CHANX_BASE_ADDR(x) + 0x20)

#define DMA_CHAN_RX_END_ADDR(x)		(DMA_CHANX_BASE_ADDR(x) + 0x28)

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

+4 −1
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr, 
	if (dma_cfg->aal)

		value |= XGMAC_AAL;



	writel(value | XGMAC_EAME, ioaddr + XGMAC_DMA_SYSBUS_MODE);

	if (dma_cfg->eame)

		value |= XGMAC_EAME;



	writel(value, ioaddr + XGMAC_DMA_SYSBUS_MODE);

}



static void dwxgmac2_dma_init_chan(void __iomem *ioaddr,

CRA Git | Maintained and supported by SUSTech CRA and CCSE