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

Commit 1db123fb authored by Rayagond Kokatanur's avatar Rayagond Kokatanur Committed by David S. Miller
Browse files

stmmac: use predefined macros for HW cap register fields (V4) 



Signed-off-by: default avatarRayagond Kokatanur <rayagond@vayavyalabs.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48febf7e

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

+30 −0
Original line number Original line Diff line number Diff line
@@ -103,6 +103,36 @@ struct stmmac_extra_stats { 




#define SF_DMA_MODE 1 /* DMA STORE-AND-FORWARD Operation Mode */

#define SF_DMA_MODE 1 /* DMA STORE-AND-FORWARD Operation Mode */





/* DAM HW feature register fields */

#define DMA_HW_FEAT_MIISEL	0x00000001 /* 10/100 Mbps Support */

#define DMA_HW_FEAT_GMIISEL	0x00000002 /* 1000 Mbps Support */

#define DMA_HW_FEAT_HDSEL	0x00000004 /* Half-Duplex Support */

#define DMA_HW_FEAT_EXTHASHEN	0x00000008 /* Expanded DA Hash Filter */

#define DMA_HW_FEAT_HASHSEL	0x00000010 /* HASH Filter */

#define DMA_HW_FEAT_ADDMACADRSEL	0x00000020 /* Multiple MAC Addr Reg */

#define DMA_HW_FEAT_PCSSEL	0x00000040 /* PCS registers */

#define DMA_HW_FEAT_L3L4FLTREN	0x00000080 /* Layer 3 & Layer 4 Feature */

#define DMA_HW_FEAT_SMASEL	0x00000100 /* SMA(MDIO) Interface */

#define DMA_HW_FEAT_RWKSEL	0x00000200 /* PMT Remote Wakeup */

#define DMA_HW_FEAT_MGKSEL	0x00000400 /* PMT Magic Packet */

#define DMA_HW_FEAT_MMCSEL	0x00000800 /* RMON Module */

#define DMA_HW_FEAT_TSVER1SEL	0x00001000 /* Only IEEE 1588-2002 Timestamp */

#define DMA_HW_FEAT_TSVER2SEL	0x00002000 /* IEEE 1588-2008 Adv Timestamp */

#define DMA_HW_FEAT_EEESEL	0x00004000 /* Energy Efficient Ethernet */

#define DMA_HW_FEAT_AVSEL	0x00008000 /* AV Feature */

#define DMA_HW_FEAT_TXCOESEL	0x00010000 /* Checksum Offload in Tx */

#define DMA_HW_FEAT_RXTYP1COE	0x00020000 /* IP csum Offload(Type 1) in Rx */

#define DMA_HW_FEAT_RXTYP2COE	0x00040000 /* IP csum Offload(Type 2) in Rx */

#define DMA_HW_FEAT_RXFIFOSIZE	0x00080000 /* Rx FIFO > 2048 Bytes */

#define DMA_HW_FEAT_RXCHCNT	0x00300000 /* No. of additional Rx Channels */

#define DMA_HW_FEAT_TXCHCNT	0x00c00000 /* No. of additional Tx Channels */

#define DMA_HW_FEAT_ENHDESSEL	0x01000000 /* Alternate (Enhanced Descriptor) */

#define DMA_HW_FEAT_INTTSEN	0x02000000 /* Timestamping with Internal

					      System Time */

#define DMA_HW_FEAT_FLEXIPPSEN	0x04000000 /* Flexible PPS Output */

#define DMA_HW_FEAT_SAVLANINS	0x08000000 /* Source Addr or VLAN Insertion */

#define DMA_HW_FEAT_ACTPHYIF	0x70000000 /* Active/selected PHY interface */



enum rx_frame_status { /* IPC status */

enum rx_frame_status { /* IPC status */

	good_frame = 0,

	good_frame = 0,

	discard_frame = 1,

	discard_frame = 1,

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

+33 −21
Original line number Original line Diff line number Diff line
@@ -799,33 +799,45 @@ static int stmmac_get_hw_features(struct stmmac_priv *priv) 
	u32 hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr);

	u32 hw_cap = priv->hw->dma->get_hw_feature(priv->ioaddr);





	if (likely(hw_cap)) {

	if (likely(hw_cap)) {

		priv->dma_cap.mbps_10_100 = (hw_cap & 0x1);

		priv->dma_cap.mbps_10_100 = (hw_cap & DMA_HW_FEAT_MIISEL);

		priv->dma_cap.mbps_1000 = (hw_cap & 0x2) >> 1;

		priv->dma_cap.mbps_1000 = (hw_cap & DMA_HW_FEAT_GMIISEL) >> 1;

		priv->dma_cap.half_duplex = (hw_cap & 0x4) >> 2;

		priv->dma_cap.half_duplex = (hw_cap & DMA_HW_FEAT_HDSEL) >> 2;

		priv->dma_cap.hash_filter = (hw_cap & 0x10) >> 4;

		priv->dma_cap.hash_filter = (hw_cap & DMA_HW_FEAT_HASHSEL) >> 4;

		priv->dma_cap.multi_addr = (hw_cap & 0x20) >> 5;

		priv->dma_cap.multi_addr =

		priv->dma_cap.pcs = (hw_cap & 0x40) >> 6;

			(hw_cap & DMA_HW_FEAT_ADDMACADRSEL) >> 5;

		priv->dma_cap.sma_mdio = (hw_cap & 0x100) >> 8;

		priv->dma_cap.pcs = (hw_cap & DMA_HW_FEAT_PCSSEL) >> 6;

		priv->dma_cap.pmt_remote_wake_up = (hw_cap & 0x200) >> 9;

		priv->dma_cap.sma_mdio = (hw_cap & DMA_HW_FEAT_SMASEL) >> 8;

		priv->dma_cap.pmt_magic_frame = (hw_cap & 0x400) >> 10;

		priv->dma_cap.pmt_remote_wake_up =

		priv->dma_cap.rmon = (hw_cap & 0x800) >> 11; /* MMC */

			(hw_cap & DMA_HW_FEAT_RWKSEL) >> 9;

		priv->dma_cap.pmt_magic_frame =

			(hw_cap & DMA_HW_FEAT_MGKSEL) >> 10;

		/*MMC*/

		priv->dma_cap.rmon = (hw_cap & DMA_HW_FEAT_MMCSEL) >> 11;

		/* IEEE 1588-2002*/

		/* IEEE 1588-2002*/

		priv->dma_cap.time_stamp = (hw_cap & 0x1000) >> 12;

		priv->dma_cap.time_stamp =

			(hw_cap & DMA_HW_FEAT_TSVER1SEL) >> 12;

		/* IEEE 1588-2008*/

		/* IEEE 1588-2008*/

		priv->dma_cap.atime_stamp = (hw_cap & 0x2000) >> 13;

		priv->dma_cap.atime_stamp =

			(hw_cap & DMA_HW_FEAT_TSVER2SEL) >> 13;

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

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

		priv->dma_cap.eee = (hw_cap & 0x4000) >> 14;

		priv->dma_cap.eee = (hw_cap & DMA_HW_FEAT_EEESEL) >> 14;

		priv->dma_cap.av = (hw_cap & 0x8000) >> 15;

		priv->dma_cap.av = (hw_cap & DMA_HW_FEAT_AVSEL) >> 15;

		/* TX and RX csum */

		/* TX and RX csum */

		priv->dma_cap.tx_coe = (hw_cap & 0x10000) >> 16;

		priv->dma_cap.tx_coe = (hw_cap & DMA_HW_FEAT_TXCOESEL) >> 16;

		priv->dma_cap.rx_coe_type1 = (hw_cap & 0x20000) >> 17;

		priv->dma_cap.rx_coe_type1 =

		priv->dma_cap.rx_coe_type2 = (hw_cap & 0x40000) >> 18;

			(hw_cap & DMA_HW_FEAT_RXTYP1COE) >> 17;

		priv->dma_cap.rxfifo_over_2048 = (hw_cap & 0x80000) >> 19;

		priv->dma_cap.rx_coe_type2 =

			(hw_cap & DMA_HW_FEAT_RXTYP2COE) >> 18;

		priv->dma_cap.rxfifo_over_2048 =

			(hw_cap & DMA_HW_FEAT_RXFIFOSIZE) >> 19;

		/* TX and RX number of channels */

		/* TX and RX number of channels */

		priv->dma_cap.number_rx_channel = (hw_cap & 0x300000) >> 20;

		priv->dma_cap.number_rx_channel =

		priv->dma_cap.number_tx_channel = (hw_cap & 0xc00000) >> 22;

			(hw_cap & DMA_HW_FEAT_RXCHCNT) >> 20;

		priv->dma_cap.number_tx_channel =

			(hw_cap & DMA_HW_FEAT_TXCHCNT) >> 22;

		/* Alternate (enhanced) DESC mode*/

		/* Alternate (enhanced) DESC mode*/

		priv->dma_cap.enh_desc = (hw_cap & 0x1000000) >> 24;

		priv->dma_cap.enh_desc =

			(hw_cap & DMA_HW_FEAT_ENHDESSEL) >> 24;





	} else

	} else

		pr_debug("\tNo HW DMA feature register supported");

		pr_debug("\tNo HW DMA feature register supported");