From: Sven Joachim <svenjoac@gmx•de>
To: Stephen Hemminger <shemminger@vyatta•com>
Cc: davem@davemloft•net, netdev@vger•kernel.org
Subject: Re: [PATCH 1/6] sky2: fix hang on shutdown (and other irq issues)
Date: Thu, 17 Nov 2011 09:46:43 +0100 [thread overview]
Message-ID: <87r517w2z0.fsf@turtle.gmx.de> (raw)
In-Reply-To: <20111116234344.526517614@vyatta.com> (Stephen Hemminger's message of "Wed, 16 Nov 2011 15:42:55 -0800")
On 2011-11-17 00:42 +0100, Stephen Hemminger wrote:
> 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
Unfortunately, this patch does not fix the hang at shutdown for me. :-(
> Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
>
> ---
> This needs to be applied to net-next and -net
>
> --- a/drivers/net/ethernet/marvell/sky2.c 2011-11-16 15:15:48.212513321 -0800
> +++ b/drivers/net/ethernet/marvell/sky2.c 2011-11-16 15:19:32.898508932 -0800
> @@ -1747,6 +1747,11 @@ static int sky2_up(struct net_device *de
>
> 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 *
>
> 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 {
> + 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 *h
> 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 *h
> 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,7 +3417,9 @@ static void sky2_all_down(struct sky2_hw
>
> sky2_read32(hw, B0_IMSK);
> sky2_write32(hw, B0_IMSK, 0);
> - synchronize_irq(hw->pdev->irq);
> +
> + 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++) {
> @@ -3430,7 +3437,7 @@ static void sky2_all_down(struct sky2_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,11 +3453,13 @@ static void sky2_all_up(struct sky2_hw *
> netif_wake_queue(dev);
> }
>
> - sky2_write32(hw, B0_IMSK, imask);
> - sky2_read32(hw, B0_IMSK);
> -
> - sky2_read32(hw, B0_Y2_SP_LISR);
> - napi_enable(&hw->napi);
> + 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)
next prev parent reply other threads:[~2011-11-17 8:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-16 23:42 [PATCH 0/6] sky2 patches for net-next Stephen Hemminger
2011-11-16 23:42 ` [PATCH 1/6] sky2: fix hang on shutdown (and other irq issues) Stephen Hemminger
2011-11-17 8:46 ` Sven Joachim [this message]
2011-11-17 17:01 ` Stephen Hemminger
2011-11-17 18:37 ` Sven Joachim
2011-11-17 19:18 ` Stephen Hemminger
2011-11-17 20:57 ` Sven Joachim
2011-11-18 0:37 ` [PATCH net-next] sky2: fix hang in napi_disable Stephen Hemminger
2011-11-18 1:52 ` David Miller
2011-11-18 2:10 ` Stephen Hemminger
2011-11-18 2:15 ` David Miller
2011-11-18 2:44 ` David Miller
2011-11-16 23:42 ` [PATCH 2/6] sky2: pci posting issues Stephen Hemminger
2011-11-16 23:42 ` [PATCH 3/6] sky2: rename up/down functions Stephen Hemminger
2011-11-16 23:42 ` [PATCH 4/6] sky2: reduce default Tx ring size Stephen Hemminger
2011-11-17 21:07 ` Sven Joachim
2011-11-17 22:41 ` Stephen Hemminger
2011-11-18 0:37 ` [PATCH net-next] sky2: enforce minimum " Stephen Hemminger
2011-11-18 2:44 ` David Miller
2011-11-16 23:42 ` [PATCH 5/6] sky2: used fixed RSS key Stephen Hemminger
2011-11-16 23:43 ` [PATCH 6/6] sky2: version 1.30 Stephen Hemminger
2011-11-17 1:36 ` [PATCH 0/6] sky2 patches for net-next David Miller
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=87r517w2z0.fsf@turtle.gmx.de \
--to=svenjoac@gmx$(echo .)de \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=shemminger@vyatta$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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