Re: [PATCH net-next] r8169: enable internal ASPM and clock request settings

From: Francois Romieu
Date: Thu Nov 01 2012 - 18:43:31 EST


Hayes Wang <hayeswang@xxxxxxxxxxx> :
> The following chips need to enable internal settings to let ASPM
> and clock request work.

No objection, you know better than me.

[...]
> @@ -5145,7 +5146,10 @@ static void rtl_hw_start_8168g_1(struct rtl8169_private *tp)
>
> RTL_W8(ChipCmd, CmdTxEnb | CmdRxEnb);
> RTL_W32(MISC, RTL_R32(MISC) & ~RXDV_GATED_EN);
> + RTL_W32(MISC, RTL_R32(MISC) | FORCE_CLK);

I wonder if those could had been merged.

[...]
> @@ -5407,7 +5417,10 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp)
> /* Force LAN exit from ASPM if Rx/Tx are not idle */
> RTL_W32(FuncEvent, RTL_R32(FuncEvent) | 0x002800);
>
> - RTL_W32(MISC, (RTL_R32(MISC) | DISABLE_LAN_EN) & ~EARLY_TALLY_EN);
> + RTL_W32(MISC, RTL_R32(MISC) & ~EARLY_TALLY_EN);
> + RTL_W32(MISC, RTL_R32(MISC) | DISABLE_LAN_EN | FORCE_CLK);

As well as those.

--
Ueimor
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/