Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15edae91 authored by Peter Wu's avatar Peter Wu Committed by David S. Miller
Browse files

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: default avatarPeter Wu <lekensteyn@gmail.com>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cb79abc7

drivers/net/ethernet/realtek/r8169.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -1897,9 +1897,13 @@ static void rtl8169_get_regs(struct net_device *dev, struct ethtool_regs *regs, 
			     void *p)

			     void *p)

{

{

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);

	u32 __iomem *data = tp->mmio_addr;

	u32 *dw = p;

	int i;





	rtl_lock_work(tp);

	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);

	rtl_unlock_work(tp);

}

}