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

Commit 282edcec authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

sky2: fix hang in napi_disable 



If IRQ was never initialized, then calling napi_disable() would hang.
Add more bookkeeping to track whether IRQ was ever initialized.

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

drivers/net/ethernet/marvell/sky2.c

+10 −7
Original line number Diff line number Diff line
@@ -1723,6 +1723,8 @@ static int sky2_setup_irq(struct sky2_hw *hw, const char *name) 
	if (err)

		dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq);

	else {

		hw->flags |= SKY2_HW_IRQ_SETUP;



		napi_enable(&hw->napi);

		sky2_write32(hw, B0_IMSK, Y2_IS_BASE);

		sky2_read32(hw, B0_IMSK);
@@ -2120,6 +2122,7 @@ static int sky2_close(struct net_device *dev) 


		napi_disable(&hw->napi);

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

		hw->flags &= ~SKY2_HW_IRQ_SETUP;

	} else {

		u32 imask;
@@ -3423,12 +3426,13 @@ static void sky2_all_down(struct sky2_hw *hw) 
{

	int i;



	if (hw->flags & SKY2_HW_IRQ_SETUP) {

		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);

	}



	for (i = 0; i < hw->ports; i++) {

		struct net_device *dev = hw->dev[i];
@@ -3445,7 +3449,7 @@ static void sky2_all_down(struct sky2_hw *hw) 


static void sky2_all_up(struct sky2_hw *hw)

{

	u32 imask = 0;

	u32 imask = Y2_IS_BASE;

	int i;



	for (i = 0; i < hw->ports; i++) {
@@ -3461,8 +3465,7 @@ static void sky2_all_up(struct sky2_hw *hw) 
		netif_wake_queue(dev);

	}



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

		imask |= Y2_IS_BASE;

	if (hw->flags & SKY2_HW_IRQ_SETUP) {

		sky2_write32(hw, B0_IMSK, imask);

		sky2_read32(hw, B0_IMSK);

		sky2_read32(hw, B0_Y2_SP_LISR);

drivers/net/ethernet/marvell/sky2.h

+1 −0
Original line number Diff line number Diff line
@@ -2287,6 +2287,7 @@ struct sky2_hw { 
#define SKY2_HW_RSS_BROKEN	0x00000100

#define SKY2_HW_VLAN_BROKEN     0x00000200

#define SKY2_HW_RSS_CHKSUM	0x00000400	/* RSS requires chksum */

#define SKY2_HW_IRQ_SETUP	0x00000800



	u8	     	     chip_id;

	u8		     chip_rev;