* [PATCH] r8169: enable napi on resume.
@ 2012-04-03 20:29 Artem Savkov
2012-04-03 23:03 ` Francois Romieu
0 siblings, 1 reply; 3+ messages in thread
From: Artem Savkov @ 2012-04-03 20:29 UTC (permalink / raw)
To: romieu; +Cc: nic_swsd, netdev, Artem Savkov
NAPI is disabled during suspend and needs to be enabled on resume. Without
this the driver locks up during resume in rtl_reset_work() trying to disable
NAPI again.
Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index d2ec075..e259c88 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -5810,7 +5810,10 @@ static void __rtl8169_resume(struct net_device *dev)
rtl_pll_power_up(tp);
+ rtl_lock_work(tp);
+ napi_enable(&tp->napi);
set_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags);
+ rtl_unlock_work(tp);
rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] r8169: enable napi on resume.
2012-04-03 20:29 [PATCH] r8169: enable napi on resume Artem Savkov
@ 2012-04-03 23:03 ` Francois Romieu
2012-04-03 23:09 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Francois Romieu @ 2012-04-03 23:03 UTC (permalink / raw)
To: Artem Savkov; +Cc: nic_swsd, netdev
Artem Savkov <artem.savkov@gmail.com> :
> NAPI is disabled during suspend and needs to be enabled on resume. Without
> this the driver locks up during resume in rtl_reset_work() trying to disable
> NAPI again.
>
> Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
:o(
It fixes runtime_{suspend / resume} as well.
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
--
Ueimor
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] r8169: enable napi on resume.
2012-04-03 23:03 ` Francois Romieu
@ 2012-04-03 23:09 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2012-04-03 23:09 UTC (permalink / raw)
To: romieu; +Cc: artem.savkov, nic_swsd, netdev
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed, 4 Apr 2012 01:03:17 +0200
> Artem Savkov <artem.savkov@gmail.com> :
>> NAPI is disabled during suspend and needs to be enabled on resume. Without
>> this the driver locks up during resume in rtl_reset_work() trying to disable
>> NAPI again.
>>
>> Signed-off-by: Artem Savkov <artem.savkov@gmail.com>
>
> :o(
>
> It fixes runtime_{suspend / resume} as well.
>
> Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-04-03 23:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-03 20:29 [PATCH] r8169: enable napi on resume Artem Savkov
2012-04-03 23:03 ` Francois Romieu
2012-04-03 23:09 ` 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).