Commit 6e10001c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8152-fixes' 



Hayes Wang says:

====================
r8152: fix flow control settings

These patches fix the settings of RX FIFO about flow control.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3c53cd65 b75d6120

drivers/net/usb/r8152.c

+12 −15
Original line number Diff line number Diff line
@@ -5906,6 +5906,11 @@ static void r8153_enter_oob(struct r8152 *tp) 
	ocp_data &= ~NOW_IS_OOB;

	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);



	/* RX FIFO settings for OOB */

	ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL0, RXFIFO_THR1_OOB);

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL1, RXFIFO_THR2_OOB);

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_CTRL2, RXFIFO_THR3_OOB);



	rtl_disable(tp);

	rtl_reset_bmu(tp);
@@ -6431,21 +6436,8 @@ static void r8156_fc_parameter(struct r8152 *tp) 
	u32 pause_on = tp->fc_pause_on ? tp->fc_pause_on : fc_pause_on_auto(tp);

	u32 pause_off = tp->fc_pause_off ? tp->fc_pause_off : fc_pause_off_auto(tp);



	switch (tp->version) {

	case RTL_VER_10:

	case RTL_VER_11:

		ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, pause_on / 8);

		ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, pause_off / 8);

		break;

	case RTL_VER_12:

	case RTL_VER_13:

	case RTL_VER_15:

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, pause_on / 16);

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, pause_off / 16);

		break;

	default:

		break;

	}

}



static void rtl8156_change_mtu(struct r8152 *tp)
@@ -6557,6 +6549,11 @@ static void rtl8156_down(struct r8152 *tp) 
	ocp_data &= ~NOW_IS_OOB;

	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);



	/* RX FIFO settings for OOB */

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RXFIFO_FULL, 64 / 16);

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_FULL, 1024 / 16);

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RX_FIFO_EMPTY, 4096 / 16);



	rtl_disable(tp);

	rtl_reset_bmu(tp);