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

Commit 54139cf3 authored by Joao Pinto's avatar Joao Pinto Committed by David S. Miller
Browse files

net: stmmac: adding multiple buffers for rx 



This patch adds the structure stmmac_rx_queue which contains
rx queues specific data (previously in stmmac_priv).

Signed-off-by: default avatarJoao Pinto <jpinto@synopsys.com>
Tested-by: default avatarNiklas Cassel <niklas.cassel@axis.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71fedb01

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

+4 −3
Original line number Diff line number Diff line
@@ -136,15 +136,16 @@ static void stmmac_init_dma_chain(void *des, dma_addr_t phy_addr, 


static void stmmac_refill_desc3(void *priv_ptr, struct dma_desc *p)

{

	struct stmmac_priv *priv = (struct stmmac_priv *)priv_ptr;

	struct stmmac_rx_queue *rx_q = (struct stmmac_rx_queue *)priv_ptr;

	struct stmmac_priv *priv = rx_q->priv_data;



	if (priv->hwts_rx_en && !priv->extend_desc)

		/* NOTE: Device will overwrite des3 with timestamp value if

		 * 1588-2002 time stamping is enabled, hence reinitialize it

		 * to keep explicit chaining in the descriptor.

		 */

		p->des3 = cpu_to_le32((unsigned int)(priv->dma_rx_phy +

				      (((priv->dirty_rx) + 1) %

		p->des3 = cpu_to_le32((unsigned int)(rx_q->dma_rx_phy +

				      (((rx_q->dirty_rx) + 1) %

				       DMA_RX_SIZE) *

				      sizeof(struct dma_desc)));

}

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

+17 −9
Original line number Diff line number Diff line
@@ -46,6 +46,20 @@ struct stmmac_tx_info { 
	bool is_jumbo;

};



struct stmmac_rx_queue {

	u32 queue_index;

	struct stmmac_priv *priv_data;

	struct dma_extended_desc *dma_erx;

	struct dma_desc *dma_rx ____cacheline_aligned_in_smp;

	struct sk_buff **rx_skbuff;

	dma_addr_t *rx_skbuff_dma;

	unsigned int cur_rx;

	unsigned int dirty_rx;

	u32 rx_zeroc_thresh;

	dma_addr_t dma_rx_phy;

	u32 rx_tail_addr;

};



struct stmmac_priv {

	/* Frequently used values are kept adjacent for cache effect */

	struct dma_extended_desc *dma_etx ____cacheline_aligned_in_smp;
@@ -64,18 +78,10 @@ struct stmmac_priv { 
	struct timer_list txtimer;

	bool tso;



	struct dma_desc *dma_rx	____cacheline_aligned_in_smp;

	struct dma_extended_desc *dma_erx;

	struct sk_buff **rx_skbuff;

	unsigned int cur_rx;

	unsigned int dirty_rx;

	unsigned int dma_buf_sz;

	unsigned int rx_copybreak;

	unsigned int rx_zeroc_thresh;

	u32 rx_riwt;

	int hwts_rx_en;

	dma_addr_t *rx_skbuff_dma;

	dma_addr_t dma_rx_phy;



	struct napi_struct napi ____cacheline_aligned_in_smp;
@@ -85,6 +91,9 @@ struct stmmac_priv { 
	struct mac_device_info *hw;

	spinlock_t lock;



	/* RX Queue */

	struct stmmac_rx_queue rx_queue[MTL_MAX_RX_QUEUES];



	int oldlink;

	int speed;

	int oldduplex;
@@ -119,7 +128,6 @@ struct stmmac_priv { 
	spinlock_t ptp_lock;

	void __iomem *mmcaddr;

	void __iomem *ptpaddr;

	u32 rx_tail_addr;

	u32 tx_tail_addr;

	u32 mss;

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

+285 −172

File changed.

Preview size limit exceeded, changes collapsed.