net: stmmac: Correct set_filter for multicast and unicast cases

This patch removes the check for the number of mulitcast addresses
when using hash based filtering since it's not necessary. If the number
of multicast addresses in the list exceeds the number of multicast hash
bins, the bins will "fold" over into one of the bins configured and
enabled for the particular component instance.

The default number of maximum unicast addresses was changed from 32 to 1
since this number is not dependent on the component revision. The maximum
number of multicast and unicast addresses is dependent on the configuration
of the Synopsys EMAC configured by the SOC architect at the time the
features were selected and configured for a particular component. Sadly,
Synopsys does not provide a way to query the precise number supported
by a particular component, so we must fall back on a devicetree entry.
This configuration could vary from vendor to vendor (such as STMicro,
Altera, etc).

The multicast bins are set for every possible filtering case (including
no entries) - previously the bits were set only if multicast filter entries
were present.

Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index 96f1f14310a6b32cfaafd99a6cf914b0071e21f9..49f72e1ffbef5e67c16647704092f308e9fa1cf0 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -381,7 +381,7 @@ struct stmmac_ops {
        int (*host_irq_status)(struct mac_device_info *hw,
                               struct stmmac_extra_stats *x);
        /* Multicast filter setting */
-       void (*set_filter)(struct net_device *dev, int id);
+       void (*set_filter)(struct net_device *dev);
        /* Flow control setting */
        void (*flow_ctrl)(struct mac_device_info *hw, unsigned int duplex,
                          unsigned int fc, unsigned int pause_time);

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index f37d90f114f5272eab8448b1166e984dad470553..285e3056f362d39b997ddee141ae22800307a787 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -87,7 +87,7 @@ enum power_event {
                                (reg * 8))
 #define GMAC_ADDR_LOW(reg)     (((reg > 15) ? 0x00000804 : 0x00000044) + \
                                (reg * 8))
-#define GMAC_MAX_PERFECT_ADDRESSES     32
+#define GMAC_MAX_PERFECT_ADDRESSES     1
 
 /* PCS registers (AN/TBI/SGMII/RGMII) offset */
 #define GMAC_AN_CTRL   0x000000c0      /* AN control */

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index b6081ff29c9183b6ad664b87df99d3b615c9518e..cdcbad1f1ac0e0c1d1a0c23f46cc84f7b83779dd 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -97,30 +97,28 @@ static void dwmac1000_get_umac_addr(struct mac_device_info *hw,
                            GMAC_ADDR_LOW(reg_n));
 }
 
-static void dwmac1000_set_filter(struct net_device *dev, int id)
+static void dwmac1000_set_filter(struct net_device *dev)
 {
        void __iomem *ioaddr = (void __iomem *)dev->base_addr;
        unsigned int value = 0;
        unsigned int perfect_addr_number;
+       u32 mc_filter[2];
 
        pr_debug("%s: # mcasts %d, # unicast %d\n", __func__,
                 netdev_mc_count(dev), netdev_uc_count(dev));
 
-       if (dev->flags & IFF_PROMISC)
+       memset(mc_filter, 0, sizeof(mc_filter));
+
+       if (dev->flags & IFF_PROMISC) {
                value = GMAC_FRAME_FILTER_PR;
-       else if ((netdev_mc_count(dev) > HASH_TABLE_SIZE)
-                || (dev->flags & IFF_ALLMULTI)) {
+       } else if (dev->flags & IFF_ALLMULTI) {
                value = GMAC_FRAME_FILTER_PM;   /* pass all multi */
-               writel(0xffffffff, ioaddr + GMAC_HASH_HIGH);
-               writel(0xffffffff, ioaddr + GMAC_HASH_LOW);
        } else if (!netdev_mc_empty(dev)) {
-               u32 mc_filter[2];
                struct netdev_hw_addr *ha;
 
                /* Hash filter for multicast */
                value = GMAC_FRAME_FILTER_HMC;
 
-               memset(mc_filter, 0, sizeof(mc_filter));
                netdev_for_each_mc_addr(ha, dev) {
                        /* The upper 6 bits of the calculated CRC are used to
                         * index the contens of the hash table
@@ -132,15 +130,12 @@ static void dwmac1000_set_filter(struct net_device *dev, int id)
                         */
                        mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
                }
-               writel(mc_filter[0], ioaddr + GMAC_HASH_LOW);
-               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;
+       writel(mc_filter[0], ioaddr + GMAC_HASH_LOW);
+       writel(mc_filter[1], ioaddr + GMAC_HASH_HIGH);
+
+       perfect_addr_number = GMAC_MAX_PERFECT_ADDRESSES;
 
        /* Handle multiple unicast addresses (perfect filtering) */
        if (netdev_uc_count(dev) > perfect_addr_number)

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index 8bb201aeb6860b494d98c0d3ebcb55c83396c4ba..3a2d63388f8d507613286ce2d67752150f3e93ff 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -95,7 +95,7 @@ static void dwmac100_get_umac_addr(struct mac_device_info *hw,
        stmmac_get_mac_addr(ioaddr, addr, MAC_ADDR_HIGH, MAC_ADDR_LOW);
 }
 
-static void dwmac100_set_filter(struct net_device *dev, int id)
+static void dwmac100_set_filter(struct net_device *dev)
 {
        void __iomem *ioaddr = (void __iomem *)dev->base_addr;
        u32 value = readl(ioaddr + MAC_CONTROL);

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 814ff4599205d0906fe3c2cb153fee0784479f57..cff2b69e62ee22f5e3767247333bb6787796095f 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -2225,7 +2225,7 @@ static void stmmac_set_rx_mode(struct net_device *dev)
        struct stmmac_priv *priv = netdev_priv(dev);
 
        spin_lock(&priv->lock);
-       priv->hw->mac->set_filter(dev, priv->synopsys_id);
+       priv->hw->mac->set_filter(dev);
        spin_unlock(&priv->lock);
 }