Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909ebd58 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-irq-fixes-cleanups' 



Niklas Cassel says:

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents faefaa97 10291171

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

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/stmicro/stmmac/dwmac4.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

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

+7 −6
Original line number Diff line number Diff line
@@ -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))