Return-path: Received: from svenfoo.org ([82.94.215.22]:50108 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753055Ab3IQSZt (ORCPT ); Tue, 17 Sep 2013 14:25:49 -0400 From: Daniel Mack To: linux-wireless@vger.kernel.org Cc: s.neumann@raumfeld.com, afenkart@gmail.com, bzhao@marvell.com, linville@tuxdriver.com, johannes.berg@intel.com, Daniel Mack , Subject: [PATCH 3.12] mwifiex: queue main work from main process when bailing on races Date: Tue, 17 Sep 2013 20:25:30 +0200 Message-Id: <1379442330-18249-1-git-send-email-zonque@gmail.com> (sfid-20130917_202552_895527_167FFB4B) Sender: linux-wireless-owner@vger.kernel.org List-ID: Queue main_work in case mwifiex_main_process() bails due to an already processed transaction. This is particularly necessary because mwifiex_main_process() is called from both the SDIO interrupt handler and the workqueue. In case an interrupt occurs while the main process is currently executed from the workqueue, the interrupt is lost, resulting in a command timeout and consequently a card reset. I'm marking this for stable kernel in version 3.7+, because on our platform, the issue appears since 601216e12c ("mwifiex: process RX packets in SDIO IRQ thread directly") went in. Signed-off-by: Daniel Mack Reported-by: Sven Neumann Reported-by: Andreas Fenkart Cc: Bing Zhao Cc: [v3.7+] --- drivers/net/wireless/mwifiex/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index ff4ed96..0700bc2 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -235,6 +235,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter) /* Check if already processing */ if (adapter->mwifiex_processing) { spin_unlock_irqrestore(&adapter->main_proc_lock, flags); + queue_work(adapter->workqueue, &adapter->main_work); goto exit_main_proc; } else { adapter->mwifiex_processing = true; -- 1.8.3.1