Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b54d24 authored Oct 29, 2009 by Stephen Hemminger Committed by David S. Miller Oct 29, 2009

sky2: fix receive pause thresholds



Program the receive pause thresholds differently depending on
chip version. This cloned from from the vendor (GPL) driver.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e91cd2e6

drivers/net/sky2.c

+8 −2

Original line number	Original line	Diff line number	Diff line
	@@ -926,8 +926,14 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)

	/* On chips without ram buffer, pause is controled by MAC level */		/* On chips without ram buffer, pause is controled by MAC level */
	if (!(hw->flags & SKY2_HW_RAM_BUFFER)) {		if (!(hw->flags & SKY2_HW_RAM_BUFFER)) {
	sky2_write8(hw, SK_REG(port, RX_GMF_LP_THR), 768/8);		/* Pause threshold is scaled by 8 in bytes */
	sky2_write8(hw, SK_REG(port, RX_GMF_UP_THR), 1024/8);		if (hw->chip_id == CHIP_ID_YUKON_FE_P
			&& hw->chip_rev == CHIP_REV_YU_FE2_A0)
			reg = 1568 / 8;
			else
			reg = 1024 / 8;
			sky2_write16(hw, SK_REG(port, RX_GMF_UP_THR), reg);
			sky2_write16(hw, SK_REG(port, RX_GMF_LP_THR), 768 / 8);

	sky2_set_tx_stfwd(hw, port);		sky2_set_tx_stfwd(hw, port);
	}		}

drivers/net/sky2.h

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -808,10 +808,11 @@ enum {
	RX_GMF_AF_THR = 0x0c44,/* 32 bit Rx GMAC FIFO Almost Full Thresh. */		RX_GMF_AF_THR = 0x0c44,/* 32 bit Rx GMAC FIFO Almost Full Thresh. */
	RX_GMF_CTRL_T = 0x0c48,/* 32 bit Rx GMAC FIFO Control/Test */		RX_GMF_CTRL_T = 0x0c48,/* 32 bit Rx GMAC FIFO Control/Test */
	RX_GMF_FL_MSK = 0x0c4c,/* 32 bit Rx GMAC FIFO Flush Mask */		RX_GMF_FL_MSK = 0x0c4c,/* 32 bit Rx GMAC FIFO Flush Mask */
	RX_GMF_FL_THR = 0x0c50,/* 32 bit Rx GMAC FIFO Flush Threshold */		RX_GMF_FL_THR = 0x0c50,/* 16 bit Rx GMAC FIFO Flush Threshold */
			RX_GMF_FL_CTRL = 0x0c52,/* 16 bit Rx GMAC FIFO Flush Control */
	RX_GMF_TR_THR = 0x0c54,/* 32 bit Rx Truncation Threshold (Yukon-2) */		RX_GMF_TR_THR = 0x0c54,/* 32 bit Rx Truncation Threshold (Yukon-2) */
	RX_GMF_UP_THR = 0x0c58,/* 8 bit Rx Upper Pause Thr (Yukon-EC_U) */		RX_GMF_UP_THR = 0x0c58,/* 16 bit Rx Upper Pause Thr (Yukon-EC_U) */
	RX_GMF_LP_THR = 0x0c5a,/* 8 bit Rx Lower Pause Thr (Yukon-EC_U) */		RX_GMF_LP_THR = 0x0c5a,/* 16 bit Rx Lower Pause Thr (Yukon-EC_U) */
	RX_GMF_VLAN = 0x0c5c,/* 32 bit Rx VLAN Type Register (Yukon-2) */		RX_GMF_VLAN = 0x0c5c,/* 32 bit Rx VLAN Type Register (Yukon-2) */
	RX_GMF_WP = 0x0c60,/* 32 bit Rx GMAC FIFO Write Pointer */		RX_GMF_WP = 0x0c60,/* 32 bit Rx GMAC FIFO Write Pointer */