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

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
...@@ -1723,6 +1723,8 @@ static int sky2_setup_irq(struct sky2_hw *hw, const char *name) ...@@ -1723,6 +1723,8 @@ static int sky2_setup_irq(struct sky2_hw *hw, const char *name)
if (err) if (err)
dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq); dev_err(&pdev->dev, "cannot assign irq %d\n", pdev->irq);
else { else {
hw->flags |= SKY2_HW_IRQ_SETUP;
napi_enable(&hw->napi); napi_enable(&hw->napi);
sky2_write32(hw, B0_IMSK, Y2_IS_BASE); sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
sky2_read32(hw, B0_IMSK); sky2_read32(hw, B0_IMSK);
...@@ -2120,6 +2122,7 @@ static int sky2_close(struct net_device *dev) ...@@ -2120,6 +2122,7 @@ static int sky2_close(struct net_device *dev)
napi_disable(&hw->napi); napi_disable(&hw->napi);
free_irq(hw->pdev->irq, hw); free_irq(hw->pdev->irq, hw);
hw->flags &= ~SKY2_HW_IRQ_SETUP;
} else { } else {
u32 imask; u32 imask;
...@@ -3423,12 +3426,13 @@ static void sky2_all_down(struct sky2_hw *hw) ...@@ -3423,12 +3426,13 @@ static void sky2_all_down(struct sky2_hw *hw)
{ {
int i; int i;
sky2_read32(hw, B0_IMSK); if (hw->flags & SKY2_HW_IRQ_SETUP) {
sky2_write32(hw, B0_IMSK, 0); 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); synchronize_irq(hw->pdev->irq);
napi_disable(&hw->napi); napi_disable(&hw->napi);
}
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i]; struct net_device *dev = hw->dev[i];
...@@ -3445,7 +3449,7 @@ static void sky2_all_down(struct sky2_hw *hw) ...@@ -3445,7 +3449,7 @@ static void sky2_all_down(struct sky2_hw *hw)
static void sky2_all_up(struct sky2_hw *hw) static void sky2_all_up(struct sky2_hw *hw)
{ {
u32 imask = 0; u32 imask = Y2_IS_BASE;
int i; int i;
for (i = 0; i < hw->ports; i++) { for (i = 0; i < hw->ports; i++) {
...@@ -3461,8 +3465,7 @@ static void sky2_all_up(struct sky2_hw *hw) ...@@ -3461,8 +3465,7 @@ static void sky2_all_up(struct sky2_hw *hw)
netif_wake_queue(dev); netif_wake_queue(dev);
} }
if (imask || hw->ports > 1) { if (hw->flags & SKY2_HW_IRQ_SETUP) {
imask |= Y2_IS_BASE;
sky2_write32(hw, B0_IMSK, imask); sky2_write32(hw, B0_IMSK, imask);
sky2_read32(hw, B0_IMSK); sky2_read32(hw, B0_IMSK);
sky2_read32(hw, B0_Y2_SP_LISR); sky2_read32(hw, B0_Y2_SP_LISR);
......
...@@ -2287,6 +2287,7 @@ struct sky2_hw { ...@@ -2287,6 +2287,7 @@ struct sky2_hw {
#define SKY2_HW_RSS_BROKEN 0x00000100 #define SKY2_HW_RSS_BROKEN 0x00000100
#define SKY2_HW_VLAN_BROKEN 0x00000200 #define SKY2_HW_VLAN_BROKEN 0x00000200
#define SKY2_HW_RSS_CHKSUM 0x00000400 /* RSS requires chksum */ #define SKY2_HW_RSS_CHKSUM 0x00000400 /* RSS requires chksum */
#define SKY2_HW_IRQ_SETUP 0x00000800
u8 chip_id; u8 chip_id;
u8 chip_rev; u8 chip_rev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment