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

Merge branch 'fec-next' 

Troy Kisky says:

====================
net: fec: cleanup/fixes

V2 is a rebase on top of johannes endian-safe patch and
is only the 1st eight patches.
The testing for this series was done on a nitrogen6x.
The base commit was
commit b45efa30
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net



Testing showed no change in performance.
Testing used imx_v6_v7_defconfig + CONFIG_MICREL_PHY.
The processor was running at 996Mhz.
The following commands were used to get the transfer rates.

On an x86 ubunto system,
iperf -s -i.5 -u

On a nitrogen6x board, running via SD Card.
I first stopped some background processes

stop cron
stop upstart-file-bridge
stop upstart-socket-bridge
stop upstart-udev-bridge
stop rsyslog
stop dbus
killall dhclient
echo performance >/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor

taskset 0x2 iperf -c 192.168.0.201 -u -t60 -b500M -r

There is a branch available on github with this series, and the rest of
my fec patches, for those who would like to test it.
https://github.com:boundarydevices/linux-imx6.git branch net-next_master
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7f20cd25 fc75ba51

drivers/net/ethernet/freescale/fec.h

+17 −21
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#define FEC_R_FIFO_RSEM		0x194 /* Receive FIFO section empty threshold */

#define FEC_R_FIFO_RAEM		0x198 /* Receive FIFO almost empty threshold */

#define FEC_R_FIFO_RAFL		0x19c /* Receive FIFO almost full threshold */

#define FEC_FTRL		0x1b0 /* Frame truncation receive length*/

#define FEC_RACC		0x1c4 /* Receive Accelerator function */

#define FEC_RCMR_1		0x1c8 /* Receive classification match ring 1 */

#define FEC_RCMR_2		0x1cc /* Receive classification match ring 2 */
@@ -309,12 +310,6 @@ struct bufdesc_ex { 
#define FEC_R_BUFF_SIZE(X)	(((X) == 1) ? FEC_R_BUFF_SIZE_1 : \

				(((X) == 2) ? \

					FEC_R_BUFF_SIZE_2 : FEC_R_BUFF_SIZE_0))

#define FEC_R_DES_ACTIVE(X)	(((X) == 1) ? FEC_R_DES_ACTIVE_1 : \

				(((X) == 2) ? \

				   FEC_R_DES_ACTIVE_2 : FEC_R_DES_ACTIVE_0))

#define FEC_X_DES_ACTIVE(X)	(((X) == 1) ? FEC_X_DES_ACTIVE_1 : \

				(((X) == 2) ? \

				   FEC_X_DES_ACTIVE_2 : FEC_X_DES_ACTIVE_0))



#define FEC_DMA_CFG(X)		(((X) == 2) ? FEC_DMA_CFG_2 : FEC_DMA_CFG_1)
@@ -380,6 +375,7 @@ struct bufdesc_ex { 
#define FEC_ENET_TS_TIMER       ((uint)0x00008000)



#define FEC_DEFAULT_IMASK (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII | FEC_ENET_TS_TIMER)

#define FEC_NAPI_IMASK	(FEC_ENET_MII | FEC_ENET_TS_TIMER)

#define FEC_RX_DISABLED_IMASK (FEC_DEFAULT_IMASK & (~FEC_ENET_RXF))



/* ENET interrupt coalescing macro define */
@@ -447,33 +443,35 @@ struct bufdesc_ex { 
/* Controller supports RACC register */

#define FEC_QUIRK_HAS_RACC		(1 << 12)



struct bufdesc_prop {

	int qid;

	/* Address of Rx and Tx buffers */

	struct bufdesc	*base;

	struct bufdesc	*last;

	struct bufdesc	*cur;

	void __iomem	*reg_desc_active;

	dma_addr_t	dma;

	unsigned short ring_size;

	unsigned char dsize;

	unsigned char dsize_log2;

};



struct fec_enet_priv_tx_q {

	int index;

	struct bufdesc_prop bd;

	unsigned char *tx_bounce[TX_RING_SIZE];

	struct  sk_buff *tx_skbuff[TX_RING_SIZE];



	dma_addr_t	bd_dma;

	struct bufdesc	*tx_bd_base;

	uint tx_ring_size;



	unsigned short tx_stop_threshold;

	unsigned short tx_wake_threshold;



	struct bufdesc	*cur_tx;

	struct bufdesc	*dirty_tx;

	char *tso_hdrs;

	dma_addr_t tso_hdrs_dma;

};



struct fec_enet_priv_rx_q {

	int index;

	struct bufdesc_prop bd;

	struct  sk_buff *rx_skbuff[RX_RING_SIZE];



	dma_addr_t	bd_dma;

	struct bufdesc	*rx_bd_base;

	uint rx_ring_size;



	struct bufdesc	*cur_rx;

};



/* The FEC buffer descriptors track the ring buffers.  The rx_bd_base and
@@ -513,8 +511,6 @@ struct fec_enet_private { 
	unsigned long work_ts;

	unsigned long work_mdio;



	unsigned short bufdesc_size;



	struct	platform_device *pdev;



	int	dev_id;

drivers/net/ethernet/freescale/fec_main.c

+179 −217

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE