Return-path: Received: from mail-pg0-f49.google.com ([74.125.83.49]:32855 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753839AbdCaUVu (ORCPT ); Fri, 31 Mar 2017 16:21:50 -0400 Received: by mail-pg0-f49.google.com with SMTP id x125so80746158pgb.0 for ; Fri, 31 Mar 2017 13:21:50 -0700 (PDT) From: Brian Norris To: Amitkumar Karwar , Nishant Sarmukadam Cc: Kalle Valo , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Torokhov , Jeffy Chen , Brian Norris Subject: [RFC PATCH] Revert "mwifiex: fix system hang problem after resume" Date: Fri, 31 Mar 2017 13:21:36 -0700 Message-Id: <20170331202136.100342-1-briannorris@chromium.org> (sfid-20170331_222224_815368_71F9E593) Sender: linux-wireless-owner@vger.kernel.org List-ID: This reverts commit 437322ea2a36d112e20aa7282c869bf924b3a836. This above-mentioned "fix" does not actually do anything to prevent a race condition. It simply papers over it so that the issue doesn't appear. If this is a real problem, it should be explained better than the above commit does, and an alternative, non-racy solution should be found. For further reason to revert this: there's ot reason we can't try resetting the card when it's *actually* stuck in host-sleep mode. So instead, this is unnecessarily creating scenarios where we can't recover Wifi. Cc: Amitkumar Karwar Signed-off-by: Brian Norris --- Amit, please take a look. AIUI, your "fix" is wrong, and quite racy. If you still think it's needed, can you please propose an alternative? Or at least explain more why this is needed? Thanks. drivers/net/wireless/marvell/mwifiex/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index 756948385b60..0dab77b526de 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c +++ b/drivers/net/wireless/marvell/mwifiex/init.c @@ -60,7 +60,7 @@ static void wakeup_timer_fn(unsigned long data) adapter->hw_status = MWIFIEX_HW_STATUS_RESET; mwifiex_cancel_all_pending_cmd(adapter); - if (adapter->if_ops.card_reset && !adapter->hs_activated) + if (adapter->if_ops.card_reset) adapter->if_ops.card_reset(adapter); } -- 2.12.2.564.g063fe858b8-goog