Skip to content

Commit

Permalink
stmmac: Discard masked flags in interrupt status register
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
abrodkin authored and davem330 committed Jan 29, 2017
1 parent 1b1bc42 commit 0a764db
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,12 @@ static int dwmac1000_irq_status(struct mac_device_info *hw,
{
void __iomem *ioaddr = hw->pcsr;
u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
u32 intr_mask = readl(ioaddr + GMAC_INT_MASK);
int ret = 0;

/* Discard masked bits */
intr_status &= ~intr_mask;

/* Not used events (e.g. MMC interrupts) are not handled. */
if ((intr_status & GMAC_INT_STATUS_MMCTIS))
x->mmc_tx_irq_n++;
Expand Down

0 comments on commit 0a764db

Please sign in to comment.