projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 80347ec8 GKH |
1 | From foo@baz Mon Oct 8 18:01:43 CEST 2018 |
| 2 | From: Kai-Heng Feng <kai.heng.feng@canonical.com> | |
| 3 | Date: Tue, 11 Sep 2018 01:51:43 +0800 | |
| 4 | Subject: r8169: Clear RTL_FLAG_TASK_*_PENDING when clearing RTL_FLAG_TASK_ENABLED | |
| 5 | ||
| 6 | From: Kai-Heng Feng <kai.heng.feng@canonical.com> | |
| 7 | ||
| 8 | [ Upstream commit 6ad569019999300afd8e614d296fdc356550b77f ] | |
| 9 | ||
| 10 | After system suspend, sometimes the r8169 doesn't work when ethernet | |
| 11 | cable gets pluggued. | |
| 12 | ||
| 13 | This issue happens because rtl_reset_work() doesn't get called from | |
| 14 | rtl8169_runtime_resume(), after system suspend. | |
| 15 | ||
| 16 | In rtl_task(), RTL_FLAG_TASK_* only gets cleared if this condition is | |
| 17 | met: | |
| 18 | if (!netif_running(dev) || | |
| 19 | !test_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags)) | |
| 20 | ... | |
| 21 | ||
| 22 | If RTL_FLAG_TASK_ENABLED was cleared during system suspend while | |
| 23 | RTL_FLAG_TASK_RESET_PENDING was set, the next rtl_schedule_task() won't | |
| 24 | schedule task as the flag is still there. | |
| 25 | ||
| 26 | So in addition to clearing RTL_FLAG_TASK_ENABLED, also clears other | |
| 27 | flags. | |
| 28 | ||
| 29 | Cc: Heiner Kallweit <hkallweit1@gmail.com> | |
| 30 | Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> | |
| 31 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
| 32 | Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> | |
| 33 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 34 | --- | |
| 35 | drivers/net/ethernet/realtek/r8169.c | 9 ++++++--- | |
| 36 | 1 file changed, 6 insertions(+), 3 deletions(-) | |
| 37 | ||
| 38 | --- a/drivers/net/ethernet/realtek/r8169.c | |
| 39 | +++ b/drivers/net/ethernet/realtek/r8169.c | |
| 40 | @@ -760,7 +760,7 @@ struct rtl8169_tc_offsets { | |
| 41 | }; | |
| 42 | ||
| 43 | enum rtl_flag { | |
| 44 | - RTL_FLAG_TASK_ENABLED, | |
| 45 | + RTL_FLAG_TASK_ENABLED = 0, | |
| 46 | RTL_FLAG_TASK_SLOW_PENDING, | |
| 47 | RTL_FLAG_TASK_RESET_PENDING, | |
| 48 | RTL_FLAG_TASK_PHY_PENDING, | |
| 49 | @@ -7637,7 +7637,8 @@ static int rtl8169_close(struct net_devi | |
| 50 | rtl8169_update_counters(dev); | |
| 51 | ||
| 52 | rtl_lock_work(tp); | |
| 53 | - clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); | |
| 54 | + /* Clear all task flags */ | |
| 55 | + bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); | |
| 56 | ||
| 57 | rtl8169_down(dev); | |
| 58 | rtl_unlock_work(tp); | |
| 59 | @@ -7820,7 +7821,9 @@ static void rtl8169_net_suspend(struct n | |
| 60 | ||
| 61 | rtl_lock_work(tp); | |
| 62 | napi_disable(&tp->napi); | |
| 63 | - clear_bit(RTL_FLAG_TASK_ENABLED, tp->wk.flags); | |
| 64 | + /* Clear all task flags */ | |
| 65 | + bitmap_zero(tp->wk.flags, RTL_FLAG_MAX); | |
| 66 | + | |
| 67 | rtl_unlock_work(tp); | |
| 68 | ||
| 69 | rtl_pll_power_down(tp); |