netdev - Re: [patch] tg3: Fix 'scheduling while atomic' errors

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20080804.231913.10880937.davem@davemloft.net>
Date:	Mon, 04 Aug 2008 23:19:13 -0700 (PDT)
From:	David Miller <davem@...emloft.net>
To:	mcarlson@...adcom.com
Cc:	netdev@...r.kernel.org, mchan@...adcom.com, andy@...yhouse.net,
	rjw@...k.pl, arekm@...en.pl
Subject: Re: [patch] tg3: Fix 'scheduling while atomic' errors

From: "Matt Carlson" <mcarlson@...adcom.com>
Date: Mon, 4 Aug 2008 22:13:48 -0700

> This patch fixes the 'scheduling while atomic' errors introduced by
> commit 12dac0756d357325b107fe6ec24921ec38661839.
> 
> The first hunk of the patch removes an unnecessary
> tg3_set_power_state() call.  The chip will already be in the D0 state
> either due to a chip reset or through a previous call to
> tg3_set_power_state().
> 
> The second hunk of the patch moves the tg3_set_power_state() call
> outside the critical section guarded by tg3_full_lock() and
> tg3_full_unlock() functions.  The power state of the device is and
> should be outside the lock's domain and all other tg3_set_power_state()
> calls support this.
> 
> 
> Signed-off-by: Matt Carlson <mcarlson@...adcom.com>
> Signed-off-by: Michael Chan <mchan@...adcom.com>

Applied, thanks Matt.

> diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
> index 26aa37a..576199b 100644
> --- a/drivers/net/tg3.c
> +++ b/drivers/net/tg3.c
> @@ -7687,21 +7687,11 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
>   */
>  static int tg3_init_hw(struct tg3 *tp, int reset_phy)
>  {
> -	int err;
> -
> -	/* Force the chip into D0. */
> -	err = tg3_set_power_state(tp, PCI_D0);
> -	if (err)
> -		goto out;
> -
>  	tg3_switch_clocks(tp);
>  
>  	tw32(TG3PCI_MEM_WIN_BASE_ADDR, 0);
>  
> -	err = tg3_reset_hw(tp, reset_phy);
> -
> -out:
> -	return err;
> +	return tg3_reset_hw(tp, reset_phy);
>  }
>  
>  #define TG3_STAT_ADD32(PSTAT, REG) \
> @@ -8016,13 +8006,11 @@ static int tg3_open(struct net_device *dev)
>  
>  	netif_carrier_off(tp->dev);
>  
> -	tg3_full_lock(tp, 0);
> -
>  	err = tg3_set_power_state(tp, PCI_D0);
> -	if (err) {
> -		tg3_full_unlock(tp);
> +	if (err)
>  		return err;
> -	}
> +
> +	tg3_full_lock(tp, 0);
>  
>  	tg3_disable_ints(tp);
>  	tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE;
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html