7 files changed, 29 insertions, 10 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/common.h b/drivers/net/ethernet/stmicro/stmmac/common.h
index f5dedcbf4651..7164509e3832 100644
--- a/drivers/net/ethernet/stmicro/stmmac/common.h
+++ b/drivers/net/ethernet/stmicro/stmmac/common.h
@@ -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);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
index 54339a78e358..1527f4ecd11a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000.h
@@ -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;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index e7cbcd99c2cb..b5e4d02f15c9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -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;
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
index efde50ff03f8..19e0f4eed2bc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c
@@ -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);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
index f20aa12931d0..4e0e18a44fcc 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c
@@ -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);
 }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index db2de9a49952..6b5d060ee9de 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -85,6 +85,7 @@ struct stmmac_priv {
         struct clk *stmmac_clk;
 #endif
         int clk_csr;
+        int synopsys_id;
 };
 
 extern int phyaddr;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 1a4cf8128f91..a9699ae49add 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -1465,7 +1465,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->hw->mac->set_filter(dev, priv->synopsys_id);
         spin_unlock(&priv->lock);
 }
 
@@ -1806,7 +1806,7 @@ static int stmmac_hw_init(struct stmmac_priv *priv)
         priv->hw->ring = &ring_mode_ops;
 
         /* Get and dump the chip ID */
-        stmmac_get_synopsys_id(priv);
+        priv->synopsys_id = stmmac_get_synopsys_id(priv);
 
         /* Get the HW capability (new GMAC newer than 3.50a) */
         priv->hw_cap_support = stmmac_get_hw_features(priv);