Commit ae1f2a56 authored by Rafal Ozieblo's avatar Rafal Ozieblo Committed by David S. Miller
Browse files

net: macb: Added support for many RX queues 



To be able for packet reception on different RX queues some
configuration has to be performed. This patch checks how many
hardware queue does GEM support and initializes them.

Signed-off-by: default avatarRafal Ozieblo <rafalo@cadence.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7475908f

drivers/net/ethernet/cadence/macb.h

+16 −10
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ 
#define GEM_TBQP(hw_q)		(0x0440 + ((hw_q) << 2))

#define GEM_TBQPH(hw_q)		(0x04C8)

#define GEM_RBQP(hw_q)		(0x0480 + ((hw_q) << 2))

#define GEM_RBQS(hw_q)		(0x04A0 + ((hw_q) << 2))

#define GEM_RBQPH(hw_q)		(0x04D4)

#define GEM_IER(hw_q)		(0x0600 + ((hw_q) << 2))

#define GEM_IDR(hw_q)		(0x0620 + ((hw_q) << 2))

#define GEM_IMR(hw_q)		(0x0640 + ((hw_q) << 2))
@@ -921,12 +923,13 @@ static const struct gem_statistic gem_statistics[] = { 
#define GEM_STATS_LEN ARRAY_SIZE(gem_statistics)



struct macb;

struct macb_queue;



struct macb_or_gem_ops {

	int	(*mog_alloc_rx_buffers)(struct macb *bp);

	void	(*mog_free_rx_buffers)(struct macb *bp);

	void	(*mog_init_rings)(struct macb *bp);

	int	(*mog_rx)(struct macb *bp, int budget);

	int	(*mog_rx)(struct macb_queue *queue, int budget);

};



/* MACB-PTP interface: adapt to platform needs. */
@@ -968,6 +971,9 @@ struct macb_queue { 
	unsigned int		IMR;

	unsigned int		TBQP;

	unsigned int		TBQPH;

	unsigned int		RBQS;

	unsigned int		RBQP;

	unsigned int		RBQPH;



	unsigned int		tx_head, tx_tail;

	struct macb_dma_desc	*tx_ring;
@@ -975,6 +981,15 @@ struct macb_queue { 
	dma_addr_t		tx_ring_dma;

	struct work_struct	tx_error_task;



	dma_addr_t		rx_ring_dma;

	dma_addr_t		rx_buffers_dma;

	unsigned int		rx_tail;

	unsigned int		rx_prepared_head;

	struct macb_dma_desc	*rx_ring;

	struct sk_buff		**rx_skbuff;

	void			*rx_buffers;

	struct napi_struct	napi;



#ifdef CONFIG_MACB_USE_HWSTAMP

	struct work_struct	tx_ts_task;

	unsigned int		tx_ts_head, tx_ts_tail;
@@ -990,11 +1005,6 @@ struct macb { 
	u32	(*macb_reg_readl)(struct macb *bp, int offset);

	void	(*macb_reg_writel)(struct macb *bp, int offset, u32 value);



	unsigned int		rx_tail;

	unsigned int		rx_prepared_head;

	struct macb_dma_desc	*rx_ring;

	struct sk_buff		**rx_skbuff;

	void			*rx_buffers;

	size_t			rx_buffer_size;



	unsigned int		rx_ring_size;
@@ -1011,15 +1021,11 @@ struct macb { 
	struct clk		*tx_clk;

	struct clk		*rx_clk;

	struct net_device	*dev;

	struct napi_struct	napi;

	union {

		struct macb_stats	macb;

		struct gem_stats	gem;

	}			hw_stats;



	dma_addr_t		rx_ring_dma;

	dma_addr_t		rx_buffers_dma;



	struct macb_or_gem_ops	macbgem_ops;



	struct mii_bus		*mii_bus;

drivers/net/ethernet/cadence/macb_main.c

+175 −131

File changed.

Preview size limit exceeded, changes collapsed.