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

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

stmmac: reorganize chain/ring modes removing Koptions 



Previously we had two Koptions to decide if the stmmac
had to use either a ring or a chain to manage its descriptors.
This patch removes the Kernel configuration options and it allow us
to use the chain mode by passing a module option.
Ring mode continues to be the default.

Also with this patch, it will be easier to validate the driver built and
guarantee that all the two modes always compile fine.

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

drivers/net/ethernet/stmicro/stmmac/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -54,22 +54,4 @@ config STMMAC_DA 
	  By default, the DMA arbitration scheme is based on Round-robin

	  (rx:tx priority is 1:1).



choice

	prompt "Select the DMA TX/RX descriptor operating modes"

	depends on STMMAC_ETH

	---help---

	  This driver supports DMA descriptor to operate both in dual buffer

	  (RING) and linked-list(CHAINED) mode. In RING mode each descriptor

	  points to two data buffer pointers whereas in CHAINED mode they

	  points to only one data buffer pointer.



config STMMAC_RING

	bool "Enable Descriptor Ring Mode"



config STMMAC_CHAINED

	bool "Enable Descriptor Chained Mode"



endchoice





endif

drivers/net/ethernet/stmicro/stmmac/Makefile

+2 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_STMMAC_ETH) += stmmac.o

stmmac-$(CONFIG_STMMAC_RING) += ring_mode.o

stmmac-$(CONFIG_STMMAC_CHAINED) += chain_mode.o

stmmac-$(CONFIG_STMMAC_PLATFORM) += stmmac_platform.o

stmmac-$(CONFIG_STMMAC_PCI) += stmmac_pci.o

stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o	\

	      dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o	\

stmmac-objs:= stmmac_main.o stmmac_ethtool.o stmmac_mdio.o ring_mode.o	\

	      chain_mode.o dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o \

	      dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o \

	      mmc_core.o $(stmmac-y)

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

+7 −29
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 


#include "stmmac.h"



unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)

static unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum)

{

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

	unsigned int txsize = priv->dma_tx_size;
@@ -47,7 +47,7 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 


	desc->des2 = dma_map_single(priv->device, skb->data,

				    bmax, DMA_TO_DEVICE);

	priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum);

	priv->hw->desc->prepare_tx_desc(desc, 1, bmax, csum, STMMAC_CHAIN_MODE);



	while (len != 0) {

		entry = (++priv->cur_tx) % txsize;
@@ -57,8 +57,8 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 
			desc->des2 = dma_map_single(priv->device,

						    (skb->data + bmax * i),

						    bmax, DMA_TO_DEVICE);

			priv->hw->desc->prepare_tx_desc(desc, 0, bmax,

							csum);

			priv->hw->desc->prepare_tx_desc(desc, 0, bmax, csum,

							STMMAC_CHAIN_MODE);

			priv->hw->desc->set_tx_owner(desc);

			priv->tx_skbuff[entry] = NULL;

			len -= bmax;
@@ -67,8 +67,8 @@ unsigned int stmmac_jumbo_frm(void *p, struct sk_buff *skb, int csum) 
			desc->des2 = dma_map_single(priv->device,

						    (skb->data + bmax * i), len,

						    DMA_TO_DEVICE);

			priv->hw->desc->prepare_tx_desc(desc, 0, len,

							csum);

			priv->hw->desc->prepare_tx_desc(desc, 0, len, csum,

							STMMAC_CHAIN_MODE);

			priv->hw->desc->set_tx_owner(desc);

			priv->tx_skbuff[entry] = NULL;

			len = 0;
@@ -89,18 +89,6 @@ static unsigned int stmmac_is_jumbo_frm(int len, int enh_desc) 
	return ret;

}



static void stmmac_refill_desc3(int bfsize, struct dma_desc *p)

{

}



static void stmmac_init_desc3(int des3_as_data_buf, struct dma_desc *p)

{

}



static void stmmac_clean_desc3(struct dma_desc *p)

{

}



static void stmmac_init_dma_chain(struct dma_desc *des, dma_addr_t phy_addr,

				  unsigned int size)

{
@@ -120,18 +108,8 @@ static void stmmac_init_dma_chain(struct dma_desc *des, dma_addr_t phy_addr, 
	p->des3 = (unsigned int)phy_addr;

}



static int stmmac_set_16kib_bfsize(int mtu)

{

	/* Not supported */

	return 0;

}



const struct stmmac_ring_mode_ops ring_mode_ops = {

const struct stmmac_chain_mode_ops chain_mode_ops = {

	.is_jumbo_frm = stmmac_is_jumbo_frm,

	.jumbo_frm = stmmac_jumbo_frm,

	.refill_desc3 = stmmac_refill_desc3,

	.init_desc3 = stmmac_init_desc3,

	.init_dma_chain = stmmac_init_dma_chain,

	.clean_desc3 = stmmac_clean_desc3,

	.set_16kib_bfsize = stmmac_set_16kib_bfsize,

};

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

+18 −7
Original line number Diff line number Diff line
@@ -255,23 +255,27 @@ struct dma_features { 
#define STMMAC_DEFAULT_LIT_LS_TIMER	0x3E8

#define STMMAC_DEFAULT_TWT_LS_TIMER	0x0



#define STMMAC_CHAIN_MODE	0x1

#define STMMAC_RING_MODE	0x2



struct stmmac_desc_ops {

	/* DMA RX descriptor ring initialization */

	void (*init_rx_desc) (struct dma_desc *p, unsigned int ring_size,

			      int disable_rx_ic);

			      int disable_rx_ic, int mode);

	/* DMA TX descriptor ring initialization */

	void (*init_tx_desc) (struct dma_desc *p, unsigned int ring_size);

	void (*init_tx_desc) (struct dma_desc *p, unsigned int ring_size,

			      int mode);



	/* Invoked by the xmit function to prepare the tx descriptor */

	void (*prepare_tx_desc) (struct dma_desc *p, int is_fs, int len,

				 int csum_flag);

				 int csum_flag, int mode);

	/* Set/get the owner of the descriptor */

	void (*set_tx_owner) (struct dma_desc *p);

	int (*get_tx_owner) (struct dma_desc *p);

	/* Invoked by the xmit function to close the tx descriptor */

	void (*close_tx_desc) (struct dma_desc *p);

	/* Clean the tx descriptor as soon as the tx irq is received */

	void (*release_tx_desc) (struct dma_desc *p);

	void (*release_tx_desc) (struct dma_desc *p, int mode);

	/* Clear interrupt on tx frame completion. When this bit is

	 * set an interrupt happens as soon as the frame is transmitted */

	void (*clear_tx_ic) (struct dma_desc *p);
@@ -361,18 +365,24 @@ struct stmmac_ring_mode_ops { 
	unsigned int (*is_jumbo_frm) (int len, int ehn_desc);

	unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);

	void (*refill_desc3) (int bfsize, struct dma_desc *p);

	void (*init_desc3) (int des3_as_data_buf, struct dma_desc *p);

	void (*init_dma_chain) (struct dma_desc *des, dma_addr_t phy_addr,

				unsigned int size);

	void (*init_desc3) (struct dma_desc *p);

	void (*clean_desc3) (struct dma_desc *p);

	int (*set_16kib_bfsize) (int mtu);

};



struct stmmac_chain_mode_ops {

	unsigned int (*is_jumbo_frm) (int len, int ehn_desc);

	unsigned int (*jumbo_frm) (void *priv, struct sk_buff *skb, int csum);

	void (*init_dma_chain) (struct dma_desc *des, dma_addr_t phy_addr,

				unsigned int size);

};



struct mac_device_info {

	const struct stmmac_ops		*mac;

	const struct stmmac_desc_ops	*desc;

	const struct stmmac_dma_ops	*dma;

	const struct stmmac_ring_mode_ops	*ring;

	const struct stmmac_chain_mode_ops	*chain;

	struct mii_regs mii;	/* MII register Addresses */

	struct mac_link link;

	unsigned int synopsys_uid;
@@ -390,5 +400,6 @@ extern void stmmac_set_mac(void __iomem *ioaddr, bool enable); 


extern void dwmac_dma_flush_tx_fifo(void __iomem *ioaddr);

extern const struct stmmac_ring_mode_ops ring_mode_ops;

extern const struct stmmac_chain_mode_ops chain_mode_ops;



#endif /* __COMMON_H__ */

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

+24 −20
Original line number Diff line number Diff line
@@ -30,26 +30,28 @@ 
#ifndef __DESC_COM_H__

#define __DESC_COM_H__



#if defined(CONFIG_STMMAC_RING)

static inline void ehn_desc_rx_set_on_ring_chain(struct dma_desc *p, int end)

/* Specific functions used for Ring mode */



/* Enhanced descriptors */

static inline void ehn_desc_rx_set_on_ring(struct dma_desc *p, int end)

{

	p->des01.erx.buffer2_size = BUF_SIZE_8KiB - 1;

	if (end)

		p->des01.erx.end_ring = 1;

}



static inline void ehn_desc_tx_set_on_ring_chain(struct dma_desc *p, int end)

static inline void ehn_desc_tx_set_on_ring(struct dma_desc *p, int end)

{

	if (end)

		p->des01.etx.end_ring = 1;

}



static inline void enh_desc_end_tx_desc(struct dma_desc *p, int ter)

static inline void enh_desc_end_tx_desc_on_ring(struct dma_desc *p, int ter)

{

	p->des01.etx.end_ring = ter;

}



static inline void enh_set_tx_desc_len(struct dma_desc *p, int len)

static inline void enh_set_tx_desc_len_on_ring(struct dma_desc *p, int len)

{

	if (unlikely(len > BUF_SIZE_4KiB)) {

		p->des01.etx.buffer1_size = BUF_SIZE_4KiB;
@@ -58,25 +60,26 @@ static inline void enh_set_tx_desc_len(struct dma_desc *p, int len) 
		p->des01.etx.buffer1_size = len;

}



static inline void ndesc_rx_set_on_ring_chain(struct dma_desc *p, int end)

/* Normal descriptors */

static inline void ndesc_rx_set_on_ring(struct dma_desc *p, int end)

{

	p->des01.rx.buffer2_size = BUF_SIZE_2KiB - 1;

	if (end)

		p->des01.rx.end_ring = 1;

}



static inline void ndesc_tx_set_on_ring_chain(struct dma_desc *p, int end)

static inline void ndesc_tx_set_on_ring(struct dma_desc *p, int end)

{

	if (end)

		p->des01.tx.end_ring = 1;

}



static inline void ndesc_end_tx_desc(struct dma_desc *p, int ter)

static inline void ndesc_end_tx_desc_on_ring(struct dma_desc *p, int ter)

{

	p->des01.tx.end_ring = ter;

}



static inline void norm_set_tx_desc_len(struct dma_desc *p, int len)

static inline void norm_set_tx_desc_len_on_ring(struct dma_desc *p, int len)

{

	if (unlikely(len > BUF_SIZE_2KiB)) {

		p->des01.etx.buffer1_size = BUF_SIZE_2KiB - 1;
@@ -85,47 +88,48 @@ static inline void norm_set_tx_desc_len(struct dma_desc *p, int len) 
		p->des01.tx.buffer1_size = len;

}



#else

/* Specific functions used for Chain mode */



static inline void ehn_desc_rx_set_on_ring_chain(struct dma_desc *p, int end)

/* Enhanced descriptors */

static inline void ehn_desc_rx_set_on_chain(struct dma_desc *p, int end)

{

	p->des01.erx.second_address_chained = 1;

}



static inline void ehn_desc_tx_set_on_ring_chain(struct dma_desc *p, int end)

static inline void ehn_desc_tx_set_on_chain(struct dma_desc *p, int end)

{

	p->des01.etx.second_address_chained = 1;

}



static inline void enh_desc_end_tx_desc(struct dma_desc *p, int ter)

static inline void enh_desc_end_tx_desc_on_chain(struct dma_desc *p, int ter)

{

	p->des01.etx.second_address_chained = 1;

}



static inline void enh_set_tx_desc_len(struct dma_desc *p, int len)

static inline void enh_set_tx_desc_len_on_chain(struct dma_desc *p, int len)

{

	p->des01.etx.buffer1_size = len;

}



static inline void ndesc_rx_set_on_ring_chain(struct dma_desc *p, int end)

/* Normal descriptors */

static inline void ndesc_rx_set_on_chain(struct dma_desc *p, int end)

{

	p->des01.rx.second_address_chained = 1;

}



static inline void ndesc_tx_set_on_ring_chain(struct dma_desc *p, int ring_size)

static inline void ndesc_tx_set_on_chain(struct dma_desc *p, int

						 ring_size)

{

	p->des01.tx.second_address_chained = 1;

}



static inline void ndesc_end_tx_desc(struct dma_desc *p, int ter)

static inline void ndesc_end_tx_desc_on_chain(struct dma_desc *p, int ter)

{

	p->des01.tx.second_address_chained = 1;

}



static inline void norm_set_tx_desc_len(struct dma_desc *p, int len)

static inline void norm_set_tx_desc_len_on_chain(struct dma_desc *p, int len)

{

	p->des01.tx.buffer1_size = len;

}

#endif



#endif /* __DESC_COM_H__ */