Skip to contentSkip to conversation

mwifiex: fix SDIO interrupt lost issue

PATCH In review Bing Zhao 3 participants 5 messages Sep 27, 2013 – Oct 15, 2013 1 message not in the archive Networking drivers (wireless)

lore
Share & tools
lore

Bing Zhao

author
#0 lore raw

PATCH 1/1 mwifiex: fix SDIO interrupt lost issue

From: Amitkumar Karwar <[email protected]>

601216e "mwifiex: process RX packets in SDIO IRQ thread directly" introduced a command timeout issue which can be reproduced easily on an AM33xx platform using a test application written by Daniel Mack:

https://gist.github.com/zonque/6579314

mwifiex_main_process() is called from both the SDIO handler and the workqueue. In case an interrupt occurs right after the int_status check, but before updating the mwifiex_processing flag, this interrupt gets lost, resulting in a command timeout and consequently a card reset.

Let main_proc_lock protect both int_status and mwifiex_processing flag. This fixes the interrupt lost issue.

---
 drivers/net/wireless/mwifiex/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mwifiex/main.c +4 -2
index fd77833..c2b91f5 100644
@@ -358,10 +358,12 @@ process_start:
 		}
 	} while (true);
 
-	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+	spin_lock_irqsave(&adapter->main_proc_lock, flags);
+	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 		goto process_start;
+	}
 
-	spin_lock_irqsave(&adapter->main_proc_lock, flags);
 	adapter->mwifiex_processing = false;
 	spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 
Signature · 1 line
1.8.2.3
#1 lore raw
Quoted 7 lines · Bing Zhao

From: Amitkumar Karwar <[email protected]>

601216e "mwifiex: process RX packets in SDIO IRQ thread directly" introduced a command timeout issue which can be reproduced easily on an AM33xx platform using a test application written by Daniel Mack:

https://gist.github.com/zonque/6579314

Actually, just out of pure curiosity, I would be interested whether the issue is also as easily reproducible on other platform like Chromebooks. Could anyone give that a try maybe?

Thanks,
Daniel

Quoted 42 lines

mwifiex_main_process() is called from both the SDIO handler and the workqueue. In case an interrupt occurs right after the int_status check, but before updating the mwifiex_processing flag, this interrupt gets lost, resulting in a command timeout and consequently a card reset.

Let main_proc_lock protect both int_status and mwifiex_processing flag. This fixes the interrupt lost issue.

---
 drivers/net/wireless/mwifiex/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mwifiex/main.c +4 -2
index fd77833..c2b91f5 100644
@@ -358,10 +358,12 @@ process_start:
 		}
 	} while (true);
 
-	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+	spin_lock_irqsave(&adapter->main_proc_lock, flags);
+	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 		goto process_start;
+	}
 
-	spin_lock_irqsave(&adapter->main_proc_lock, flags);
 	adapter->mwifiex_processing = false;
 	spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 

A message that is not in the archive (sent off-list or not yet received): CAMcMvsjFurVFS2f1zCPt0uqh2gCYAvHOvos-pY=k06=ynDH=aQ@mail.gmail.com

#3 lore raw
Quoted 11 lines · Paul Stewart

On Fri, Sep 27, 2013 at 11:55 AM, Daniel Mack <[email protected] <mailto:[email protected]>> wrote:

On 27.09.2013 19 <tel:27.09.2013%2019>:55, Bing Zhao wrote:
> From: Amitkumar Karwar <[email protected] <mailto:[email protected]>>
>
> 601216e "mwifiex: process RX packets in SDIO IRQ thread directly" > introduced a command timeout issue which can be reproduced easily on > an AM33xx platform using a test application written by Daniel Mack:
>

Quoted 8 lines

> https://gist.github.com/zonque/6579314

Actually, just out of pure curiosity, I would be interested whether the issue is also as easily reproducible on other platform like Chromebooks. Could anyone give that a try maybe?

I would hesitate to say "easily". Even on a kernel before your change,
running your test application

That might be a dumb remark, but you noticed that the interface name in the code doesn't actually match the name of the interface mwifiex creates by default? We changed that to "wlan0" in our system to bring it in line with other platforms.

I changed the test tool in the gist so it requires you to pass the name as first argument.

Daniel

#4 lore raw
In reply to Bing Zhao
Quoted 8 lines · Bing Zhao

From: Amitkumar Karwar <[email protected]>

601216e "mwifiex: process RX packets in SDIO IRQ thread directly" introduced a command timeout issue which can be reproduced easily on an AM33xx platform using a test application written by Daniel Mack:

https://gist.github.com/zonque/6579314

Quoted 8 lines

mwifiex_main_process() is called from both the SDIO handler and the workqueue. In case an interrupt occurs right after the int_status check, but before updating the mwifiex_processing flag, this interrupt gets lost, resulting in a command timeout and consequently a card reset.

Let main_proc_lock protect both int_status and mwifiex_processing flag. This fixes the interrupt lost issue.

John, could you take this patch trough your tree?

Thanks,
Daniel

Quoted 33 lines
---
 drivers/net/wireless/mwifiex/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/mwifiex/main.c +4 -2
index fd77833..c2b91f5 100644
@@ -358,10 +358,12 @@ process_start:
 		}
 	} while (true);
 
-	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter))
+	spin_lock_irqsave(&adapter->main_proc_lock, flags);
+	if ((adapter->int_status) || IS_CARD_RX_RCVD(adapter)) {
+		spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 		goto process_start;
+	}
 
-	spin_lock_irqsave(&adapter->main_proc_lock, flags);
 	adapter->mwifiex_processing = false;
 	spin_unlock_irqrestore(&adapter->main_proc_lock, flags);
 
#5 lore raw
Quoted 14 lines · Bing Zhao
Quoted 14 lines

From: Amitkumar Karwar <[email protected]>

601216e "mwifiex: process RX packets in SDIO IRQ thread directly" introduced a command timeout issue which can be reproduced easily on an AM33xx platform using a test application written by Daniel Mack:

https://gist.github.com/zonque/6579314

mwifiex_main_process() is called from both the SDIO handler and the workqueue. In case an interrupt occurs right after the int_status check, but before updating the mwifiex_processing flag, this interrupt gets lost, resulting in a command timeout and consequently a card reset.

Quoted 4 lines
Quoted 2 lines

Let main_proc_lock protect both int_status and mwifiex_processing flag. This fixes the interrupt lost issue.

John, could you take this patch trough your tree?

I already did, and it is already in Dave's tree too...

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.