Re: [PATCH 1/6] sky2: fix hang on shutdown (and other irq issues)

[Sven Joachim <svenjoac@xxxxxx>]

On 2011-11-17 20:18 +0100, Stephen Hemminger wrote:

> Does this fix it?

Yes, thank you.  However, I had a more serious problem unrelated to that
patch; more on that in another mail.

> --- a/drivers/net/ethernet/marvell/sky2.c	2011-11-17 11:10:35.938076778 -0800
> +++ b/drivers/net/ethernet/marvell/sky2.c	2011-11-17 11:15:49.527882932 -0800
> @@ -1723,6 +1723,8 @@ static int sky2_setup_irq(struct sky2_hw
>  	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
>  
>  		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
>  {
>  	int i;
>  
> -	sky2_read32(hw, B0_IMSK);
> -	sky2_write32(hw, B0_IMSK, 0);
> +	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);
> +		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
>  
>  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 *
>  		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);
> --- a/drivers/net/ethernet/marvell/sky2.h	2011-11-16 15:15:40.964280527 -0800
> +++ b/drivers/net/ethernet/marvell/sky2.h	2011-11-17 11:13:00.154858718 -0800
> @@ -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;
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html