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

Commit 1401a800 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sky2: fix hang on shutdown (and other irq issues) 



There are several problems with recent change to how IRQ's are setup.
   * synchronize_irq in sky2_shutdown would hang because there
     was no IRQ setup.
   * when device was set to down, some IRQ bits left enabled so a
     hardware error would produce IRQ with no handler
   * quick link on Optima chip set was enabled without handler
   * suspend/resume would leave IRQ on with no handler if device
     was down

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bbc13ab9

drivers/net/ethernet/marvell/sky2.c

+27 −18
Original line number Diff line number Diff line
@@ -1747,6 +1747,11 @@ static int sky2_up(struct net_device *dev) 


	sky2_hw_up(sky2);



	if (hw->chip_id == CHIP_ID_YUKON_OPT ||

	    hw->chip_id == CHIP_ID_YUKON_PRM ||

	    hw->chip_id == CHIP_ID_YUKON_OP_2)

		imask |= Y2_IS_PHY_QLNK;	/* enable PHY Quick Link */



	/* Enable interrupts from phy/mac for port */

	imask = sky2_read32(hw, B0_IMSK);

	imask |= portirq_msk[port];
@@ -2101,15 +2106,21 @@ static int sky2_down(struct net_device *dev) 


	netif_info(sky2, ifdown, dev, "disabling interface\n");



	/* Disable port IRQ */

	sky2_write32(hw, B0_IMSK,

		     sky2_read32(hw, B0_IMSK) & ~portirq_msk[sky2->port]);

	if (hw->ports == 1) {

		sky2_write32(hw, B0_IMSK, 0);

		sky2_read32(hw, B0_IMSK);



	if (hw->ports == 1) {

		napi_disable(&hw->napi);

		free_irq(hw->pdev->irq, hw);

	} else {

		u32 imask;



		/* Disable port IRQ */

		imask  = sky2_read32(hw, B0_IMSK);

		imask &= ~portirq_msk[sky2->port];

		sky2_write32(hw, B0_IMSK, imask);

		sky2_read32(hw, B0_IMSK);



		synchronize_irq(hw->pdev->irq);

		napi_synchronize(&hw->napi);

	}
@@ -3258,7 +3269,6 @@ static void sky2_reset(struct sky2_hw *hw) 
	    hw->chip_id == CHIP_ID_YUKON_PRM ||

	    hw->chip_id == CHIP_ID_YUKON_OP_2) {

		u16 reg;

		u32 msk;



		if (hw->chip_id == CHIP_ID_YUKON_OPT && hw->chip_rev == 0) {

			/* disable PCI-E PHY power down (set PHY reg 0x80, bit 7 */
@@ -3281,11 +3291,6 @@ static void sky2_reset(struct sky2_hw *hw) 
		sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);

		sky2_pci_write16(hw, PSM_CONFIG_REG4, reg);



		/* enable PHY Quick Link */

		msk = sky2_read32(hw, B0_IMSK);

		msk |= Y2_IS_PHY_QLNK;

		sky2_write32(hw, B0_IMSK, msk);



		/* check if PSMv2 was running before */

		reg = sky2_pci_read16(hw, PSM_CONFIG_REG3);

		if (reg & PCI_EXP_LNKCTL_ASPMC)
@@ -3412,6 +3417,8 @@ static void sky2_all_down(struct sky2_hw *hw) 


	sky2_read32(hw, B0_IMSK);

	sky2_write32(hw, B0_IMSK, 0);



	if (hw->ports > 1 || netif_running(hw->dev[0]))

		synchronize_irq(hw->pdev->irq);

	napi_disable(&hw->napi);
@@ -3430,7 +3437,7 @@ static void sky2_all_down(struct sky2_hw *hw) 


static void sky2_all_up(struct sky2_hw *hw)

{

	u32 imask = Y2_IS_BASE;

	u32 imask = 0;

	int i;



	for (i = 0; i < hw->ports; i++) {
@@ -3446,12 +3453,14 @@ static void sky2_all_up(struct sky2_hw *hw) 
		netif_wake_queue(dev);

	}



	if (imask || hw->ports > 1) {

		imask |= Y2_IS_BASE;

		sky2_write32(hw, B0_IMSK, imask);

		sky2_read32(hw, B0_IMSK);



		sky2_read32(hw, B0_Y2_SP_LISR);

		napi_enable(&hw->napi);

	}

}



static void sky2_restart(struct work_struct *work)

{