[PATCH] net/b44: keep irq state at suspend_resume

From: Yong Zhang
Date: Sun Sep 27 2009 - 10:42:41 EST

suspend() and resume() assume irq is disabled. So keep the irq
state when do this.

Signed-off-by: Yong Zhang <yong.zhang0@xxxxxxxxx>
---
drivers/net/b44.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index e046943..97b467f 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2258,20 +2258,21 @@ static int b44_suspend(struct ssb_device
*sdev, pm_message_t state)
{
struct net_device *dev = ssb_get_drvdata(sdev);
struct b44 *bp = netdev_priv(dev);
+ unsigned long flags;

if (!netif_running(dev))
return 0;

del_timer_sync(&bp->timer);

- spin_lock_irq(&bp->lock);
+ spin_lock_irqsave(&bp->lock, flags);

b44_halt(bp);
netif_carrier_off(bp->dev);
netif_device_detach(bp->dev);
b44_free_rings(bp);

- spin_unlock_irq(&bp->lock);
+ spin_unlock_irqrestore(&bp->lock, flags);

free_irq(dev->irq, dev);
if (bp->flags & B44_FLAG_WOL_ENABLE) {
@@ -2288,6 +2289,7 @@ static int b44_resume(struct ssb_device *sdev)
struct net_device *dev = ssb_get_drvdata(sdev);
struct b44 *bp = netdev_priv(dev);
int rc = 0;
+ unsigned long flags;

rc = ssb_bus_powerup(sdev->bus, 0);
if (rc) {
@@ -2305,12 +2307,12 @@ static int b44_resume(struct ssb_device *sdev)
return rc;
}

- spin_lock_irq(&bp->lock);
+ spin_lock_irqsave(&bp->lock, flags);

b44_init_rings(bp);
b44_init_hw(bp, B44_FULL_RESET);
netif_device_attach(bp->dev);
- spin_unlock_irq(&bp->lock);
+ spin_unlock_irqrestore(&bp->lock, flags);

b44_enable_ints(bp);
netif_wake_queue(dev);
--
1.6.0.4

> So can you test the follow patch. And show the dmesg info(DEBUG
> level) after WARNING is triggered?
>
> diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
> index fb0f46f..4a00a1a 100644
> --- a/kernel/time/timekeeping.c
> +++ b/kernel/time/timekeeping.c
> @@ -569,6 +569,9 @@ static int timekeeping_resume(struct sys_device *dev)
>        unsigned long flags;
>        struct timespec ts;
>
> +       WARN_ONCE(!irqs_disabled(),
> +               KERN_INFO "timekeeping_resume() called with IRQs enabled!");
> +
>        read_persistent_clock(&ts);
>
>        clocksource_resume();
>
> Thanks,
> Yong
>
>> [  120.872009] Modules linked in: i915 drm_kms_helper drm i2c_algo_bit
>> i2c_core sco bnep rfcomm l2cap crc16 xt_tcpudp xt_limit xt_state
>> iptable_filter nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 ip_tables
>> x_tables aes_i586 aes_generic cbc dm_crypt dm_snapshot dm_mirror
>> dm_region_hash dm_log dm_mod hp_wmi fuse sbp2 loop
>> snd_hda_codec_si3054 snd_hda_codec_analog snd_hda_intel snd_hda_codec
>> snd_pcm_oss snd_mixer_oss snd_pcm snd_seq_dummy arc4 snd_seq_oss ecb
>> snd_seq_midi snd_rawmidi iwl3945 snd_seq_midi_event iwlcore btusb
>> firmware_class snd_seq bluetooth snd_timer mac80211 pcmcia
>> snd_seq_device led_class b44 video ohci1394 backlight ssb rtc_cmos snd
>> yenta_socket cfg80211 intel_agp soundcore rsrc_nonstatic uhci_hcd
>> ehci_hcd rtc_core usbcore psmouse snd_page_alloc agpgart pcmcia_core
>> rfkill rtc_lib ieee1394 sg output evdev serio_raw mii fan button ac
>> battery
>> [  120.872009] Pid: 3510, comm: pm-hibernate Not tainted 2.6.31-git17
>> #1
>> [  120.872009] Call Trace:
>> [  120.872009]  [<c030f4a3>] ? __sysdev_resume+0xc3/0xe0
>> [  120.872009]  [<c030f4a3>] ? __sysdev_resume+0xc3/0xe0
>> [  120.872009]  [<c013c3a1>] warn_slowpath_common+0x71/0xc0
>> [  120.872009]  [<c030f4a3>] ? __sysdev_resume+0xc3/0xe0
>> [  120.872009]  [<c013c43b>] warn_slowpath_fmt+0x2b/0x30
>> [  120.872009]  [<c030f4a3>] __sysdev_resume+0xc3/0xe0
>> [  120.872009]  [<c015f810>] ? timekeeping_resume+0x0/0x1c0
>> [  120.872009]  [<c030f50f>] sysdev_resume+0x4f/0xc0
>> [  120.872009]  [<c0176909>] ? hibernate_nvs_restore+0x19/0x60
>> [  120.872009]  [<c0172ac1>] hibernation_snapshot+0x1d1/0x210
>> [  120.872009]  [<c0171b54>] ? freeze_processes+0x44/0xa0
>> [  120.872009]  [<c0172bef>] hibernate+0xef/0x190
>> [  120.872009]  [<c0171590>] ? state_store+0x0/0xc0
>> [  120.872009]  [<c017163b>] state_store+0xab/0xc0
>> [  120.872009]  [<c0171590>] ? state_store+0x0/0xc0
>> [  120.872009]  [<c0285e04>] kobj_attr_store+0x24/0x30
>> [  120.872009]  [<c0223d82>] sysfs_write_file+0xa2/0x100
>> [  120.872009]  [<c01d880c>] vfs_write+0x9c/0x150
>> [  120.872009]  [<c0223ce0>] ? sysfs_write_file+0x0/0x100
>> [  120.872009]  [<c01d8982>] sys_write+0x42/0x70
>> [  120.872009]  [<c0102f04>] sysenter_do_call+0x12/0x22
>> [  120.872009] ---[ end trace 51d3cc987b340170 ]---
>> [  120.872009] Enabling non-boot CPUs ...
>> [  120.872009] SMP alternatives: switching to SMP code
>>
>> Regards
>> --
>> Maciej Rutecki
>> http://www.maciek.unixy.pl
>>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/