Commit e0c28116 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik

sky2: be more selective about FIFO watchdog

Be more selective about when to enable the ram buffer watchdog code.
It is unnecessary on XL A3 or later revs, and with Yukon FE
the buffer is so small (4K) that the watchdog detects false positives.
Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6d3105d5
...@@ -826,7 +826,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) ...@@ -826,7 +826,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR); sky2_write8(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_RST_CLR);
sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON); sky2_write16(hw, SK_REG(port, TX_GMF_CTRL_T), GMF_OPER_ON);
if (!(hw->flags & SKY2_HW_RAMBUFFER)) { /* On chips without ram buffer, pause is controled by MAC level */
if (sky2_read8(hw, B2_E_0) == 0) {
sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8); sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);
sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8); sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);
...@@ -1281,7 +1282,7 @@ static int sky2_up(struct net_device *dev) ...@@ -1281,7 +1282,7 @@ static int sky2_up(struct net_device *dev)
struct sky2_port *sky2 = netdev_priv(dev); struct sky2_port *sky2 = netdev_priv(dev);
struct sky2_hw *hw = sky2->hw; struct sky2_hw *hw = sky2->hw;
unsigned port = sky2->port; unsigned port = sky2->port;
u32 imask; u32 imask, ramsize;
int cap, err = -ENOMEM; int cap, err = -ENOMEM;
struct net_device *otherdev = hw->dev[sky2->port^1]; struct net_device *otherdev = hw->dev[sky2->port^1];
...@@ -1336,13 +1337,12 @@ static int sky2_up(struct net_device *dev) ...@@ -1336,13 +1337,12 @@ static int sky2_up(struct net_device *dev)
sky2_mac_init(hw, port); sky2_mac_init(hw, port);
if (hw->flags & SKY2_HW_RAMBUFFER) { /* Register is number of 4K blocks on internal RAM buffer. */
/* Register is number of 4K blocks on internal RAM buffer. */ ramsize = sky2_read8(hw, B2_E_0) * 4;
u32 ramsize = sky2_read8(hw, B2_E_0) * 4; if (ramsize > 0) {
u32 rxspace; u32 rxspace;
printk(KERN_DEBUG PFX "%s: ram buffer %dK\n", dev->name, ramsize); pr_debug(PFX "%s: ram buffer %dK\n", dev->name, ramsize);
if (ramsize < 16) if (ramsize < 16)
rxspace = ramsize / 2; rxspace = ramsize / 2;
else else
...@@ -2005,7 +2005,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu) ...@@ -2005,7 +2005,7 @@ static int sky2_change_mtu(struct net_device *dev, int new_mtu)
synchronize_irq(hw->pdev->irq); synchronize_irq(hw->pdev->irq);
if (!(hw->flags & SKY2_HW_RAMBUFFER)) if (sky2_read8(hw, B2_E_0) == 0)
sky2_set_tx_stfwd(hw, port); sky2_set_tx_stfwd(hw, port);
ctl = gma_read16(hw, port, GM_GP_CTRL); ctl = gma_read16(hw, port, GM_GP_CTRL);
...@@ -2536,7 +2536,7 @@ static void sky2_watchdog(unsigned long arg) ...@@ -2536,7 +2536,7 @@ static void sky2_watchdog(unsigned long arg)
++active; ++active;
/* For chips with Rx FIFO, check if stuck */ /* For chips with Rx FIFO, check if stuck */
if ((hw->flags & SKY2_HW_RAMBUFFER) && if ((hw->flags & SKY2_HW_FIFO_HANG_CHECK) &&
sky2_rx_hung(dev)) { sky2_rx_hung(dev)) {
pr_info(PFX "%s: receiver hang detected\n", pr_info(PFX "%s: receiver hang detected\n",
dev->name); dev->name);
...@@ -2694,8 +2694,10 @@ static int __devinit sky2_init(struct sky2_hw *hw) ...@@ -2694,8 +2694,10 @@ static int __devinit sky2_init(struct sky2_hw *hw)
switch(hw->chip_id) { switch(hw->chip_id) {
case CHIP_ID_YUKON_XL: case CHIP_ID_YUKON_XL:
hw->flags = SKY2_HW_GIGABIT hw->flags = SKY2_HW_GIGABIT
| SKY2_HW_NEWER_PHY | SKY2_HW_NEWER_PHY;
| SKY2_HW_RAMBUFFER; if (hw->chip_rev < 3)
hw->flags |= SKY2_HW_FIFO_HANG_CHECK;
break; break;
case CHIP_ID_YUKON_EC_U: case CHIP_ID_YUKON_EC_U:
...@@ -2721,11 +2723,10 @@ static int __devinit sky2_init(struct sky2_hw *hw) ...@@ -2721,11 +2723,10 @@ static int __devinit sky2_init(struct sky2_hw *hw)
dev_err(&hw->pdev->dev, "unsupported revision Yukon-EC rev A1\n"); dev_err(&hw->pdev->dev, "unsupported revision Yukon-EC rev A1\n");
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
hw->flags = SKY2_HW_GIGABIT | SKY2_HW_RAMBUFFER; hw->flags = SKY2_HW_GIGABIT | SKY2_HW_FIFO_HANG_CHECK;
break; break;
case CHIP_ID_YUKON_FE: case CHIP_ID_YUKON_FE:
hw->flags = SKY2_HW_RAMBUFFER;
break; break;
case CHIP_ID_YUKON_FE_P: case CHIP_ID_YUKON_FE_P:
......
...@@ -2063,7 +2063,7 @@ struct sky2_hw { ...@@ -2063,7 +2063,7 @@ struct sky2_hw {
#define SKY2_HW_FIBRE_PHY 0x00000002 #define SKY2_HW_FIBRE_PHY 0x00000002
#define SKY2_HW_GIGABIT 0x00000004 #define SKY2_HW_GIGABIT 0x00000004
#define SKY2_HW_NEWER_PHY 0x00000008 #define SKY2_HW_NEWER_PHY 0x00000008
#define SKY2_HW_RAMBUFFER 0x00000010 /* chip has RAM FIFO */ #define SKY2_HW_FIFO_HANG_CHECK 0x00000010
#define SKY2_HW_NEW_LE 0x00000020 /* new LSOv2 format */ #define SKY2_HW_NEW_LE 0x00000020 /* new LSOv2 format */
#define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */ #define SKY2_HW_AUTO_TX_SUM 0x00000040 /* new IP decode for Tx */
#define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */ #define SKY2_HW_ADV_POWER_CTL 0x00000080 /* additional PHY power regs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment