[PATCH] net: macb: Write only necessary bits in NCR in macb reset
From: Harini Katakam <hidden>
Date: 2016-11-28 10:57:36
Also in:
lkml
Subsystem:
atmel macb ethernet driver, networking drivers, the rest · Maintainers:
Théo Lebrun, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
In macb_reset_hw, use read-modify-write to disable RX and TX. This way exiting settings and reserved bits wont be disturbed. Use the same method for clearing statistics as well. Signed-off-by: Harini Katakam <redacted> --- drivers/net/ethernet/cadence/macb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 0e489bb..80ccfc4 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c@@ -1743,15 +1743,18 @@ static void macb_init_rings(struct macb *bp) static void macb_reset_hw(struct macb *bp) { struct macb_queue *queue; - unsigned int q; + unsigned int q, ctrl; /* Disable RX and TX (XXX: Should we halt the transmission * more gracefully?) */ - macb_writel(bp, NCR, 0); + ctrl = macb_readl(bp, NCR); + ctrl &= ~(MACB_BIT(RE) | MACB_BIT(TE)); + macb_writel(bp, NCR, ctrl); /* Clear the stats registers (XXX: Update stats first?) */ - macb_writel(bp, NCR, MACB_BIT(CLRSTAT)); + ctrl |= MACB_BIT(CLRSTAT); + macb_writel(bp, NCR, ctrl); /* Clear all status flags */ macb_writel(bp, TSR, -1);
--
2.7.4