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

Commit c9fe713b authored by Prashant Malani's avatar Prashant Malani Committed by Greg Kroah-Hartman
Browse files

r8152: Factor out OOB link list waits 



[ Upstream commit 5f71c84038d39def573744a145c573758f52a949 ]

The same for-loop check for the LINK_LIST_READY bit of an OOB_CTRL
register is used in several places. Factor these out into a single
function to reduce the lines of code.

Change-Id: I20e8f327045a72acc0a83e2d145ae2993ab62915
Signed-off-by: default avatarPrashant Malani <pmalani@chromium.org>
Reviewed-by: default avatarGrant Grundler <grundler@chromium.org>
Acked-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: a699781c79ec ("ethtool: check device is present when getting link settings")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 902e15c9

drivers/net/usb/r8152.c

+21 −52
Original line number Diff line number Diff line
@@ -3372,11 +3372,23 @@ static void r8152b_hw_phy_cfg(struct r8152 *tp) 
	set_bit(PHY_RESET, &tp->flags);

}



static void r8152b_exit_oob(struct r8152 *tp)

static void wait_oob_link_list_ready(struct r8152 *tp)

{

	u32 ocp_data;

	int i;



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

}



static void r8152b_exit_oob(struct r8152 *tp)

{

	u32 ocp_data;



	ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);

	ocp_data &= ~RCR_ACPT_ALL;

	ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
@@ -3394,23 +3406,13 @@ static void r8152b_exit_oob(struct r8152 *tp) 
	ocp_data &= ~MCU_BORW_EN;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);

	ocp_data |= RE_INIT_LL;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	rtl8152_nic_reset(tp);
@@ -3452,7 +3454,6 @@ static void r8152b_exit_oob(struct r8152 *tp) 
static void r8152b_enter_oob(struct r8152 *tp)

{

	u32 ocp_data;

	int i;



	ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

	ocp_data &= ~NOW_IS_OOB;
@@ -3464,23 +3465,13 @@ static void r8152b_enter_oob(struct r8152 *tp) 


	rtl_disable(tp);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);

	ocp_data |= RE_INIT_LL;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, RTL8152_RMS);
@@ -3705,7 +3696,6 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp) 
static void r8153_first_init(struct r8152 *tp)

{

	u32 ocp_data;

	int i;



	rxdy_gated_en(tp, true);

	r8153_teredo_off(tp);
@@ -3725,23 +3715,13 @@ static void r8153_first_init(struct r8152 *tp) 
	ocp_data &= ~MCU_BORW_EN;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);

	ocp_data |= RE_INIT_LL;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	rtl_rx_vlan_en(tp, tp->netdev->features & NETIF_F_HW_VLAN_CTAG_RX);
@@ -3766,7 +3746,6 @@ static void r8153_first_init(struct r8152 *tp) 
static void r8153_enter_oob(struct r8152 *tp)

{

	u32 ocp_data;

	int i;



	ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

	ocp_data &= ~NOW_IS_OOB;
@@ -3775,23 +3754,13 @@ static void r8153_enter_oob(struct r8152 *tp) 
	rtl_disable(tp);

	rtl_reset_bmu(tp);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7);

	ocp_data |= RE_INIT_LL;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_SFF_STS_7, ocp_data);



	for (i = 0; i < 1000; i++) {

		ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

		if (ocp_data & LINK_LIST_READY)

			break;

		usleep_range(1000, 2000);

	}

	wait_oob_link_list_ready(tp);



	ocp_data = tp->netdev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;

	ocp_write_word(tp, MCU_TYPE_PLA, PLA_RMS, ocp_data);