Skip to contentSkip to conversation

mwifiex: Make resume actually do something useful again on SDIO cards

PATCH In review Douglas Anderson 4 participants 8 messages Apr 4, 2019 – Apr 25, 2019 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mwifiex: Make resume actually do something useful again on SDIO cards

The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") had a fairly straightforward bug in it. It contained this bit of diff:

- if (!adapter->is_suspended) {
+ if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {

As you can see the patch missed the "!" when converting to the atomic bitops. This meant that the resume hasn't done anything at all since that commit landed and suspend/resume for mwifiex SDIO cards has been totally broken.

After fixing this mwifiex suspend/resume appears to work again, at least with the simple testing I've done.

Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables")

---

 drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/marvell/mwifiex/sdio.c +1 -1
index a85648342d15..d5a70340a945 100644
@@ -181,7 +181,7 @@ static int mwifiex_sdio_resume(struct device *dev)
 
 	adapter = card->adapter;
 
-	if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {
+	if (!test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {
 		mwifiex_dbg(adapter, WARN,
 			    "device already resumed\n");
 		return 0;
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
#1 lore raw
Quoted 12 lines · Douglas Anderson

The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") had a fairly straightforward bug in it. It contained this bit of diff:

- if (!adapter->is_suspended) {
+ if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {

As you can see the patch missed the "!" when converting to the atomic bitops. This meant that the resume hasn't done anything at all since that commit landed and suspend/resume for mwifiex SDIO cards has been totally broken.

Quoted 5 lines

After fixing this mwifiex suspend/resume appears to work again, at least with the simple testing I've done.

Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables")

I'm planning to queue this for 5.1.

Signature · 1 line
Kalle Valo
maintainer Reviewed-by
#2 lore raw
Quoted 5 lines · Kalle Valo
Quoted 2 lines · Douglas Anderson
Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables")

I'm planning to queue this for 5.1.

With an explicit

please? Somebody would likely pick it up anyway, but it's nice to be explicit.

Not that it really matters, but also:

Thanks,
Brian

#3 lore raw
Quoted 6 lines · Brian Norris
Quoted 5 lines · Kalle Valo
Quoted 3 lines · Douglas Anderson
Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent

adapter status variables")

Quoted 8 lines
Quoted 1 line

I'm planning to queue this for 5.1.

With an explicit

please? Somebody would likely pick it up anyway, but it's nice to be explicit.

Ok, I'll add that.

Quoted 3 lines

Not that it really matters, but also:

This patchwork picks up automatically so I don't have to do anything. But I so wish it would do the same for Cc and Fixes tags :)

Signature · 1 line
Kalle Valo
#4 lore raw

Hi,

Quoted 10 lines · Kalle Valo
Quoted 7 lines · Brian Norris
Quoted 6 lines · Kalle Valo
Quoted 3 lines · Douglas Anderson
Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent

adapter status variables")

I'm planning to queue this for 5.1.

Do you know when you plan to queue this? I don't see the patch in Linus's tree nor in linux-next. Just want to make sure it didn't get forgotten...

Thanks!

-Doug

#5 lore raw
Quoted 10 lines · Doug Anderson
Quoted 9 lines · Kalle Valo
Quoted 6 lines · Brian Norris
Quoted 5 lines · Kalle Valo
Quoted 3 lines · Douglas Anderson
Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent

adapter status variables")

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

I'm planning to queue this for 5.1.

Do you know when you plan to queue this? I don't see the patch in Linus's tree nor in linux-next. Just want to make sure it didn't get forgotten...

It's on my queue and not forgotten:

https://patchwork.kernel.org/patch/10884883/

Due to various reasons I'm really struggling with patches right now, sorry about that, but I'm slowly catching up. I should be able to apply this within a week.

Signature · 1 line
Kalle Valo
#6 lore raw
In reply to Douglas Anderson
Quoted 12 lines · Douglas Anderson

The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") had a fairly straightforward bug in it. It contained this bit of diff:

- if (!adapter->is_suspended) {
+ if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {

As you can see the patch missed the "!" when converting to the atomic bitops. This meant that the resume hasn't done anything at all since that commit landed and suspend/resume for mwifiex SDIO cards has been totally broken.

Quoted 7 lines

After fixing this mwifiex suspend/resume appears to work again, at least with the simple testing I've done.

Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables")

Patch applied to wireless-drivers.git, thanks.

b82d6c1f8f82 mwifiex: Make resume actually do something useful again on SDIO cards

Signature · 3 lines
https://patchwork.kernel.org/patch/10884883/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

A message that is not in the archive (sent off-list or not yet received): 20190404040106.40519-1-dianders-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org

#8 lore raw
Quoted 12 lines · Douglas Anderson

The commit fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables") had a fairly straightforward bug in it. It contained this bit of diff:

- if (!adapter->is_suspended) {
+ if (test_bit(MWIFIEX_IS_SUSPENDED, &adapter->work_flags)) {

As you can see the patch missed the "!" when converting to the atomic bitops. This meant that the resume hasn't done anything at all since that commit landed and suspend/resume for mwifiex SDIO cards has been totally broken.

Quoted 7 lines

After fixing this mwifiex suspend/resume appears to work again, at least with the simple testing I've done.

Fixes fc3a2fcaa1ba ("mwifiex: use atomic bitops to represent adapter status variables")

Patch applied to wireless-drivers.git, thanks.

b82d6c1f8f82 mwifiex: Make resume actually do something useful again on SDIO cards

Signature · 3 lines
https://patchwork.kernel.org/patch/10884883/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches