1 files changed, 84 insertions, 70 deletions

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index 12d961c4ebca..00c5be8c55b8 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -94,10 +94,10 @@ static inline void _tg3_flag_clear(enum TG3_FLAGS flag, unsigned long *bits)
 
 #define DRV_MODULE_NAME         "tg3"
 #define TG3_MAJ_NUM                     3
-#define TG3_MIN_NUM                     133
+#define TG3_MIN_NUM                     134
 #define DRV_MODULE_VERSION      \
         __stringify(TG3_MAJ_NUM) "." __stringify(TG3_MIN_NUM)
-#define DRV_MODULE_RELDATE      "Jul 29, 2013"
+#define DRV_MODULE_RELDATE      "Sep 16, 2013"
 
 #define RESET_KIND_SHUTDOWN     0
 #define RESET_KIND_INIT         1
@@ -337,6 +337,11 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = {
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5762)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5725)},
         {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5727)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57764)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57767)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57787)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57782)},
+        {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57786)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9DXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_9MXX)},
         {PCI_DEVICE(PCI_VENDOR_ID_ALTIMA, PCI_DEVICE_ID_ALTIMA_AC1000)},
@@ -1326,6 +1331,12 @@ static int tg3_phy_toggle_auxctl_smdsp(struct tg3 *tp, bool enable)
         return err;
 }
 
+static int tg3_phy_shdw_write(struct tg3 *tp, int reg, u32 val)
+{
+        return tg3_writephy(tp, MII_TG3_MISC_SHDW,
+                            reg | val | MII_TG3_MISC_SHDW_WREN);
+}
+
 static int tg3_bmcr_reset(struct tg3 *tp)
 {
         u32 phy_control;
@@ -1364,7 +1375,7 @@ static int tg3_mdio_read(struct mii_bus *bp, int mii_id, int reg)
 
         spin_lock_bh(&tp->lock);
 
-        if (tg3_readphy(tp, reg, &val))
+        if (__tg3_readphy(tp, mii_id, reg, &val))
                 val = -EIO;
 
         spin_unlock_bh(&tp->lock);
@@ -1379,7 +1390,7 @@ static int tg3_mdio_write(struct mii_bus *bp, int mii_id, int reg, u16 val)
 
         spin_lock_bh(&tp->lock);
 
-        if (tg3_writephy(tp, reg, val))
+        if (__tg3_writephy(tp, mii_id, reg, val))
                 ret = -EIO;
 
         spin_unlock_bh(&tp->lock);
@@ -1397,7 +1408,7 @@ static void tg3_mdio_config_5785(struct tg3 *tp)
         u32 val;
         struct phy_device *phydev;
 
-        phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+        phydev = tp->mdio_bus->phy_map[tp->phy_addr];
         switch (phydev->drv->phy_id & phydev->drv->phy_id_mask) {
         case PHY_ID_BCM50610:
         case PHY_ID_BCM50610M:
@@ -1502,6 +1513,13 @@ static int tg3_mdio_init(struct tg3 *tp)
                                     TG3_CPMU_PHY_STRAP_IS_SERDES;
                 if (is_serdes)
                         tp->phy_addr += 7;
+        } else if (tg3_flag(tp, IS_SSB_CORE) && tg3_flag(tp, ROBOSWITCH)) {
+                int addr;
+
+                addr = ssb_gige_get_phyaddr(tp->pdev);
+                if (addr < 0)
+                        return addr;
+                tp->phy_addr = addr;
         } else
                 tp->phy_addr = TG3_PHY_MII_ADDR;
 
@@ -1522,7 +1540,7 @@ static int tg3_mdio_init(struct tg3 *tp)
         tp->mdio_bus->read     = &tg3_mdio_read;
         tp->mdio_bus->write    = &tg3_mdio_write;
         tp->mdio_bus->reset    = &tg3_mdio_reset;
-        tp->mdio_bus->phy_mask = ~(1 << TG3_PHY_MII_ADDR);
+        tp->mdio_bus->phy_mask = ~(1 << tp->phy_addr);
         tp->mdio_bus->irq      = &tp->mdio_irq[0];
 
         for (i = 0; i < PHY_MAX_ADDR; i++)
@@ -1543,7 +1561,7 @@ static int tg3_mdio_init(struct tg3 *tp)
                 return i;
         }
 
-        phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+        phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
         if (!phydev || !phydev->drv) {
                 dev_warn(&tp->pdev->dev, "No PHY devices\n");
@@ -1953,7 +1971,7 @@ static void tg3_setup_flow_control(struct tg3 *tp, u32 lcladv, u32 rmtadv)
         u32 old_tx_mode = tp->tx_mode;
 
         if (tg3_flag(tp, USE_PHYLIB))
-                autoneg = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]->autoneg;
+                autoneg = tp->mdio_bus->phy_map[tp->phy_addr]->autoneg;
         else
                 autoneg = tp->link_config.autoneg;
 
@@ -1989,7 +2007,7 @@ static void tg3_adjust_link(struct net_device *dev)
         u8 oldflowctrl, linkmesg = 0;
         u32 mac_mode, lcl_adv, rmt_adv;
         struct tg3 *tp = netdev_priv(dev);
-        struct phy_device *phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+        struct phy_device *phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
         spin_lock_bh(&tp->lock);
 
@@ -2078,7 +2096,7 @@ static int tg3_phy_init(struct tg3 *tp)
         /* Bring the PHY back to a known state. */
         tg3_bmcr_reset(tp);
 
-        phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+        phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
         /* Attach the MAC to the PHY. */
         phydev = phy_connect(tp->dev, dev_name(&phydev->dev),
@@ -2105,7 +2123,7 @@ static int tg3_phy_init(struct tg3 *tp)
                                       SUPPORTED_Asym_Pause);
                 break;
         default:
-                phy_disconnect(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
+                phy_disconnect(tp->mdio_bus->phy_map[tp->phy_addr]);
                 return -EINVAL;
         }
 
@@ -2123,7 +2141,7 @@ static void tg3_phy_start(struct tg3 *tp)
         if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                 return;
 
-        phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+        phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
         if (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER) {
                 tp->phy_flags &= ~TG3_PHYFLG_IS_LOW_POWER;
@@ -2143,13 +2161,13 @@ static void tg3_phy_stop(struct tg3 *tp)
         if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                 return;
 
-        phy_stop(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
+        phy_stop(tp->mdio_bus->phy_map[tp->phy_addr]);
 }
 
 static void tg3_phy_fini(struct tg3 *tp)
 {
         if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
-                phy_disconnect(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
+                phy_disconnect(tp->mdio_bus->phy_map[tp->phy_addr]);
                 tp->phy_flags &= ~TG3_PHYFLG_IS_CONNECTED;
         }
 }
@@ -2218,25 +2236,21 @@ static void tg3_phy_toggle_apd(struct tg3 *tp, bool enable)
                 return;
         }
 
-        reg = MII_TG3_MISC_SHDW_WREN |
-              MII_TG3_MISC_SHDW_SCR5_SEL |
-              MII_TG3_MISC_SHDW_SCR5_LPED |
+        reg = MII_TG3_MISC_SHDW_SCR5_LPED |
               MII_TG3_MISC_SHDW_SCR5_DLPTLM |
               MII_TG3_MISC_SHDW_SCR5_SDTL |
               MII_TG3_MISC_SHDW_SCR5_C125OE;
         if (tg3_asic_rev(tp) != ASIC_REV_5784 || !enable)
                 reg |= MII_TG3_MISC_SHDW_SCR5_DLLAPD;
 
-        tg3_writephy(tp, MII_TG3_MISC_SHDW, reg);
+        tg3_phy_shdw_write(tp, MII_TG3_MISC_SHDW_SCR5_SEL, reg);
 
 
-        reg = MII_TG3_MISC_SHDW_WREN |
-              MII_TG3_MISC_SHDW_APD_SEL |
-              MII_TG3_MISC_SHDW_APD_WKTM_84MS;
+        reg = MII_TG3_MISC_SHDW_APD_WKTM_84MS;
         if (enable)
                 reg |= MII_TG3_MISC_SHDW_APD_ENABLE;
 
-        tg3_writephy(tp, MII_TG3_MISC_SHDW, reg);
+        tg3_phy_shdw_write(tp, MII_TG3_MISC_SHDW_APD_SEL, reg);
 }
 
 static void tg3_phy_toggle_automdix(struct tg3 *tp, bool enable)
@@ -4027,7 +4041,7 @@ static int tg3_power_down_prepare(struct tg3 *tp)
                         struct phy_device *phydev;
                         u32 phyid, advertising;
 
-                        phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                        phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
                         tp->phy_flags |= TG3_PHYFLG_IS_LOW_POWER;
 
@@ -6848,12 +6862,6 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
                         pci_unmap_single(tp->pdev, dma_addr, skb_size,
                                          PCI_DMA_FROMDEVICE);
 
-                        skb = build_skb(data, frag_size);
-                        if (!skb) {
-                                tg3_frag_free(frag_size != 0, data);
-                                goto drop_it_no_recycle;
-                        }
-                        skb_reserve(skb, TG3_RX_OFFSET(tp));
                         /* Ensure that the update to the data happens
                          * after the usage of the old DMA mapping.
                          */
@@ -6861,6 +6869,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget)
 
                         ri->data = NULL;
 
+                        skb = build_skb(data, frag_size);
+                        if (!skb) {
+                                tg3_frag_free(frag_size != 0, data);
+                                goto drop_it_no_recycle;
+                        }
+                        skb_reserve(skb, TG3_RX_OFFSET(tp));
                 } else {
                         tg3_recycle_rx(tnapi, tpr, opaque_key,
                                        desc_idx, *post_ptr);
@@ -9196,10 +9210,7 @@ static int tg3_halt(struct tg3 *tp, int kind, bool silent)
                 memset(tp->hw_stats, 0, sizeof(struct tg3_hw_stats));
         }
 
-        if (err)
-                return err;
-
-        return 0;
+        return err;
 }
 
 static int tg3_set_mac_addr(struct net_device *dev, void *p)
@@ -11035,7 +11046,18 @@ static int tg3_request_irq(struct tg3 *tp, int irq_num)
                 name = tp->dev->name;
         else {
                 name = &tnapi->irq_lbl[0];
-                snprintf(name, IFNAMSIZ, "%s-%d", tp->dev->name, irq_num);
+                if (tnapi->tx_buffers && tnapi->rx_rcb)
+                        snprintf(name, IFNAMSIZ,
+                                 "%s-txrx-%d", tp->dev->name, irq_num);
+                else if (tnapi->tx_buffers)
+                        snprintf(name, IFNAMSIZ,
+                                 "%s-tx-%d", tp->dev->name, irq_num);
+                else if (tnapi->rx_rcb)
+                        snprintf(name, IFNAMSIZ,
+                                 "%s-rx-%d", tp->dev->name, irq_num);
+                else
+                        snprintf(name, IFNAMSIZ,
+                                 "%s-%d", tp->dev->name, irq_num);
                 name[IFNAMSIZ-1] = 0;
         }
 
@@ -11907,7 +11929,7 @@ static int tg3_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 struct phy_device *phydev;
                 if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
-                phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                phydev = tp->mdio_bus->phy_map[tp->phy_addr];
                 return phy_ethtool_gset(phydev, cmd);
         }
 
@@ -11974,7 +11996,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
                 struct phy_device *phydev;
                 if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
-                phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                phydev = tp->mdio_bus->phy_map[tp->phy_addr];
                 return phy_ethtool_sset(phydev, cmd);
         }
 
@@ -12093,12 +12115,10 @@ static int tg3_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 
         device_set_wakeup_enable(dp, wol->wolopts & WAKE_MAGIC);
 
-        spin_lock_bh(&tp->lock);
         if (device_may_wakeup(dp))
                 tg3_flag_set(tp, WOL_ENABLE);
         else
                 tg3_flag_clear(tp, WOL_ENABLE);
-        spin_unlock_bh(&tp->lock);
 
         return 0;
 }
@@ -12131,7 +12151,7 @@ static int tg3_nway_reset(struct net_device *dev)
         if (tg3_flag(tp, USE_PHYLIB)) {
                 if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
-                r = phy_start_aneg(tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR]);
+                r = phy_start_aneg(tp->mdio_bus->phy_map[tp->phy_addr]);
         } else {
                 u32 bmcr;
 
@@ -12247,7 +12267,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam
                 u32 newadv;
                 struct phy_device *phydev;
 
-                phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                phydev = tp->mdio_bus->phy_map[tp->phy_addr];
 
                 if (!(phydev->supported & SUPPORTED_Pause) ||
                     (!(phydev->supported & SUPPORTED_Asym_Pause) &&
@@ -13194,8 +13214,8 @@ static int tg3_run_loopback(struct tg3 *tp, u32 pktsz, bool tso_loopback)
                 return -ENOMEM;
 
         tx_data = skb_put(skb, tx_len);
-        memcpy(tx_data, tp->dev->dev_addr, 6);
-        memset(tx_data + 6, 0x0, 8);
+        memcpy(tx_data, tp->dev->dev_addr, ETH_ALEN);
+        memset(tx_data + ETH_ALEN, 0x0, 8);
 
         tw32(MAC_RX_MTU_SIZE, tx_len + ETH_FCS_LEN);
 
@@ -13683,7 +13703,7 @@ static int tg3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                 struct phy_device *phydev;
                 if (!(tp->phy_flags & TG3_PHYFLG_IS_CONNECTED))
                         return -EAGAIN;
-                phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                phydev = tp->mdio_bus->phy_map[tp->phy_addr];
                 return phy_mii_ioctl(phydev, ifr, cmd);
         }
 
@@ -14921,6 +14941,12 @@ static void tg3_get_eeprom_hw_cfg(struct tg3 *tp)
                             tg3_chip_rev_id(tp) != CHIPREV_ID_5750_A1)
                                 tp->led_ctrl |= (LED_CTRL_MODE_PHY_1 |
                                                  LED_CTRL_MODE_PHY_2);
+
+                        if (tg3_flag(tp, 5717_PLUS) ||
+                            tg3_asic_rev(tp) == ASIC_REV_5762)
+                                tp->led_ctrl |= LED_CTRL_BLINK_RATE_OVERRIDE |
+                                                LED_CTRL_BLINK_RATE_MASK;
+
                         break;
 
                 case SHASTA_EXT_LED_MAC:
@@ -15759,9 +15785,12 @@ static void tg3_detect_asic_rev(struct tg3 *tp, u32 misc_ctrl_reg)
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
                     tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
-                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727)
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
+                    tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787)
                         reg = TG3PCI_GEN2_PRODID_ASICREV;
                 else if (tp->pdev->device == TG3PCI_DEVICE_TIGON3_57781 ||
                          tp->pdev->device == TG3PCI_DEVICE_TIGON3_57785 ||
@@ -16632,8 +16661,8 @@ static int tg3_get_macaddr_sparc(struct tg3 *tp)
         int len;
 
         addr = of_get_property(dp, "local-mac-address", &len);
-        if (addr && len == 6) {
-                memcpy(dev->dev_addr, addr, 6);
+        if (addr && len == ETH_ALEN) {
+                memcpy(dev->dev_addr, addr, ETH_ALEN);
                 return 0;
         }
         return -ENODEV;
@@ -16643,7 +16672,7 @@ static int tg3_get_default_macaddr_sparc(struct tg3 *tp)
 {
         struct net_device *dev = tp->dev;
 
-        memcpy(dev->dev_addr, idprom->id_ethaddr, 6);
+        memcpy(dev->dev_addr, idprom->id_ethaddr, ETH_ALEN);
         return 0;
 }
 #endif
@@ -17052,10 +17081,6 @@ static int tg3_test_dma(struct tg3 *tp)
 
         tw32(TG3PCI_DMA_RW_CTRL, tp->dma_rwctrl);
 
-#if 0
-        /* Unneeded, already done by tg3_get_invariants.  */
-        tg3_switch_clocks(tp);
-#endif
 
         if (tg3_asic_rev(tp) != ASIC_REV_5700 &&
             tg3_asic_rev(tp) != ASIC_REV_5701)
@@ -17083,20 +17108,6 @@ static int tg3_test_dma(struct tg3 *tp)
                         break;
                 }
 
-#if 0
-                /* validate data reached card RAM correctly. */
-                for (i = 0; i < TEST_BUFFER_SIZE / sizeof(u32); i++) {
-                        u32 val;
-                        tg3_read_mem(tp, 0x2100 + (i*4), &val);
-                        if (le32_to_cpu(val) != p[i]) {
-                                dev_err(&tp->pdev->dev,
-                                        "%s: Buffer corrupted on device! "
-                                        "(%d != %d)\n", __func__, val, i);
-                                /* ret = -ENODEV here? */
-                        }
-                        p[i] = 0;
-                }
-#endif
                 /* Now read it back. */
                 ret = tg3_do_test_dma(tp, buf, buf_dma, TEST_BUFFER_SIZE, false);
                 if (ret) {
@@ -17362,8 +17373,10 @@ static int tg3_init_one(struct pci_dev *pdev,
                         tg3_flag_set(tp, FLUSH_POSTED_WRITES);
                 if (ssb_gige_one_dma_at_once(pdev))
                         tg3_flag_set(tp, ONE_DMA_AT_ONCE);
-                if (ssb_gige_have_roboswitch(pdev))
+                if (ssb_gige_have_roboswitch(pdev)) {
+                        tg3_flag_set(tp, USE_PHYLIB);
                         tg3_flag_set(tp, ROBOSWITCH);
+                }
                 if (ssb_gige_is_rgmii(pdev))
                         tg3_flag_set(tp, RGMII_MODE);
         }
@@ -17409,9 +17422,12 @@ static int tg3_init_one(struct pci_dev *pdev,
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_5719 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_5720 ||
+            tp->pdev->device == TG3PCI_DEVICE_TIGON3_57767 ||
+            tp->pdev->device == TG3PCI_DEVICE_TIGON3_57764 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_5762 ||
             tp->pdev->device == TG3PCI_DEVICE_TIGON3_5725 ||
-            tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727) {
+            tp->pdev->device == TG3PCI_DEVICE_TIGON3_5727 ||
+            tp->pdev->device == TG3PCI_DEVICE_TIGON3_57787) {
                 tg3_flag_set(tp, ENABLE_APE);
                 tp->aperegs = pci_ioremap_bar(pdev, BAR_2);
                 if (!tp->aperegs) {
@@ -17628,7 +17644,7 @@ static int tg3_init_one(struct pci_dev *pdev,
 
         if (tp->phy_flags & TG3_PHYFLG_IS_CONNECTED) {
                 struct phy_device *phydev;
-                phydev = tp->mdio_bus->phy_map[TG3_PHY_MII_ADDR];
+                phydev = tp->mdio_bus->phy_map[tp->phy_addr];
                 netdev_info(dev,
                             "attached PHY driver [%s] (mii_bus:phy_addr=%s)\n",
                             phydev->drv->name, dev_name(&phydev->dev));
@@ -17685,7 +17701,6 @@ err_out_free_res:
 err_out_disable_pdev:
         if (pci_is_enabled(pdev))
                 pci_disable_device(pdev);
-        pci_set_drvdata(pdev, NULL);
         return err;
 }
 
@@ -17717,7 +17732,6 @@ static void tg3_remove_one(struct pci_dev *pdev)
                 free_netdev(dev);
                 pci_release_regions(pdev);
                 pci_disable_device(pdev);
-                pci_set_drvdata(pdev, NULL);
         }
 }