Skip to contentSkip to conversation

brcmfmac: avoid duplicated suspend/resume operation

PATCH In review Fu, Zhonghui 4 participants 8 messages Jan 20, 2015 – Feb 2, 2015

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Fu, Zhonghui

author
#0 lore raw

PATCH 1/1 brcmfmac: avoid duplicated suspend/resume operation

Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu <[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel <[email protected]>
Acked-by Sergei Shtylyov <[email protected]>
Acked-by Kalle Valo <[email protected]>
Signed-off-by Zhonghui Fu <[email protected]>
---
 drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c +15 -2
index 9880dae..618b545 100644
@@ -1139,11 +1139,17 @@ void brcmf_sdio_wowl_config(struct device *dev, bool enabled)
 static int brcmf_ops_sdio_suspend(struct device *dev)
 {
 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+	struct brcmf_sdio_dev *sdiodev;
 	mmc_pm_flag_t sdio_flags;
+	struct sdio_func *func = dev_to_sdio_func(dev);
 
 	brcmf_dbg(SDIO, "Enter\n");
 
+	if (func->num == 2)
+		return 0;
+
+	sdiodev = bus_if->bus_priv.sdio;
+
 	atomic_set(&sdiodev->suspend, true);
 
 	if (sdiodev->wowl_enabled) {

@@ -1164,9 +1170,16 @@ static int brcmf_ops_sdio_suspend(struct device *dev)
 static int brcmf_ops_sdio_resume(struct device *dev)
 {
 	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-	struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+	struct brcmf_sdio_dev *sdiodev;
+	struct sdio_func *func = dev_to_sdio_func(dev);
 
 	brcmf_dbg(SDIO, "Enter\n");
+
+	if (func->num == 2)
+		return 0;
+
+	sdiodev = bus_if->bus_priv.sdio;
+
 	if (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)
 		disable_irq_wake(sdiodev->pdata->oob_irq_nr);
 	brcmf_sdio_wd_timer(sdiodev->bus, BRCMF_WD_POLL_MS);

-- 1.7.1

#1 lore raw
Quoted 5 lines · Zhonghui
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

Quoted 8 lines

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/[email protected]>
Acked-by Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/[email protected]>
Acked-by Kalle Valo <[email protected]>
Signed-off-by Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

Please do not add Acked-by, Signed-off-by or any other tags unless explicitly specified by the person in question. I'm dropping this, please resend with real Acked-by lines.

Signature · 5 lines
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw

Hello.

Quoted 9 lines · Kalle Valo
Quoted 8 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Quoted 7 lines
Quoted 4 lines
Acked-by Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/[email protected]>
Acked-by Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/[email protected]>
Acked-by Kalle Valo <[email protected]>
Signed-off-by Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

I haven't ACK'ed this patch either.

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 18 lines · Sergei Shtylyov

Hello.

Quoted 13 lines · Kalle Valo
Quoted 13 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/[email protected]>
Acked-by Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/[email protected]>
Acked-by Kalle Valo <[email protected]>
Signed-off-by Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Quoted 4 lines
Quoted 2 lines

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

I haven't ACK'ed this patch either.

I did ACK the initial patch and felt it still valid for this 'V2' patch.

Regards,
Arend
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
Quoted 19 lines · Arend van Spriel
Quoted 18 lines · Sergei Shtylyov

Hello.

Quoted 13 lines · Kalle Valo
Quoted 13 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel <arend-dY08KVG/lbpWk0Htik3J/[email protected]>
Acked-by Sergei Shtylyov <sergei.shtylyov-M4DtvfQ/[email protected]>
Acked-by Kalle Valo <[email protected]>
Signed-off-by Zhonghui Fu <zhonghui.fu-VuQAYsv1563Yd54FQh9/[email protected]>
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

I haven't ACK'ed this patch either.

I did ACK the initial patch and felt it still valid for this 'V2' patch.

Ok, thanks. So the patch is good, Zhonghui just needs to remove the two acked-by lines.

Signature · 5 lines
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#5 lore raw
Quoted 24 lines · Kalle Valo
Quoted 22 lines · Arend van Spriel
Quoted 21 lines · Sergei Shtylyov

Hello.

Quoted 16 lines · Kalle Valo
Quoted 5 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu<[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

Quoted 8 lines

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel<[email protected]>
Acked-by Sergei Shtylyov<[email protected]>
Acked-by Kalle Valo<[email protected]>
Signed-off-by Zhonghui Fu<[email protected]>

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

I haven't ACK'ed this patch either.

I did ACK the initial patch and felt it still valid for this 'V2' patch.

Ok, thanks. So the patch is good, Zhonghui just needs to remove the two acked-by lines.

Indeed.

Regards,
Arend

author
#6 lore raw
Quoted 25 lines · Arend van Spriel
Quoted 24 lines · Kalle Valo
Quoted 22 lines · Arend van Spriel
Quoted 21 lines · Sergei Shtylyov

Hello.

Quoted 16 lines · Kalle Valo
Quoted 5 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu<[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation

Quoted 8 lines

WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel<[email protected]>
Acked-by Sergei Shtylyov<[email protected]>
Acked-by Kalle Valo<[email protected]>
Signed-off-by Zhonghui Fu<[email protected]>

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

I haven't ACK'ed this patch either.

I did ACK the initial patch and felt it still valid for this 'V2' patch.

Ok, thanks. So the patch is good, Zhonghui just needs to remove the two acked-by lines.

Indeed.

I have removed the two acked-by lines and sent the new patch in another mail.

Thanks,
Zhonghui

Quoted 7 lines

Regards,
Arend

Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
author
#7 lore raw
Quoted 23 lines · Zhonghui
Quoted 22 lines · Arend van Spriel
Quoted 21 lines · Kalle Valo
Quoted 19 lines · Arend van Spriel
Quoted 18 lines · Sergei Shtylyov

Hello.

Quoted 11 lines · Kalle Valo
Quoted 11 lines
Quoted 1 line

From 04d3fa673897ca4ccbea6c76836d0092dba2484a Mon Sep 17 00:00:00 2001

From: Zhonghui Fu<[email protected]>
Date: Tue, 20 Jan 2015 11:14:13 +0800
Subject: [PATCH] brcmfmac: avoid duplicated suspend/resume operation WiFi chip has 2 SDIO functions, and PM core will trigger twice suspend/resume operations for one WiFi chip to do the same things. This patch avoid this case.

Acked-by Arend van Spriel<[email protected]>
Acked-by Sergei Shtylyov<[email protected]>
Acked-by Kalle Valo<[email protected]>
Signed-off-by Zhonghui Fu<[email protected]>
Quoted 2 lines

I don't remember giving Acked-by to this (or for matter to anything for a long time). What about Sergei or Arend?

I haven't ACK'ed this patch either.

Quoted 8 lines
Quoted 4 lines
Quoted 3 lines
Quoted 1 line

I did ACK the initial patch and felt it still valid for this 'V2' patch.

Ok, thanks. So the patch is good, Zhonghui just needs to remove the two acked-by lines.

Indeed.

I have removed the two acked-by lines and sent the new patch in another mail.

Thanks,
Zhonghui

What comments about the new patch? Can this new patch be accepted?

Thanks,
Zhonghui

Quoted 6 lines
Quoted 6 lines

Regards,
Arend

Signature · 3 lines
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html