From a1c09d24eaf28df82480b649711544a8b9359e53 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 24 Oct 2022 12:03:25 +0200 Subject: [PATCH] drop queue-5.4/r8152-factor-out-oob-link-list-waits.patch incorrect patch --- ...r8152-factor-out-oob-link-list-waits.patch | 184 ------------------ 1 file changed, 184 deletions(-) delete mode 100644 queue-5.4/r8152-factor-out-oob-link-list-waits.patch diff --git a/queue-5.4/r8152-factor-out-oob-link-list-waits.patch b/queue-5.4/r8152-factor-out-oob-link-list-waits.patch deleted file mode 100644 index 7d6d18b5ac8..00000000000 --- a/queue-5.4/r8152-factor-out-oob-link-list-waits.patch +++ /dev/null @@ -1,184 +0,0 @@ -From f168a7d4fb7a1b3928684caa4ce770c317fb3411 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 1 Oct 2019 01:35:57 -0700 -Subject: r8152: Factor out OOB link list waits - -From: Prashant Malani - -[ 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: Prashant Malani -Reviewed-by: Grant Grundler -Acked-by: Hayes Wang -Signed-off-by: David S. Miller -Stable-dep-of: c5783af35468 ("sh: machvec: Use char[] for section boundaries") -Signed-off-by: Sasha Levin ---- - drivers/net/usb/r8152.c | 73 ++++++++++++----------------------------- - 1 file changed, 21 insertions(+), 52 deletions(-) - -diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 873f288e7cec..9042db982a08 100644 ---- a/drivers/net/usb/r8152.c -+++ b/drivers/net/usb/r8152.c -@@ -3367,11 +3367,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); -@@ -3389,23 +3401,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); - -@@ -3447,7 +3449,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; -@@ -3459,23 +3460,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); - -@@ -3700,7 +3691,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); -@@ -3720,23 +3710,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); - -@@ -3761,7 +3741,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; -@@ -3770,23 +3749,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); --- -2.35.1 - -- 2.47.3