From: Stephen Hemminger <shemminger@vyatta.com>
To: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: davem@davemloft.net, netdev@vger.kernel.org
Subject: Re: commit 0bdb0bd0 breaks shutdown/reboot
Date: Mon, 7 Nov 2011 08:13:16 -0800 [thread overview]
Message-ID: <20111107081316.2e1cc2cb@nehalam.linuxnetplumber.net> (raw)
In-Reply-To: <20111107153119.GA11724@comet.dominikbrodowski.net>
Does this help?
Subject: sky2: block irq's on down
Need to block IRQ's from phy changes to prevent stray IRQ's when
device is down.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
--- a/drivers/net/ethernet/marvell/sky2.c 2011-11-04 15:01:51.310888300 -0700
+++ b/drivers/net/ethernet/marvell/sky2.c 2011-11-07 08:10:05.065118917 -0800
@@ -2106,15 +2106,20 @@ static int sky2_down(struct net_device *
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]);
- sky2_read32(hw, B0_IMSK);
-
if (hw->ports == 1) {
+ sky2_write32(hw, B0_IMSK, 0);
+ sky2_read32(hw, B0_IMSK);
+
napi_disable(&hw->napi);
free_irq(hw->pdev->irq, hw);
} else {
+ /* Disable port IRQ */
+ u32 imsk = sky2_read32(hw, B0_IMSK);
+
+ imsk &= ~portirq_msk[sky2->port];
+ sky2_write32(hw, B0_IMSK, imsk);
+ sky2_read32(hw, B0_IMSK);
+
synchronize_irq(hw->pdev->irq);
napi_synchronize(&hw->napi);
}
@@ -5017,19 +5022,19 @@ static void __devexit sky2_remove(struct
for (i = hw->ports-1; i >= 0; --i)
unregister_netdev(hw->dev[i]);
- sky2_write32(hw, B0_IMSK, 0);
- sky2_read32(hw, B0_IMSK);
-
sky2_power_aux(hw);
- sky2_write8(hw, B0_CTST, CS_RST_SET);
- sky2_read8(hw, B0_CTST);
-
if (hw->ports > 1) {
+ sky2_write32(hw, B0_IMSK, 0);
+ sky2_read32(hw, B0_IMSK);
+
napi_disable(&hw->napi);
free_irq(pdev->irq, hw);
}
+ sky2_write8(hw, B0_CTST, CS_RST_SET);
+ sky2_read8(hw, B0_CTST);
+
if (hw->flags & SKY2_HW_USE_MSI)
pci_disable_msi(pdev);
pci_free_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le),
next prev parent reply other threads:[~2011-11-07 16:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 15:31 commit 0bdb0bd0 breaks shutdown/reboot Dominik Brodowski
2011-11-07 16:13 ` Stephen Hemminger [this message]
2011-11-07 16:32 ` Dominik Brodowski
2011-11-07 16:45 ` Stephen Hemminger
2011-11-07 17:08 ` Dominik Brodowski
2011-11-08 0:57 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111107081316.2e1cc2cb@nehalam.linuxnetplumber.net \
--to=shemminger@vyatta.com \
--cc=davem@davemloft.net \
--cc=linux@dominikbrodowski.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).