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

Commit 0f51492d authored by Francois Romieu's avatar Francois Romieu Committed by Greg Kroah-Hartman
Browse files

r8169: fix memory corruption on retrieval of hardware statistics. 




[ Upstream commit a78e93661c5fd30b9e1dee464b2f62f966883ef7 ]

Hardware statistics retrieval hurts in tight invocation loops.

Avoid extraneous write and enforce strict ordering of writes targeted to
the tally counters dump area address registers.

Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Tested-by: default avatarOliver Freyermuth <o.freyermuth@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1bd21b15

drivers/net/ethernet/realtek/r8169.c

+2 −7
Original line number Diff line number Diff line
@@ -2222,19 +2222,14 @@ static bool rtl8169_do_counters(struct net_device *dev, u32 counter_cmd) 
	void __iomem *ioaddr = tp->mmio_addr;

	dma_addr_t paddr = tp->counters_phys_addr;

	u32 cmd;

	bool ret;



	RTL_W32(CounterAddrHigh, (u64)paddr >> 32);

	RTL_R32(CounterAddrHigh);

	cmd = (u64)paddr & DMA_BIT_MASK(32);

	RTL_W32(CounterAddrLow, cmd);

	RTL_W32(CounterAddrLow, cmd | counter_cmd);



	ret = rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000);



	RTL_W32(CounterAddrLow, 0);

	RTL_W32(CounterAddrHigh, 0);



	return ret;

	return rtl_udelay_loop_wait_low(tp, &rtl_counters_cond, 10, 1000);

}



static bool rtl8169_reset_counters(struct net_device *dev)