Re: [PATCH net 1/1] r8169: workaround for missing extended GigaMAC registers

[Wang YanQing <udknight@gmail.com>]

On Wed, Dec 05, 2012 at 11:34:52PM +0100, Francois Romieu wrote:
> GigaMAC registers have been reported left unitialized in several
> situations:
> - after cold boot from power-off state
> - after S3 resume
> 
> Tweaking rtl_hw_phy_config takes care of both.
> 
> Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
> Cc: Hayes Wang <hayeswang@realtek.com>
> ---
>  drivers/net/ethernet/realtek/r8169.c | 42 ++++++++++++++++++++----------------
>  1 file changed, 24 insertions(+), 18 deletions(-)
> 
>  YanQing and Chun-Yi, can you add your Signed-off-by to this patch ?
>  It contains bits of everybody's work but it does not match any. :o)
> 
>  I apparently play in the safe bios league since I did not notice any
>  difference before or after the patch.
> 
>  Beware, this patch seems to apply to net-next but doing so moves
>  rtl_rar_exgmac_set from rtl8168e_2_hw_phy_config to rtl8168f_hw_phy_config.
> 
>  Hayes, your comments are welcome if any.
> 
> diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
> index 927aa33..b353003 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -3096,6 +3096,23 @@ static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp)
>  	rtl_writephy(tp, 0x0d, 0x0000);
>  }
>  
> +static void rtl_rar_exgmac_set(struct rtl8169_private *tp, u8 *addr)
> +{
> +	const u16 w[] = {
> +		addr[0] | (addr[1] << 8),
> +		addr[2] | (addr[3] << 8),
> +		addr[4] | (addr[5] << 8)
> +	};
> +	const struct exgmac_reg e[] = {
> +		{ .addr = 0xe0, ERIAR_MASK_1111, .val = w[0] | (w[1] << 16) },
> +		{ .addr = 0xe4, ERIAR_MASK_1111, .val = w[2] },
> +		{ .addr = 0xf0, ERIAR_MASK_1111, .val = w[0] << 16 },
> +		{ .addr = 0xf4, ERIAR_MASK_1111, .val = w[1] | (w[2] << 16) },
> +	};
> +
> +	rtl_write_exgmac_batch(tp, e, ARRAY_SIZE(e));
> +}
> +
>  static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
>  {
>  	static const struct phy_reg phy_reg_init[] = {
> @@ -3178,6 +3195,9 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
>  	rtl_w1w0_phy(tp, 0x19, 0x0000, 0x0001);
>  	rtl_w1w0_phy(tp, 0x10, 0x0000, 0x0400);
>  	rtl_writephy(tp, 0x1f, 0x0000);
> +
> +	/* Broken BIOS workaround: feed GigaMAC registers with MAC address. */
> +	rtl_rar_exgmac_set(tp, tp->dev->dev_addr);
>  }
>  
>  static void rtl8168f_hw_phy_config(struct rtl8169_private *tp)
> @@ -3708,33 +3728,19 @@ static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
>  static void rtl_rar_set(struct rtl8169_private *tp, u8 *addr)
>  {
>  	void __iomem *ioaddr = tp->mmio_addr;
> -	u32 high;
> -	u32 low;
> -
> -	low  = addr[0] | (addr[1] << 8) | (addr[2] << 16) | (addr[3] << 24);
> -	high = addr[4] | (addr[5] << 8);
>  
>  	rtl_lock_work(tp);
>  
>  	RTL_W8(Cfg9346, Cfg9346_Unlock);
>  
> -	RTL_W32(MAC4, high);
> +	RTL_W32(MAC4, addr[4] | addr[5] << 8);
>  	RTL_R32(MAC4);
>  
> -	RTL_W32(MAC0, low);
> +	RTL_W32(MAC0, addr[0] | addr[1] << 8 | addr[2] << 16 | addr[3] << 24);
>  	RTL_R32(MAC0);
>  
> -	if (tp->mac_version == RTL_GIGA_MAC_VER_34) {
> -		const struct exgmac_reg e[] = {
> -			{ .addr = 0xe0, ERIAR_MASK_1111, .val = low },
> -			{ .addr = 0xe4, ERIAR_MASK_1111, .val = high },
> -			{ .addr = 0xf0, ERIAR_MASK_1111, .val = low << 16 },
> -			{ .addr = 0xf4, ERIAR_MASK_1111, .val = high << 16 |
> -								low  >> 16 },
> -		};
> -
> -		rtl_write_exgmac_batch(tp, e, ARRAY_SIZE(e));
> -	}
> +	if (tp->mac_version == RTL_GIGA_MAC_VER_34)
> +		rtl_rar_exgmac_set(tp, addr);
>  
>  	RTL_W8(Cfg9346, Cfg9346_Lock);
>  
> -- 
> 1.7.11.7
Signed-off-by: Wang YanQing <udknight@gmail.com>