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

Commit e7434821 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: add HW DMA feature register (v3) 



New GMAC chips have an extra register to indicate
the presence of the optional features/functions of
the DMA core.

This patch adds this support and all the HW cap
are exported via debugfs.

Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0b9d786

drivers/net/ethernet/stmicro/stmmac/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ config STMMAC_DEBUG_FS 
	default n

	depends on STMMAC_ETH && DEBUG_FS

	-- help

	  The stmmac entry in /sys reports DMA TX/RX rings.

	  The stmmac entry in /sys reports DMA TX/RX rings

	  or (if supported) the HW cap register.



config STMMAC_DA

	bool "STMMAC DMA arbitration scheme"

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

+33 −0
Original line number Diff line number Diff line
@@ -116,6 +116,37 @@ enum tx_dma_irq_status { 
	handle_tx_rx = 3,

};



/* DMA HW capabilities */

struct dma_features {

	unsigned int mbps_10_100;

	unsigned int mbps_1000;

	unsigned int half_duplex;

	unsigned int hash_filter;

	unsigned int multi_addr;

	unsigned int pcs;

	unsigned int sma_mdio;

	unsigned int pmt_remote_wake_up;

	unsigned int pmt_magic_frame;

	unsigned int rmon;

	/* IEEE 1588-2002*/

	unsigned int time_stamp;

	/* IEEE 1588-2008*/

	unsigned int atime_stamp;

	/* 802.3az - Energy-Efficient Ethernet (EEE) */

	unsigned int eee;

	unsigned int av;

	/* TX and RX csum */

	unsigned int tx_coe;

	unsigned int rx_coe_type1;

	unsigned int rx_coe_type2;

	unsigned int rxfifo_over_2048;

	/* TX and RX number of channels */

	unsigned int number_rx_channel;

	unsigned int number_tx_channel;

	/* Alternate (enhanced) DESC mode*/

	unsigned int enh_desc;

};



/* GMAC TX FIFO is 8K, Rx FIFO is 16K */

#define BUF_SIZE_16KiB 16384

#define BUF_SIZE_8KiB 8192
@@ -188,6 +219,8 @@ struct stmmac_dma_ops { 
	void (*stop_rx) (void __iomem *ioaddr);

	int (*dma_interrupt) (void __iomem *ioaddr,

			      struct stmmac_extra_stats *x);

	/* If supported then get the optional core features */

	unsigned int (*get_hw_feature) (void __iomem *ioaddr);

};



struct stmmac_ops {

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

+6 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ static void dwmac1000_dump_dma_regs(void __iomem *ioaddr) 
	}

}



static unsigned int dwmac1000_get_hw_feature(void __iomem *ioaddr)

{

	return readl(ioaddr + DMA_HW_FEATURE);

}



const struct stmmac_dma_ops dwmac1000_dma_ops = {

	.init = dwmac1000_dma_init,

	.dump_regs = dwmac1000_dump_dma_regs,
@@ -144,4 +149,5 @@ const struct stmmac_dma_ops dwmac1000_dma_ops = { 
	.start_rx = dwmac_dma_start_rx,

	.stop_rx = dwmac_dma_stop_rx,

	.dma_interrupt = dwmac_dma_interrupt,

	.get_hw_feature = dwmac1000_get_hw_feature,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define DMA_MISSED_FRAME_CTR	0x00001020	/* Missed Frame Counter */

#define DMA_CUR_TX_BUF_ADDR	0x00001050	/* Current Host Tx Buffer */

#define DMA_CUR_RX_BUF_ADDR	0x00001054	/* Current Host Rx Buffer */

#define DMA_HW_FEATURE		0x00001058	/* HW Feature Register */



/* DMA Control register defines */

#define DMA_CONTROL_ST		0x00002000	/* Start/Stop Transmission */

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

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ struct stmmac_priv { 
#endif

	struct plat_stmmacenet_data *plat;

	struct stmmac_counters mmc;

	struct dma_features dma_cap;

};



extern int stmmac_mdio_unregister(struct net_device *ndev);