RE: [PATCH v2 net-next 2/2] r8169: support RTL8168G

[hayeswang <hayeswang@realtek.com>]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

Francois Romieu [romieu@fr.zoreil.com]
[...]
> 
> Any objection against merging it with the patch below ?
> 
> - more BUG() avoidance
> - save Joe P. some work
> - remove useless parenthesis
> - fix r8168g_mdio_write (if (reg_addr == 0x1f) { if (reg_addr == 0) snafu)
>   -> Please check this one.

That is fine.

> - long declarations before short ones
> - avoid unbounded loops
> - use a descriptive name for the 0xe8de value in rtl_hw_init_8168g.
>   -> Please suggest something better than "PLOP"

I have no idea about naming 0xe8de. Our hardware engineers don't release any
datasheet about it. It seems to be related with oob settings. 

[-- Attachment #2: fix.patch --]
[-- Type: application/octet-stream, Size: 1656 bytes --]


Fix some code.
 
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
---
 drivers/net/ethernet/realtek/r8169.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index c37aed9..1d7d6f0 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -3392,7 +3392,7 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
 	};
 
 	/* patch code for GPHY reset */
-	for (i = 0; ARRAY_SIZE(mac_ocp_patch); i++)
+	for (i = 0; i < ARRAY_SIZE(mac_ocp_patch); i++)
 		r8168_mac_ocp_write(tp, 0xf800 + 2*i, mac_ocp_patch[i]);
 	r8168_mac_ocp_write(tp, 0xfc26, 0x8000);
 	r8168_mac_ocp_write(tp, 0xfc28, 0x0075);
@@ -6764,6 +6764,7 @@ static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp)
 	u32 data;
 	int i;
 
+	tp->ocp_base = OCP_STD_PHY_BASE;
 	RTL_W32(MISC, RTL_R32(MISC) | RXDV_GATED_EN);
 
 	for (i = 0; i < RTL_LOOP_MAX; i++) {
@@ -6782,15 +6783,15 @@ static void __devinit rtl_hw_init_8168g(struct rtl8169_private *tp)
 	msleep(1);
 	RTL_W8(MCU, RTL_R8(MCU) & ~NOW_IS_OOB);
 
-	data = r8168_mac_ocp_read(ioaddr, PLOP);
+	data = r8168_mac_ocp_read(tp, PLOP);
 	data &= ~(1 << 14);
-	r8168_mac_ocp_write(ioaddr, PLOP, data);
+	r8168_mac_ocp_write(tp, PLOP, data);
 
 	rtl_mcu_wait_list_ready(ioaddr);
 
-	data = r8168_mac_ocp_read(ioaddr, PLOP);
+	data = r8168_mac_ocp_read(tp, PLOP);
 	data |= (1 << 15);
-	r8168_mac_ocp_write(ioaddr, PLOP, data);
+	r8168_mac_ocp_write(tp, PLOP, data);
 
 	rtl_mcu_wait_list_ready(ioaddr);
 }
-- 
1.7.10.2