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

Commit 56b106ae authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by David S. Miller
Browse files

stmmac: rework normal and enhanced descriptors 



Currently the driver assumes that the mac10/100 can only use the
normal descriptor structure and the gmac can only use the
enhanced structures.
This patch removes the descriptor's code from the dma files
and adds two new files just for handling the normal and enhanced
descriptors.

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

drivers/net/stmmac/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,4 +2,4 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac.o 
stmmac-$(CONFIG_STMMAC_TIMER) += stmmac_timer.o

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

	      dwmac_lib.o dwmac1000_core.o  dwmac1000_dma.o	\

	      dwmac100_core.o dwmac100_dma.o $(stmmac-y)
 
	      dwmac100_core.o dwmac100_dma.o enh_desc.o  norm_desc.o $(stmmac-y)

drivers/net/stmmac/common.h

+14 −1
Original line number Diff line number Diff line
@@ -22,8 +22,21 @@ 
  Author: Giuseppe Cavallaro <peppe.cavallaro@st.com>

*******************************************************************************/



#include "descs.h"

#include <linux/netdevice.h>

#include "descs.h"



#undef CHIP_DEBUG_PRINT

/* Turn-on extra printk debug for MAC core, dma and descriptors */

/* #define CHIP_DEBUG_PRINT */



#ifdef CHIP_DEBUG_PRINT

#define CHIP_DBG(fmt, args...)  printk(fmt, ## args)

#else

#define CHIP_DBG(fmt, args...)  do { } while (0)

#endif



#undef FRAME_FILTER_DEBUG

/* #define FRAME_FILTER_DEBUG */



struct stmmac_extra_stats {

	/* Transmit errors */

drivers/net/stmmac/dwmac100.h

+0 −12
Original line number Diff line number Diff line
@@ -118,16 +118,4 @@ enum ttc_control { 
#define DMA_MISSED_FRAME_OVE_M	0x00010000	/* Missed Frame Overflow */

#define DMA_MISSED_FRAME_M_CNTR	0x0000ffff	/* Missed Frame Couinter */



#undef DWMAC100_DEBUG

/* #define DWMAC100__DEBUG */

#undef FRAME_FILTER_DEBUG

/* #define FRAME_FILTER_DEBUG */

#ifdef DWMAC100__DEBUG

#define DBG(fmt, args...)  printk(fmt, ## args)

#else

#define DBG(fmt, args...)  do { } while (0)

#endif



extern struct stmmac_dma_ops dwmac100_dma_ops;
 
extern struct stmmac_desc_ops dwmac100_desc_ops;

drivers/net/stmmac/dwmac1000.h

+0 −11
Original line number Diff line number Diff line
@@ -206,15 +206,4 @@ enum rtc_control { 
#define GMAC_MMC_TX_INTR   0x108

#define GMAC_MMC_RX_CSUM_OFFLOAD   0x208



#undef DWMAC1000_DEBUG

/* #define DWMAC1000__DEBUG */

#undef FRAME_FILTER_DEBUG

/* #define FRAME_FILTER_DEBUG */

#ifdef DWMAC1000__DEBUG

#define DBG(fmt, args...)  printk(fmt, ## args)

#else

#define DBG(fmt, args...)  do { } while (0)

#endif



extern struct stmmac_dma_ops dwmac1000_dma_ops;
 
extern struct stmmac_desc_ops dwmac1000_desc_ops;

drivers/net/stmmac/dwmac1000_core.c

+13 −14
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void dwmac1000_set_filter(struct net_device *dev) 
	unsigned long ioaddr = dev->base_addr;

	unsigned int value = 0;



	DBG(KERN_INFO "%s: # mcasts %d, # unicast %d\n",

	CHIP_DBG(KERN_INFO "%s: # mcasts %d, # unicast %d\n",

		 __func__, netdev_mc_count(dev), netdev_uc_count(dev));



	if (dev->flags & IFF_PROMISC)
@@ -136,7 +136,7 @@ static void dwmac1000_set_filter(struct net_device *dev) 
#endif

	writel(value, ioaddr + GMAC_FRAME_FILTER);



	DBG(KERN_INFO "\tFrame Filter reg: 0x%08x\n\tHash regs: "

	CHIP_DBG(KERN_INFO "\tFrame Filter reg: 0x%08x\n\tHash regs: "

	    "HI 0x%08x, LO 0x%08x\n", readl(ioaddr + GMAC_FRAME_FILTER),

	    readl(ioaddr + GMAC_HASH_HIGH), readl(ioaddr + GMAC_HASH_LOW));
@@ -148,18 +148,18 @@ static void dwmac1000_flow_ctrl(unsigned long ioaddr, unsigned int duplex, 
{

	unsigned int flow = 0;



	DBG(KERN_DEBUG "GMAC Flow-Control:\n");

	CHIP_DBG(KERN_DEBUG "GMAC Flow-Control:\n");

	if (fc & FLOW_RX) {

		DBG(KERN_DEBUG "\tReceive Flow-Control ON\n");

		CHIP_DBG(KERN_DEBUG "\tReceive Flow-Control ON\n");

		flow |= GMAC_FLOW_CTRL_RFE;

	}

	if (fc & FLOW_TX) {

		DBG(KERN_DEBUG "\tTransmit Flow-Control ON\n");

		CHIP_DBG(KERN_DEBUG "\tTransmit Flow-Control ON\n");

		flow |= GMAC_FLOW_CTRL_TFE;

	}



	if (duplex) {

		DBG(KERN_DEBUG "\tduplex mode: pause time: %d\n", pause_time);

		CHIP_DBG(KERN_DEBUG "\tduplex mode: PAUSE %d\n", pause_time);

		flow |= (pause_time << GMAC_FLOW_CTRL_PT_SHIFT);

	}
@@ -172,10 +172,10 @@ static void dwmac1000_pmt(unsigned long ioaddr, unsigned long mode) 
	unsigned int pmt = 0;



	if (mode == WAKE_MAGIC) {

		DBG(KERN_DEBUG "GMAC: WOL Magic frame\n");

		CHIP_DBG(KERN_DEBUG "GMAC: WOL Magic frame\n");

		pmt |= power_down | magic_pkt_en;

	} else if (mode == WAKE_UCAST) {

		DBG(KERN_DEBUG "GMAC: WOL on global unicast\n");

		CHIP_DBG(KERN_DEBUG "GMAC: WOL on global unicast\n");

		pmt |= global_unicast;

	}
@@ -190,16 +190,16 @@ static void dwmac1000_irq_status(unsigned long ioaddr) 


	/* Not used events (e.g. MMC interrupts) are not handled. */

	if ((intr_status & mmc_tx_irq))

		DBG(KERN_DEBUG "GMAC: MMC tx interrupt: 0x%08x\n",

		CHIP_DBG(KERN_DEBUG "GMAC: MMC tx interrupt: 0x%08x\n",

		    readl(ioaddr + GMAC_MMC_TX_INTR));

	if (unlikely(intr_status & mmc_rx_irq))

		DBG(KERN_DEBUG "GMAC: MMC rx interrupt: 0x%08x\n",

		CHIP_DBG(KERN_DEBUG "GMAC: MMC rx interrupt: 0x%08x\n",

		    readl(ioaddr + GMAC_MMC_RX_INTR));

	if (unlikely(intr_status & mmc_rx_csum_offload_irq))

		DBG(KERN_DEBUG "GMAC: MMC rx csum offload: 0x%08x\n",

		CHIP_DBG(KERN_DEBUG "GMAC: MMC rx csum offload: 0x%08x\n",

		    readl(ioaddr + GMAC_MMC_RX_CSUM_OFFLOAD));

	if (unlikely(intr_status & pmt_irq)) {

		DBG(KERN_DEBUG "GMAC: received Magic frame\n");

		CHIP_DBG(KERN_DEBUG "GMAC: received Magic frame\n");

		/* clear the PMT bits 5 and 6 by reading the PMT

		 * status register. */

		readl(ioaddr + GMAC_PMT);
@@ -230,7 +230,6 @@ struct mac_device_info *dwmac1000_setup(unsigned long ioaddr) 
	mac = kzalloc(sizeof(const struct mac_device_info), GFP_KERNEL);



	mac->mac = &dwmac1000_ops;

	mac->desc = &dwmac1000_desc_ops;

	mac->dma = &dwmac1000_dma_ops;



	mac->pmt = PMT_SUPPORTED;