From mboxrd@z Thu Jan 1 00:00:00 1970 From: nicolas.ferre@atmel.com (Nicolas Ferre) Date: Thu, 24 Mar 2016 16:39:28 +0100 Subject: [PATCH 1/1] net: macb: replace macb_writel() call by queue_writel() to update queue ISR In-Reply-To: <1458830404-6213-1-git-send-email-cyrille.pitchen@atmel.com> References: <1458830404-6213-1-git-send-email-cyrille.pitchen@atmel.com> Message-ID: <56F40A30.6030907@atmel.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Le 24/03/2016 15:40, Cyrille Pitchen a ?crit : > macb_interrupt() should not use macb_writel(bp, ISR, ) but only > queue_writel(queue, ISR, ). > > There is one IRQ and one set of {ISR, IER, IDR, IMR} [1] registers per > queue on gem hardware, though only queue0 is actually used for now to > receive frames: other queues can already be used to transmit frames. > > The queue_readl() and queue_writel() helper macros are designed to access > the relevant IRQ registers. > > [1] > ISR: Interrupt Status Register > IER: Interrupt Enable Register > IDR: Interrupt Disable Register > IMR: Interrupt Mask Register > > Signed-off-by: Cyrille Pitchen > Fixes: bfbb92c44670 ("net: macb: Handle the RXUBR interrupt on all devices") Acked-by: Nicolas Ferre Thanks! > --- > drivers/net/ethernet/cadence/macb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index 39447a337149..c9c6b2762a39 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -1146,7 +1146,7 @@ static irqreturn_t macb_interrupt(int irq, void *dev_id) > macb_writel(bp, NCR, ctrl | MACB_BIT(RE)); > > if (bp->caps & MACB_CAPS_ISR_CLEAR_ON_WRITE) > - macb_writel(bp, ISR, MACB_BIT(RXUBR)); > + queue_writel(queue, ISR, MACB_BIT(RXUBR)); > } > > if (status & MACB_BIT(ISR_ROVR)) { > -- Nicolas Ferre