Merge branch 'stmmac-irq-fixes-cleanups'

Niklas Cassel says:

====================
stmmac irq fixes/cleanups

A couple of small stmmac irq fixes/cleanups.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
index 540d21786a43..ef10baf14186 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c
@@ -74,8 +74,6 @@ static void dwmac1000_core_init(struct mac_device_info *hw,
         /* Mask GMAC interrupts */
         value = GMAC_INT_DEFAULT_MASK;
 
-        if (hw->pmt)
-                value &= ~GMAC_INT_DISABLE_PMT;
         if (hw->pcs)
                 value &= ~GMAC_INT_DISABLE_PCS;
 
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
index 789dad8a07b5..7761a26ec9c5 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4.h
@@ -98,7 +98,7 @@
 #define GMAC_PCS_IRQ_DEFAULT    (GMAC_INT_RGSMIIS | GMAC_INT_PCS_LINK | \
                                  GMAC_INT_PCS_ANE)
 
-#define GMAC_INT_DEFAULT_MASK   (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)
+#define GMAC_INT_DEFAULT_ENABLE (GMAC_INT_PMT_EN | GMAC_INT_LPI_EN)
 
 enum dwmac4_irq_status {
         time_stamp_irq = 0x00001000,
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
index ed222b20fcf1..63795ecafc8d 100644
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c
@@ -61,10 +61,9 @@ static void dwmac4_core_init(struct mac_device_info *hw,
 
         writel(value, ioaddr + GMAC_CONFIG);
 
-        /* Mask GMAC interrupts */
-        value = GMAC_INT_DEFAULT_MASK;
-        if (hw->pmt)
-                value |= GMAC_INT_PMT_EN;
+        /* Enable GMAC interrupts */
+        value = GMAC_INT_DEFAULT_ENABLE;
+
         if (hw->pcs)
                 value |= GMAC_PCS_IRQ_DEFAULT;
 
@@ -572,10 +571,12 @@ static int dwmac4_irq_status(struct mac_device_info *hw,
                              struct stmmac_extra_stats *x)
 {
         void __iomem *ioaddr = hw->pcsr;
-        u32 intr_status;
+        u32 intr_status = readl(ioaddr + GMAC_INT_STATUS);
+        u32 intr_enable = readl(ioaddr + GMAC_INT_EN);
         int ret = 0;
 
-        intr_status = readl(ioaddr + GMAC_INT_STATUS);
+        /* Discard disabled bits */
+        intr_status &= intr_enable;
 
         /* Not used events (e.g. MMC interrupts) are not handled. */
         if ((intr_status & mmc_tx_irq))