Skip to content

Commit 0a764db

Browse files
abrodkindavem330
authored andcommitted
stmmac: Discard masked flags in interrupt status register
DW GMAC databook says the following about bits in "Register 15 (Interrupt Mask Register)": --------------------------->8------------------------- When set, this bit __disables_the_assertion_of_the_interrupt_signal__ because of the setting of XXX bit in Register 14 (Interrupt Status Register). --------------------------->8------------------------- In fact even if we mask one bit in the mask register it doesn't prevent corresponding bit to appear in the status register, it only disables interrupt generation for corresponding event. But currently we expect a bit different behavior: status bits to be in sync with their masks, i.e. if mask for bit A is set in the mask register then bit A won't appear in the interrupt status register. This was proven to be incorrect assumption, see discussion here [1]. That misunderstanding causes unexpected behaviour of the GMAC, for example we were happy enough to just see bogus messages about link state changes. So from now on we'll be only checking bits that really may trigger an interrupt. [1] https://lkml.org/lkml/2016/11/3/413 Signed-off-by: Alexey Brodkin <[email protected]> Cc: Giuseppe Cavallaro <[email protected]> Cc: Fabrice Gasnier <[email protected]> Cc: Joachim Eastwood <[email protected]> Cc: Phil Reid <[email protected]> Cc: David Miller <[email protected]> Cc: Alexandre Torgue <[email protected]> Cc: Vineet Gupta <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 1b1bc42 commit 0a764db

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,12 @@ static int dwmac1000_irq_status(struct mac_device_info *hw,
305305
{
306306
void __iomem *ioaddr = hw->pcsr;
307307
u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
308+
u32 intr_mask = readl(ioaddr + GMAC_INT_MASK);
308309
int ret = 0;
309310

311+
/* Discard masked bits */
312+
intr_status &= ~intr_mask;
313+
310314
/* Not used events (e.g. MMC interrupts) are not handled. */
311315
if ((intr_status & GMAC_INT_STATUS_MMCTIS))
312316
x->mmc_tx_irq_n++;

0 commit comments

Comments
 (0)