From: Stephen Hemminger Date: Tue, 27 Nov 2007 19:02:07 +0000 (-0800) Subject: sky2: turn of dynamic Tx watermark workaround (FE+ only) X-Git-Tag: v2.6.24-rc4~9^2~6 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e970d1f8106514ea619d7a9005b1dc92c6049b32;p=linux-2.6 sky2: turn of dynamic Tx watermark workaround (FE+ only) Add workaround for issues FE+ (A0) transmit watermark. This is copied verbatim from vendor driver sk98lin (10.22.4.3). Don't have that chip version and no more information seems to be available. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index a42f1c7ac1..3d1dfc9484 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -845,6 +845,13 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) sky2_set_tx_stfwd(hw, port); } + if (hw->chip_id == CHIP_ID_YUKON_FE_P && + hw->chip_rev == CHIP_REV_YU_FE2_A0) { + /* disable dynamic watermark */ + reg = sky2_read16(hw, SK_REG(port, TX_GMF_EA)); + reg &= ~TX_DYN_WM_ENA; + sky2_write16(hw, SK_REG(port, TX_GMF_EA), reg); + } } /* Assign Ram Buffer allocation to queue */