Subject: Re: [PATCH v3] r8169: fix invalid register dump

From: Peter Wu <[email-masked]>
Date: Wed, 21 Aug 2013 22:40:58 +0200

On Tuesday 20 August 2013 15:02:13 David Miller wrote:
> > This partly obsoletes "r8169,sis190: remove unnecessary length
> > check"[1]. I do not have sis190 hardware, but since that is based on
> > this r8169 driver, would it make sense to apply this patch to sis190
> > too?
> 
> You're going to have to respin this since I applied the length
> check removal patch already.

Please find the updated patch below. There may be differences in lines
because net-next has the r8169,sis190 patch and net the WOL fix.

Can I consider Francois reply[1] as Acked-by?

Thanks,
Peter

 [1]: http://lkml.kernel.org/r/[email-masked]

--
>>From 56b7598a712e63841b6d8efb2245e5bb87990e01 Mon Sep 17 00:00:00 2001
From: Peter Wu <[email-masked]>
Date: Tue, 23 Jul 2013 12:27:27 +0200
Subject: [PATCH] r8169: fix invalid register dump

For some reason, my PCIe RTL8111E onboard NIC on a GA-Z68X-UD3H-B3
motherboard reads as FFs when reading from MMIO with a block size
larger than 7. Therefore change to reading blocks of four bytes.

Ben Hutchings noted that the buffer is large enough to hold all
registers, so now all registers are read.

Signed-off-by: Peter Wu <[email-masked]>
---
 drivers/net/ethernet/realtek/r8169.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 93ee49d..f724d9c 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -1897,9 +1897,12 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs,
 			     void *p)
 {
 	struct rtl8169_private *tp = netdev_priv(dev);
-
+	u32 __iomem *data = tp->mmio_addr;
+	u32 *dw = p;
+	int i;
 	rtl_lock_work(tp);
-	memcpy_fromio(p, tp->mmio_addr, regs->len);
+	for (i = 0; i < R8169_REGS_SIZE; i += 4)
+		memcpy_fromio(dw++, data++, 4);
 	rtl_unlock_work(tp);
 }
 
-- 
1.8.3.4