From 4b5dc1a94d4f92b5845e98bd9ae344b26d933aad Mon Sep 17 00:00:00 2001

From: Hayes Wang <hayeswang@realtek.com>

Date: Wed, 3 Mar 2021 16:39:47 +0800

Subject: [PATCH] Revert "r8152: adjust the settings about MAC clock speed down

 for RTL8153"

Git-commit: 4b5dc1a94d4f92b5845e98bd9ae344b26d933aad

References: git-fixes

Patch-mainline: v5.12-rc3

This reverts commit 134f98bcf1b898fb9d6f2b91bc85dd2e5478b4b8.

The r8153_mac_clk_spd() is used for RTL8153A only, because the register

table of RTL8153B is different from RTL8153A. However, this function would

be called when RTL8153B calls r8153_first_init() and r8153_enter_oob().

That causes RTL8153B becomes unstable when suspending and resuming. The

worst case may let the device stop working.

Besides, revert this commit to disable MAC clock speed down for RTL8153A.

It would avoid the known issue when enabling U1. The data of the first

control transfer may be wrong when exiting U1.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Oliver Neukum <oneukum@suse.com>

---

 drivers/net/usb/r8152.c |   35 ++++++-----------------------------

 1 file changed, 6 insertions(+), 29 deletions(-)

--- a/drivers/net/usb/r8152.c

+++ b/drivers/net/usb/r8152.c

@@ -2746,29 +2746,6 @@ static void __rtl_set_wol(struct r8152 *

 		device_set_wakeup_enable(&tp->udev->dev, false);

 }

-static void r8153_mac_clk_spd(struct r8152 *tp, bool enable)

-{

-	/* MAC clock speed down */

-	if (enable) {

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL,

-			       ALDPS_SPDWN_RATIO);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2,

-			       EEE_SPDWN_RATIO);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3,

-			       PKT_AVAIL_SPDWN_EN | SUSPEND_SPDWN_EN |

-			       U1U2_SPDWN_EN | L1_SPDWN_EN);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4,

-			       PWRSAVE_SPDWN_EN | RXDV_SPDWN_EN | TX10MIDLE_EN |

-			       TP100_SPDWN_EN | TP500_SPDWN_EN | EEE_SPDWN_EN |

-			       TP1000_SPDWN_EN);

-	} else {

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);

-		ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);

-	}

-}

-

 static void r8153_u1u2en(struct r8152 *tp, bool enable)

 {

 	u8 u1u2[8];

@@ -3004,11 +2981,9 @@ static void rtl8153_runtime_enable(struc

 	if (enable) {

 		r8153_u1u2en(tp, false);

 		r8153_u2p3en(tp, false);

-		r8153_mac_clk_spd(tp, true);

 		rtl_runtime_suspend_enable(tp, true);

 	} else {

 		rtl_runtime_suspend_enable(tp, false);

-		r8153_mac_clk_spd(tp, false);

 		switch (tp->version) {

 		case RTL_VER_03:

@@ -3603,7 +3578,6 @@ static void r8153_first_init(struct r815

 	u32 ocp_data;

 	int i;

-	r8153_mac_clk_spd(tp, false);

 	rxdy_gated_en(tp, true);

 	r8153_teredo_off(tp);

@@ -3665,8 +3639,6 @@ static void r8153_enter_oob(struct r8152

 	u32 ocp_data;

 	int i;

-	r8153_mac_clk_spd(tp, true);

-

 	ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL);

 	ocp_data &= ~NOW_IS_OOB;

 	ocp_write_byte(tp, MCU_TYPE_PLA, PLA_OOB_CTRL, ocp_data);

@@ -4378,10 +4350,15 @@ static void r8153_init(struct r8152 *tp)

 	ocp_write_word(tp, MCU_TYPE_USB, USB_CONNECT_TIMER, 0x0001);

+	/* MAC clock speed down */

+	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL, 0);

+	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL2, 0);

+	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL3, 0);

+	ocp_write_word(tp, MCU_TYPE_PLA, PLA_MAC_PWR_CTRL4, 0);

+

 	r8153_power_cut_en(tp, false);

 	rtl_runtime_suspend_enable(tp, false);

 	r8153_u1u2en(tp, true);

-	r8153_mac_clk_spd(tp, false);

 	usb_enable_lpm(tp->udev);

 	ocp_data = ocp_read_byte(tp, MCU_TYPE_PLA, PLA_CONFIG6);