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

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

stmmac: extend mac addr reg and fix perfect filering 



This patch is to extend the number of MAC address registers
for 16 to 32. In fact, other new 16 registers are available in new
chips and this can help on perfect filter mode for unicast.

This patch also fixes the perfect filtering mode by setting the
bit 31 in the MAC address registers.

v2: fixed Coding Style.

Signed-off-by: default avatarGianni Antoniazzi <gianni.antoniazzi-ext@st.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 20fb18da

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

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ struct stmmac_ops { 
	/* Handle extra events on specific interrupts hw dependent */

	void (*host_irq_status) (void __iomem *ioaddr);

	/* Multicast filter setting */

	void (*set_filter) (struct net_device *dev);

	void (*set_filter) (struct net_device *dev, int id);

	/* Flow control setting */

	void (*flow_ctrl) (void __iomem *ioaddr, unsigned int duplex,

			   unsigned int fc, unsigned int pause_time);

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

+8 −3
Original line number Diff line number Diff line
@@ -61,9 +61,11 @@ enum power_event { 
};



/* GMAC HW ADDR regs */

#define GMAC_ADDR_HIGH(reg)		(0x00000040+(reg * 8))

#define GMAC_ADDR_LOW(reg)		(0x00000044+(reg * 8))

#define GMAC_MAX_UNICAST_ADDRESSES	16

#define GMAC_ADDR_HIGH(reg)	(((reg > 15) ? 0x00000800 : 0x00000040) + \

				(reg * 8))

#define GMAC_ADDR_LOW(reg)	(((reg > 15) ? 0x00000804 : 0x00000044) + \

				(reg * 8))

#define GMAC_MAX_PERFECT_ADDRESSES	32



#define GMAC_AN_CTRL	0x000000c0	/* AN control */

#define GMAC_AN_STATUS	0x000000c4	/* AN status */
@@ -205,4 +207,7 @@ enum rtc_control { 
#define GMAC_MMC_TX_INTR   0x108

#define GMAC_MMC_RX_CSUM_OFFLOAD   0x208



/* Synopsys Core versions */

#define	DWMAC_CORE_3_40	34



extern const struct stmmac_dma_ops dwmac1000_dma_ops;

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

+9 −2
Original line number Diff line number Diff line
@@ -84,10 +84,11 @@ static void dwmac1000_get_umac_addr(void __iomem *ioaddr, unsigned char *addr, 
				GMAC_ADDR_LOW(reg_n));

}



static void dwmac1000_set_filter(struct net_device *dev)

static void dwmac1000_set_filter(struct net_device *dev, int id)

{

	void __iomem *ioaddr = (void __iomem *) dev->base_addr;

	unsigned int value = 0;

	unsigned int perfect_addr_number;



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

		 __func__, netdev_mc_count(dev), netdev_uc_count(dev));
@@ -121,8 +122,14 @@ static void dwmac1000_set_filter(struct net_device *dev) 
		writel(mc_filter[1], ioaddr + GMAC_HASH_HIGH);

	}



	/* Extra 16 regs are available in cores newer than the 3.40. */

	if (id > DWMAC_CORE_3_40)

		perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES;

	else

		perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES / 2;



	/* Handle multiple unicast addresses (perfect filtering)*/

	if (netdev_uc_count(dev) > GMAC_MAX_UNICAST_ADDRESSES)

	if (netdev_uc_count(dev) > perfect_addr_number)

		/* Switch to promiscuous mode is more than 16 addrs

		   are required */

		value |= GMAC_FRAME_FILTER_PR;

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

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static void dwmac100_get_umac_addr(void __iomem *ioaddr, unsigned char *addr, 
	stmmac_get_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);

}



static void dwmac100_set_filter(struct net_device *dev)

static void dwmac100_set_filter(struct net_device *dev, int id)

{

	void __iomem *ioaddr = (void __iomem *) dev->base_addr;

	u32 value = readl(ioaddr + MAC_CONTROL);

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

+7 −1
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define DWMAC_LIB_DBG(fmt, args...)  do { } while (0)

#endif



#define GMAC_HI_REG_AE		0x80000000



/* CSR1 enables the transmit DMA to check for new descriptor */

void dwmac_enable_dma_transmission(void __iomem *ioaddr)

{
@@ -233,7 +235,11 @@ void stmmac_set_mac_addr(void __iomem *ioaddr, u8 addr[6], 
	unsigned long data;



	data = (addr[5] << 8) | addr[4];

	writel(data, ioaddr + high);

	/* For MAC Addr registers se have to set the Address Enable (AE)

	 * bit that has no effect on the High Reg 0 where the bit 31 (MO)

	 * is RO.

	 */

	writel(data | GMAC_HI_REG_AE, ioaddr + high);

	data = (addr[3] << 24) | (addr[2] << 16) | (addr[1] << 8) | addr[0];

	writel(data, ioaddr + low);

}