| Message ID | 20180912065821.7198-1-kai.heng.feng@canonical.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [1/2] r8169: Align ASPM/CLKREQ setting function with vendor driver | expand |
From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Wed, 12 Sep 2018 14:58:20 +0800 > 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 <kai.heng.feng@canonical.com> I want Heiner Kallweit to review these before I apply them. Thanks.
From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Wed, 12 Sep 2018 14:58:20 +0800 > 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 <kai.heng.feng@canonical.com> Applied.
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index b08d51bf7a20..5091e9fd601f 100644 --- 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)
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 <kai.heng.feng@canonical.com> --- drivers/net/ethernet/realtek/r8169.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)