1 files changed, 124 insertions, 109 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index c10e7f5faa5f..95efdb5bbbe1 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -50,7 +50,7 @@
 #include "sky2.h"
 
 #define DRV_NAME                "sky2"
-#define DRV_VERSION             "1.9"
+#define DRV_VERSION             "1.10"
 #define PFX                     DRV_NAME " "
 
 /*
@@ -96,9 +96,9 @@ static int disable_msi = 0;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
-static int idle_timeout = 100;
+static int idle_timeout = 0;
 module_param(idle_timeout, int, 0);
-MODULE_PARM_DESC(idle_timeout, "Idle timeout workaround for lost interrupts (ms)");
+MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
 
 static const struct pci_device_id sky2_id_table[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, 0x9000) },
@@ -284,6 +284,31 @@ static void sky2_gmac_reset(struct sky2_hw *hw, unsigned port)
         gma_write16(hw, port, GM_RX_CTRL, reg);
 }
 
+/* flow control to advertise bits */
+static const u16 copper_fc_adv[] = {
+        [FC_NONE]       = 0,
+        [FC_TX]         = PHY_M_AN_ASP,
+        [FC_RX]         = PHY_M_AN_PC,
+        [FC_BOTH]       = PHY_M_AN_PC | PHY_M_AN_ASP,
+};
+
+/* flow control to advertise bits when using 1000BaseX */
+static const u16 fiber_fc_adv[] = {
+        [FC_BOTH] = PHY_M_P_BOTH_MD_X,
+        [FC_TX]   = PHY_M_P_ASYM_MD_X,
+        [FC_RX]   = PHY_M_P_SYM_MD_X,
+        [FC_NONE] = PHY_M_P_NO_PAUSE_X,
+};
+
+/* flow control to GMA disable bits */
+static const u16 gm_fc_disable[] = {
+        [FC_NONE] = GM_GPCR_FC_RX_DIS | GM_GPCR_FC_TX_DIS,
+        [FC_TX]   = GM_GPCR_FC_RX_DIS,
+        [FC_RX]   = GM_GPCR_FC_TX_DIS,
+        [FC_BOTH] = 0,
+};
+
+
 static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
 {
         struct sky2_port *sky2 = netdev_priv(hw->dev[port]);
@@ -356,16 +381,7 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
         }
 
-        ctrl = gm_phy_read(hw, port, PHY_MARV_CTRL);
-        if (sky2->autoneg == AUTONEG_DISABLE)
-                ctrl &= ~PHY_CT_ANE;
-        else
-                ctrl |= PHY_CT_ANE;
-
-        ctrl |= PHY_CT_RESET;
-        gm_phy_write(hw, port, PHY_MARV_CTRL, ctrl);
-
-        ctrl = 0;
+        ctrl = PHY_CT_RESET;
         ct1000 = 0;
         adv = PHY_AN_CSMA;
         reg = 0;
@@ -384,20 +400,16 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                                 adv |= PHY_M_AN_10_FD;
                         if (sky2->advertising & ADVERTISED_10baseT_Half)
                                 adv |= PHY_M_AN_10_HD;
+
+                        adv |= copper_fc_adv[sky2->flow_mode];
                 } else {        /* special defines for FIBER (88E1040S only) */
                         if (sky2->advertising & ADVERTISED_1000baseT_Full)
                                 adv |= PHY_M_AN_1000X_AFD;
                         if (sky2->advertising & ADVERTISED_1000baseT_Half)
                                 adv |= PHY_M_AN_1000X_AHD;
-                }
 
-                /* Set Flow-control capabilities */
-                if (sky2->tx_pause && sky2->rx_pause)
-                        adv |= PHY_AN_PAUSE_CAP;        /* symmetric */
-                else if (sky2->rx_pause && !sky2->tx_pause)
-                        adv |= PHY_AN_PAUSE_ASYM | PHY_AN_PAUSE_CAP;
-                else if (!sky2->rx_pause && sky2->tx_pause)
-                        adv |= PHY_AN_PAUSE_ASYM;       /* local */
+                        adv |= fiber_fc_adv[sky2->flow_mode];
+                }
 
                 /* Restart Auto-negotiation */
                 ctrl |= PHY_CT_ANE | PHY_CT_RE_CFG;
@@ -422,25 +434,17 @@ static void sky2_phy_init(struct sky2_hw *hw, unsigned port)
                 if (sky2->duplex == DUPLEX_FULL) {
                         reg |= GM_GPCR_DUP_FULL;
                         ctrl |= PHY_CT_DUP_MD;
-                } else if (sky2->speed != SPEED_1000 && hw->chip_id != CHIP_ID_YUKON_EC_U) {
-                        /* Turn off flow control for 10/100mbps */
-                        sky2->rx_pause = 0;
-                        sky2->tx_pause = 0;
-                }
+                } else if (sky2->speed < SPEED_1000)
+                        sky2->flow_mode = FC_NONE;
 
-                if (!sky2->rx_pause)
-                        reg |= GM_GPCR_FC_RX_DIS;
 
-                if (!sky2->tx_pause)
-                        reg |= GM_GPCR_FC_TX_DIS;
+                reg |= gm_fc_disable[sky2->flow_mode];
 
                 /* Forward pause packets to GMAC? */
-                if (sky2->tx_pause || sky2->rx_pause)
+                if (sky2->flow_mode & FC_RX)
                         sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
                 else
                         sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
-
-                ctrl |= PHY_CT_RESET;
         }
 
         gma_write16(hw, port, GM_GP_CTRL, reg);
@@ -695,16 +699,10 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
 
 }
 
-/* Assign Ram Buffer allocation.
- * start and end are in units of 4k bytes
- * ram registers are in units of 64bit words
- */
-static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk)
+/* Assign Ram Buffer allocation in units of 64bit (8 bytes) */
+static void sky2_ramset(struct sky2_hw *hw, u16 q, u32 start, u32 end)
 {
-        u32 start, end;
-
-        start = startk * 4096/8;
-        end = (endk * 4096/8) - 1;
+        pr_debug(PFX "q %d %#x %#x\n", q, start, end);
 
         sky2_write8(hw, RB_ADDR(q, RB_CTRL), RB_RST_CLR);
         sky2_write32(hw, RB_ADDR(q, RB_START), start);
@@ -713,7 +711,7 @@ static void sky2_ramset(struct sky2_hw *hw, u16 q, u8 startk, u8 endk)
         sky2_write32(hw, RB_ADDR(q, RB_RP), start);
 
         if (q == Q_R1 || q == Q_R2) {
-                u32 space = (endk - startk) * 4096/8;
+                u32 space = end - start + 1;
                 u32 tp = space - space/4;
 
                 /* On receive queue's set the thresholds
@@ -1195,19 +1193,16 @@ static int sky2_up(struct net_device *dev)
 
         sky2_mac_init(hw, port);
 
-        /* Determine available ram buffer space (in 4K blocks).
-         * Note: not sure about the FE setting below yet
-         */
-        if (hw->chip_id == CHIP_ID_YUKON_FE)
-                ramsize = 4;
-        else
-                ramsize = sky2_read8(hw, B2_E_0);
+        /* Determine available ram buffer space in qwords.  */
+        ramsize = sky2_read8(hw, B2_E_0) * 4096/8;
 
-        /* Give transmitter one third (rounded up) */
-        rxspace = ramsize - (ramsize + 2) / 3;
+        if (ramsize > 6*1024/8)
+                rxspace = ramsize - (ramsize + 2) / 3;
+        else
+                rxspace = ramsize / 2;
 
-        sky2_ramset(hw, rxqaddr[port], 0, rxspace);
-        sky2_ramset(hw, txqaddr[port], rxspace, ramsize);
+        sky2_ramset(hw, rxqaddr[port], 0, rxspace-1);
+        sky2_ramset(hw, txqaddr[port], rxspace, ramsize-1);
 
         /* Make sure SyncQ is disabled */
         sky2_write8(hw, RB_ADDR(port == 0 ? Q_XS1 : Q_XS2, RB_CTRL),
@@ -1499,6 +1494,11 @@ static int sky2_down(struct net_device *dev)
         /* Stop more packets from being queued */
         netif_stop_queue(dev);
 
+        /* Disable port IRQ */
+        imask = sky2_read32(hw, B0_IMSK);
+        imask &= ~portirq_msk[port];
+        sky2_write32(hw, B0_IMSK, imask);
+
         sky2_gmac_reset(hw, port);
 
         /* Stop transmitter */
@@ -1549,11 +1549,6 @@ static int sky2_down(struct net_device *dev)
         sky2_write8(hw, SK_REG(port, RX_GMF_CTRL_T), GMF_RST_SET);
         sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_SET);
 
-        /* Disable port IRQ */
-        imask = sky2_read32(hw, B0_IMSK);
-        imask &= ~portirq_msk[port];
-        sky2_write32(hw, B0_IMSK, imask);
-
         sky2_phy_power(hw, port, 0);
 
         /* turn off LED's */
@@ -1605,6 +1600,12 @@ static void sky2_link_up(struct sky2_port *sky2)
         struct sky2_hw *hw = sky2->hw;
         unsigned port = sky2->port;
         u16 reg;
+        static const char *fc_name[] = {
+                [FC_NONE]       = "none",
+                [FC_TX]         = "tx",
+                [FC_RX]         = "rx",
+                [FC_BOTH]       = "both",
+        };
 
         /* enable Rx/Tx */
         reg = gma_read16(hw, port, GM_GP_CTRL);
@@ -1648,8 +1649,7 @@ static void sky2_link_up(struct sky2_port *sky2)
                        "%s: Link is up at %d Mbps, %s duplex, flow control %s\n",
                        sky2->netdev->name, sky2->speed,
                        sky2->duplex == DUPLEX_FULL ? "full" : "half",
-                       (sky2->tx_pause && sky2->rx_pause) ? "both" :
-                       sky2->tx_pause ? "tx" : sky2->rx_pause ? "rx" : "none");
+                       fc_name[sky2->flow_status]);
 }
 
 static void sky2_link_down(struct sky2_port *sky2)
@@ -1664,7 +1664,7 @@ static void sky2_link_down(struct sky2_port *sky2)
         reg &= ~(GM_GPCR_RX_ENA | GM_GPCR_TX_ENA);
         gma_write16(hw, port, GM_GP_CTRL, reg);
 
-        if (sky2->rx_pause && !sky2->tx_pause) {
+        if (sky2->flow_status == FC_RX) {
                 /* restore Asymmetric Pause bit */
                 gm_phy_write(hw, port, PHY_MARV_AUNE_ADV,
                              gm_phy_read(hw, port, PHY_MARV_AUNE_ADV)
@@ -1683,6 +1683,14 @@ static void sky2_link_down(struct sky2_port *sky2)
         sky2_phy_init(hw, port);
 }
 
+static enum flow_control sky2_flow(int rx, int tx)
+{
+        if (rx)
+                return tx ? FC_BOTH : FC_RX;
+        else
+                return tx ? FC_TX : FC_NONE;
+}
+
 static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
 {
         struct sky2_hw *hw = sky2->hw;
@@ -1703,39 +1711,20 @@ static int sky2_autoneg_done(struct sky2_port *sky2, u16 aux)
         }
 
         sky2->speed = sky2_phy_speed(hw, aux);
-        if (sky2->speed == SPEED_1000) {
-                u16 ctl2 = gm_phy_read(hw, port, PHY_MARV_1000T_CTRL);
-                u16 lpa2 = gm_phy_read(hw, port, PHY_MARV_1000T_STAT);
-                if (lpa2  & PHY_B_1000S_MSF) {
-                        printk(KERN_ERR PFX "%s: master/slave fault",
-                               sky2->netdev->name);
-                        return -1;
-                }
-
-                if ((ctl2 & PHY_M_1000C_AFD) && (lpa2 & PHY_B_1000S_LP_FD))
-                        sky2->duplex = DUPLEX_FULL;
-                else
-                        sky2->duplex = DUPLEX_HALF;
-        } else {
-                u16 adv = gm_phy_read(hw, port, PHY_MARV_AUNE_ADV);
-                if ((aux & adv) & PHY_AN_FULL)
-                        sky2->duplex = DUPLEX_FULL;
-                else
-                        sky2->duplex = DUPLEX_HALF;
-        }
+        sky2->duplex = (aux & PHY_M_PS_FULL_DUP) ? DUPLEX_FULL : DUPLEX_HALF;
 
         /* Pause bits are offset (9..8) */
         if (hw->chip_id == CHIP_ID_YUKON_XL || hw->chip_id == CHIP_ID_YUKON_EC_U)
                 aux >>= 6;
 
-        sky2->rx_pause = (aux & PHY_M_PS_RX_P_EN) != 0;
-        sky2->tx_pause = (aux & PHY_M_PS_TX_P_EN) != 0;
+        sky2->flow_status = sky2_flow(aux & PHY_M_PS_RX_P_EN,
+                                      aux & PHY_M_PS_TX_P_EN);
 
-        if (sky2->duplex == DUPLEX_HALF && sky2->speed != SPEED_1000
+        if (sky2->duplex == DUPLEX_HALF && sky2->speed < SPEED_1000
             && hw->chip_id != CHIP_ID_YUKON_EC_U)
-                sky2->rx_pause = sky2->tx_pause = 0;
+                sky2->flow_status = FC_NONE;
 
-        if (sky2->rx_pause || sky2->tx_pause)
+        if (aux & PHY_M_PS_RX_P_EN)
                 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_ON);
         else
                 sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
@@ -1750,13 +1739,13 @@ static void sky2_phy_intr(struct sky2_hw *hw, unsigned port)
         struct sky2_port *sky2 = netdev_priv(dev);
         u16 istatus, phystat;
 
+        if (!netif_running(dev))
+                return;
+
         spin_lock(&sky2->phy_lock);
         istatus = gm_phy_read(hw, port, PHY_MARV_INT_STAT);
         phystat = gm_phy_read(hw, port, PHY_MARV_PHY_STAT);
 
-        if (!netif_running(dev))
-                goto out;
-
         if (netif_msg_intr(sky2))
                 printk(KERN_INFO PFX "%s: phy interrupt status 0x%x 0x%x\n",
                        sky2->netdev->name, istatus, phystat);
@@ -2016,6 +2005,10 @@ oversize:
 
 error:
         ++sky2->net_stats.rx_errors;
+        if (status & GMR_FS_RX_FF_OV) {
+                sky2->net_stats.rx_fifo_errors++;
+                goto resubmit;
+        }
 
         if (netif_msg_rx_err(sky2) && net_ratelimit())
                 printk(KERN_INFO PFX "%s: rx error, status 0x%x length %d\n",
@@ -2027,8 +2020,6 @@ error:
                 sky2->net_stats.rx_frame_errors++;
         if (status & GMR_FS_CRC_ERR)
                 sky2->net_stats.rx_crc_errors++;
-        if (status & GMR_FS_RX_FF_OV)
-                sky2->net_stats.rx_fifo_errors++;
 
         goto resubmit;
 }
@@ -2748,7 +2739,7 @@ static int sky2_nway_reset(struct net_device *dev)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
 
-        if (sky2->autoneg != AUTONEG_ENABLE)
+        if (!netif_running(dev) || sky2->autoneg != AUTONEG_ENABLE)
                 return -EINVAL;
 
         sky2_phy_reinit(sky2);
@@ -2850,6 +2841,14 @@ static int sky2_set_mac_address(struct net_device *dev, void *p)
         return 0;
 }
 
+static void inline sky2_add_filter(u8 filter[8], const u8 *addr)
+{
+        u32 bit;
+
+        bit = ether_crc(ETH_ALEN, addr) & 63;
+        filter[bit >> 3] |= 1 << (bit & 7);
+}
+
 static void sky2_set_multicast(struct net_device *dev)
 {
         struct sky2_port *sky2 = netdev_priv(dev);
@@ -2858,7 +2857,10 @@ static void sky2_set_multicast(struct net_device *dev)
         struct dev_mc_list *list = dev->mc_list;
         u16 reg;
         u8 filter[8];
+        int rx_pause;
+        static const u8 pause_mc_addr[ETH_ALEN] = { 0x1, 0x80, 0xc2, 0x0, 0x0, 0x1 };
 
+        rx_pause = (sky2->flow_status == FC_RX || sky2->flow_status == FC_BOTH);
         memset(filter, 0, sizeof(filter));
 
         reg = gma_read16(hw, port, GM_RX_CTRL);
@@ -2866,18 +2868,19 @@ static void sky2_set_multicast(struct net_device *dev)
 
         if (dev->flags & IFF_PROMISC)   /* promiscuous */
                 reg &= ~(GM_RXCR_UCF_ENA | GM_RXCR_MCF_ENA);
-        else if ((dev->flags & IFF_ALLMULTI) || dev->mc_count > 16)     /* all multicast */
+        else if (dev->flags & IFF_ALLMULTI)
                 memset(filter, 0xff, sizeof(filter));
-        else if (dev->mc_count == 0)    /* no multicast */
+        else if (dev->mc_count == 0 && !rx_pause)
                 reg &= ~GM_RXCR_MCF_ENA;
         else {
                 int i;
                 reg |= GM_RXCR_MCF_ENA;
 
-                for (i = 0; list && i < dev->mc_count; i++, list = list->next) {
-                        u32 bit = ether_crc(ETH_ALEN, list->dmi_addr) & 0x3f;
-                        filter[bit / 8] |= 1 << (bit % 8);
-                }
+                if (rx_pause)
+                        sky2_add_filter(filter, pause_mc_addr);
+
+                for (i = 0; list && i < dev->mc_count; i++, list = list->next)
+                        sky2_add_filter(filter, list->dmi_addr);
         }
 
         gma_write16(hw, port, GM_MC_ADDR_H1,
@@ -2990,8 +2993,20 @@ static void sky2_get_pauseparam(struct net_device *dev,
 {
         struct sky2_port *sky2 = netdev_priv(dev);
 
-        ecmd->tx_pause = sky2->tx_pause;
-        ecmd->rx_pause = sky2->rx_pause;
+        switch (sky2->flow_mode) {
+        case FC_NONE:
+                ecmd->tx_pause = ecmd->rx_pause = 0;
+                break;
+        case FC_TX:
+                ecmd->tx_pause = 1, ecmd->rx_pause = 0;
+                break;
+        case FC_RX:
+                ecmd->tx_pause = 0, ecmd->rx_pause = 1;
+                break;
+        case FC_BOTH:
+                ecmd->tx_pause = ecmd->rx_pause = 1;
+        }
+
         ecmd->autoneg = sky2->autoneg;
 }
 
@@ -3001,10 +3016,10 @@ static int sky2_set_pauseparam(struct net_device *dev,
         struct sky2_port *sky2 = netdev_priv(dev);
 
         sky2->autoneg = ecmd->autoneg;
-        sky2->tx_pause = ecmd->tx_pause != 0;
-        sky2->rx_pause = ecmd->rx_pause != 0;
+        sky2->flow_mode = sky2_flow(ecmd->rx_pause, ecmd->tx_pause);
 
-        sky2_phy_reinit(sky2);
+        if (netif_running(dev))
+                sky2_phy_reinit(sky2);
 
         return 0;
 }
@@ -3234,8 +3249,8 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 
         /* Auto speed and flow control */
         sky2->autoneg = AUTONEG_ENABLE;
-        sky2->tx_pause = 1;
-        sky2->rx_pause = 1;
+        sky2->flow_mode = FC_BOTH;
+
         sky2->duplex = -1;
         sky2->speed = -1;
         sky2->advertising = sky2_supported_modes(hw);
@@ -3326,9 +3341,8 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
 
         if (!hw->msi_detected) {
                 /* MSI test failed, go back to INTx mode */
-                printk(KERN_WARNING PFX "%s: No interrupt was generated using MSI, "
-                       "switching to INTx mode. Please report this failure to "
-                       "the PCI maintainer and include system chipset information.\n",
+                printk(KERN_INFO PFX "%s: No interrupt generated using MSI, "
+                       "switching to INTx mode.\n",
                        pci_name(pdev));
 
                 err = -EOPNOTSUPP;
@@ -3336,6 +3350,7 @@ static int __devinit sky2_test_msi(struct sky2_hw *hw)
         }
 
         sky2_write32(hw, B0_IMSK, 0);
+        sky2_read32(hw, B0_IMSK);
 
         free_irq(pdev->irq, hw);