r8169: Align ASPM/CLKREQ setting function with vendor driver

khfeng · davem330 · commit 94235460f9ea · 2018-09-17T18:45:55.000-07:00
There's a small delay after setting ASPM in vendor drivers, r8101 and
r8168.
In addition, those drivers enable ASPM before ClkReq, also change that
to align with vendor driver.

I haven't seen anything bad becasue of this, but I think it's better to
keep in sync with vendor driver.

Signed-off-by: Kai-Heng Feng &lt;kai.heng.feng@canonical.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
@@ -4775,12 +4775,14 @@ static void rtl_pcie_state_l2l3_enable(struct rtl8169_private *tp, bool enable)
 static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
 {
 	if (enable) {
-		RTL_W8(tp, Config2, RTL_R8(tp, Config2) | ClkReqEn);
 		RTL_W8(tp, Config5, RTL_R8(tp, Config5) | ASPM_en);
+		RTL_W8(tp, Config2, RTL_R8(tp, Config2) | ClkReqEn);
 	} else {
 		RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~ClkReqEn);
 		RTL_W8(tp, Config5, RTL_R8(tp, Config5) & ~ASPM_en);
 	}
+
+	udelay(10);
 }
 
 static void rtl_hw_start_8168bb(struct rtl8169_private *tp)

Original file line number	Diff line number	Diff line change
`@@ -4775,12 +4775,14 @@ static void rtl_pcie_state_l2l3_enable(struct rtl8169_private *tp, bool enable)`
`4775`	`4775`	`static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)`
`4776`	`4776`	`{`
`4777`	`4777`	`if (enable) {`
`4778`		`- RTL_W8(tp, Config2, RTL_R8(tp, Config2) \| ClkReqEn);`
`4779`	`4778`	`RTL_W8(tp, Config5, RTL_R8(tp, Config5) \| ASPM_en);`
	`4779`	`+ RTL_W8(tp, Config2, RTL_R8(tp, Config2) \| ClkReqEn);`
`4780`	`4780`	`} else {`
`4781`	`4781`	`RTL_W8(tp, Config2, RTL_R8(tp, Config2) & ~ClkReqEn);`
`4782`	`4782`	`RTL_W8(tp, Config5, RTL_R8(tp, Config5) & ~ASPM_en);`
`4783`	`4783`	`}`
	`4784`	`+`
	`4785`	`+ udelay(10);`
`4784`	`4786`	`}`
`4785`	`4787`
`4786`	`4788`	`static void rtl_hw_start_8168bb(struct rtl8169_private *tp)`