Le 29/11/2016 à 06:56, Harini Katakam a écrit : > In macb_reset_hw, use read-modify-write to disable RX and TX. > Existing settings, for ex. management port enable, > are being cleared in the current implementation. > Also certain reserved bits are read only. > Hence it is better to use read-modify-write. > Use the same method for clearing statistics as well. > > Signed-off-by: Harini Katakam <hari...@xilinx.com>
Acked-by: Nicolas Ferre <nicolas.fe...@atmel.com> > --- > > v2: > Make ctrl type as u32 > Improve commit description > > --- > drivers/net/ethernet/cadence/macb.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c > b/drivers/net/ethernet/cadence/macb.c > index 0e489bb..2ce3407 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -1744,14 +1744,18 @@ static void macb_reset_hw(struct macb *bp) > { > struct macb_queue *queue; > unsigned int q; > + u32 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); > -- Nicolas Ferre