diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-09-26 11:57:39 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 17:56:31 -0400 |
| commit | c2716fb407ebaab7a09888cc8e4a2b9dfac20416 (patch) | |
| tree | 4de0edffecdc7d5e102cd89fcac542a8c3dcf5b7 /drivers/net/sky2.c | |
| parent | 91aeb3edbcf4e6ed72d138ac8c22fd68e6d717c3 (diff) | |
| download | lwn-c2716fb407ebaab7a09888cc8e4a2b9dfac20416.tar.gz lwn-c2716fb407ebaab7a09888cc8e4a2b9dfac20416.zip | |
[PATCH] sky2: workarounds for some 88e806x chips
Workarounds for 88e806x chips from the vendor driver.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/sky2.c')
| -rw-r--r-- | drivers/net/sky2.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index d3174ed8e454..00702dd1530e 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -1124,7 +1124,8 @@ static int sky2_up(struct net_device *dev) sky2_qset(hw, txqaddr[port]); /* Set almost empty threshold */ - if (hw->chip_id == CHIP_ID_YUKON_EC_U && hw->chip_rev == 1) + if (hw->chip_id == CHIP_ID_YUKON_EC_U + && hw->chip_rev == CHIP_REV_YU_EC_U_A0) sky2_write16(hw, Q_ADDR(txqaddr[port], Q_AL), 0x1a0); sky2_prefetch_init(hw, txqaddr[port], sky2->tx_le_map, @@ -1443,6 +1444,13 @@ static int sky2_down(struct net_device *dev) sky2_write32(hw, RB_ADDR(txqaddr[port], RB_CTRL), RB_RST_SET | RB_DIS_OP_MD); + /* WA for dev. #4.209 */ + if (hw->chip_id == CHIP_ID_YUKON_EC_U + && hw->chip_rev == CHIP_REV_YU_EC_U_A1) + sky2_write32(hw, SK_REG(port, TX_GMF_CTRL_T), + sky2->speed != SPEED_1000 ? + TX_STFW_ENA : TX_STFW_DIS); + ctrl = gma_read16(hw, port, GM_GP_CTRL); ctrl &= ~(GM_GPCR_TX_ENA | GM_GPCR_RX_ENA); gma_write16(hw, port, GM_GP_CTRL, ctrl); |