* [net] e1000e: fix scheduling while atomic bug
@ 2013-05-07 5:52 Jeff Kirsher
2013-05-07 11:31 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2013-05-07 5:52 UTC (permalink / raw)
To: davem, torvalds
Cc: Bruce Allan, netdev, gospo, sassmann, linux-kernel, Jeff Kirsher
From: Bruce Allan <bruce.w.allan@intel.com>
A scheduling while atomic bug was introduced recently (by commit ce43a216
e1000e: cleanup USLEEP_RANGE checkpatch checks). Revert the particular
instance of usleep_range() which causes the bug.
Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 82f1c84..ffbc08f 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw)
s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;
while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)
- usleep_range(50, 100);
+ udelay(50);
return i;
}
--
1.7.11.7
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [net] e1000e: fix scheduling while atomic bug
2013-05-07 5:52 [net] e1000e: fix scheduling while atomic bug Jeff Kirsher
@ 2013-05-07 11:31 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-05-07 11:31 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: torvalds, bruce.w.allan, netdev, gospo, sassmann, linux-kernel
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Mon, 6 May 2013 22:52:47 -0700
> From: Bruce Allan <bruce.w.allan@intel.com>
>
> A scheduling while atomic bug was introduced recently (by commit ce43a216
> e1000e: cleanup USLEEP_RANGE checkpatch checks). Revert the particular
> instance of usleep_range() which causes the bug.
>
> Reported-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
> Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Linus, please apply this directly, thanks:
Acked-by: David S. Miller <davem@davemloft.net>
> ---
> drivers/net/ethernet/intel/e1000e/e1000.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
> index 82f1c84..ffbc08f 100644
> --- a/drivers/net/ethernet/intel/e1000e/e1000.h
> +++ b/drivers/net/ethernet/intel/e1000e/e1000.h
> @@ -600,7 +600,7 @@ static inline s32 __ew32_prepare(struct e1000_hw *hw)
> s32 i = E1000_ICH_FWSM_PCIM2PCI_COUNT;
>
> while ((er32(FWSM) & E1000_ICH_FWSM_PCIM2PCI) && --i)
> - usleep_range(50, 100);
> + udelay(50);
>
> return i;
> }
> --
> 1.7.11.7
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-05-07 11:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-07 5:52 [net] e1000e: fix scheduling while atomic bug Jeff Kirsher
2013-05-07 11:31 ` David Miller
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).