diff mbox series

[v6,01/12] wcn36xx: Return result of set_power_params in suspend

Message ID 20210605011140.2004643-2-bryan.odonoghue@linaro.org
State Accepted
Commit ba4e967379f0a2c2a72fb572c69761218a2468a6
Delegated to: Kalle Valo
Headers show
Series wcn36xx: Enable downstream consistent Wake on Lan | expand

Commit Message

Bryan O'Donoghue June 5, 2021, 1:11 a.m. UTC
wcn36xx_smd_set_power_params() can return an error. For the purposes of
entering into suspend we need the suspend() function to trap and report
errors up the stack.

First step in this process is reporting the existing result code for
wcn36xx_smd_set_power_params().

Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Tested-by: Benjamin Li <benl@squareup.com>
---
 drivers/net/wireless/ath/wcn36xx/main.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Kalle Valo June 14, 2021, 3:18 p.m. UTC | #1
Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:

> wcn36xx_smd_set_power_params() can return an error. For the purposes of
> entering into suspend we need the suspend() function to trap and report
> errors up the stack.
> 
> First step in this process is reporting the existing result code for
> wcn36xx_smd_set_power_params().
> 
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Tested-by: Benjamin Li <benl@squareup.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

12 patches applied to ath-next branch of ath.git, thanks.

ba4e967379f0 wcn36xx: Return result of set_power_params in suspend
f2f49601067b wcn36xx: Run suspend for the first ieee80211_vif
5478c41fce5d wcn36xx: Add ipv4 ARP offload support in suspend
6feb634f4d9f wcn36xx: Do not flush indication queue on suspend/resume
c7a61af55976 wcn36xx: Add ipv6 address tracking
1456223c4684 wcn36xx: Add ipv6 namespace offload in suspend
8974e5917b31 wcn36xx: Add set_rekey_data callback
6693f7675c9b wcn36xx: Add GTK offload to WoWLAN path
bedf1169bcae wcn36xx: Add GTK offload info to WoWLAN resume
60f0078b1ebd wcn36xx: Add Host suspend indication support
ebe7c1a6635f wcn36xx: Add host resume request support
1e2e8ee95734 wcn36xx: Enable WOWLAN flags
Kalle Valo June 14, 2021, 3:25 p.m. UTC | #2
Kalle Valo <kvalo@codeaurora.org> writes:

> Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote:
>
>> wcn36xx_smd_set_power_params() can return an error. For the purposes of
>> entering into suspend we need the suspend() function to trap and report
>> errors up the stack.
>> 
>> First step in this process is reporting the existing result code for
>> wcn36xx_smd_set_power_params().
>> 
>> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
>> Tested-by: Benjamin Li <benl@squareup.com>
>> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
>
> 12 patches applied to ath-next branch of ath.git, thanks.
>
> ba4e967379f0 wcn36xx: Return result of set_power_params in suspend
> f2f49601067b wcn36xx: Run suspend for the first ieee80211_vif
> 5478c41fce5d wcn36xx: Add ipv4 ARP offload support in suspend
> 6feb634f4d9f wcn36xx: Do not flush indication queue on suspend/resume
> c7a61af55976 wcn36xx: Add ipv6 address tracking
> 1456223c4684 wcn36xx: Add ipv6 namespace offload in suspend
> 8974e5917b31 wcn36xx: Add set_rekey_data callback
> 6693f7675c9b wcn36xx: Add GTK offload to WoWLAN path
> bedf1169bcae wcn36xx: Add GTK offload info to WoWLAN resume
> 60f0078b1ebd wcn36xx: Add Host suspend indication support
> ebe7c1a6635f wcn36xx: Add host resume request support
> 1e2e8ee95734 wcn36xx: Enable WOWLAN flags

BTW, I'm not sure about CONFIG_IPV6 checks but they looked minor so I
applied these anyway. But can you check them anyway and send a followup
patch if my hunch is correct?

main.c:#if IS_ENABLED(CONFIG_IPV6)
main.c:#if IS_ENABLED(CONFIG_IPV6)

These two look ok.

smd.c:#if IS_ENABLED(CONFIG_IPV6)
wcn36xx.h:#if IS_ENABLED(CONFIG_IPV6)

But these two seem unnecessary, at least I was not able to find anything
which would require these. Although I didn't have time to do a build
test so of course I might have missed something.
Bryan O'Donoghue June 14, 2021, 3:36 p.m. UTC | #3
On 14/06/2021 16:25, Kalle Valo wrote:
> BTW, I'm not sure about CONFIG_IPV6 checks but they looked minor so I
> applied these anyway. But can you check them anyway and send a followup
> patch if my hunch is correct?

np
Kalle Valo June 15, 2021, 6:41 a.m. UTC | #4
Bryan O'Donoghue <bryan.odonoghue@linaro.org> writes:

> On 14/06/2021 16:25, Kalle Valo wrote:
>> BTW, I'm not sure about CONFIG_IPV6 checks but they looked minor so I
>> applied these anyway. But can you check them anyway and send a followup
>> patch if my hunch is correct?
>
> np

Thanks. The less ifdefs we have the better.
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
index afb4877eaad8..b361e40697a6 100644
--- a/drivers/net/wireless/ath/wcn36xx/main.c
+++ b/drivers/net/wireless/ath/wcn36xx/main.c
@@ -1091,12 +1091,14 @@  static int wcn36xx_sta_remove(struct ieee80211_hw *hw,
 static int wcn36xx_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wow)
 {
 	struct wcn36xx *wcn = hw->priv;
+	int ret;
 
 	wcn36xx_dbg(WCN36XX_DBG_MAC, "mac suspend\n");
 
 	flush_workqueue(wcn->hal_ind_wq);
-	wcn36xx_smd_set_power_params(wcn, true);
-	return 0;
+	ret = wcn36xx_smd_set_power_params(wcn, true);
+
+	return ret;
 }
 
 static int wcn36xx_resume(struct ieee80211_hw *hw)