* [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
@ 2022-09-19 2:41 ` Wen Gong
0 siblings, 0 replies; 6+ messages in thread
From: Wen Gong @ 2022-09-19 2:41 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, quic_wgong
For 11d scan, commit 9dcf6808b253 ("ath11k: add 11d scan offload support")
increased the timeout from one second to max 10 seconds when 11d scan
offload enabled and 6 GHz enabled, it is reasonable for the commit, it
is because the first 11d scan request is sent to firmware before the
first hw scan request after wlan load, then the hw scan started event
will reported from firmware after the 11d scan finished, it needs about
6 seconds when 6 GHz enabled, so increased it from one second to 10
seconds in the commit to avoid timed out for hw scan started. Then
another commit 1f682dc9fb37 ("ath11k: reduce the wait time of 11d scan
and hw scan while add interface") change the sequence of the first 11d
scan and hw scan, then ath11k will receive the hw scan started event
from firmware immediately for the first hw scan, thus ath11k does not
need set the timeout value to max 10 seconds again, and this is to set
the timeout value back from 10 seconds to 1 second.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 4218211afa30..8a6dd4b04176 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3560,7 +3560,6 @@ static int ath11k_start_scan(struct ath11k *ar,
struct scan_req_params *arg)
{
int ret;
- unsigned long timeout = 1 * HZ;
lockdep_assert_held(&ar->conf_mutex);
@@ -3571,14 +3570,7 @@ static int ath11k_start_scan(struct ath11k *ar,
if (ret)
return ret;
- if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar->ab->wmi_ab.svc_map)) {
- timeout = 5 * HZ;
-
- if (ar->supports_6ghz)
- timeout += 5 * HZ;
- }
-
- ret = wait_for_completion_timeout(&ar->scan.started, timeout);
+ ret = wait_for_completion_timeout(&ar->scan.started, 1 * HZ);
if (ret == 0) {
ret = ath11k_scan_stop(ar);
if (ret)
base-commit: c6d18be90f9b0c7fb64c6138b51c49151140fb57
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
@ 2022-09-19 2:41 ` Wen Gong
0 siblings, 0 replies; 6+ messages in thread
From: Wen Gong @ 2022-09-19 2:41 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, quic_wgong
For 11d scan, commit 9dcf6808b253 ("ath11k: add 11d scan offload support")
increased the timeout from one second to max 10 seconds when 11d scan
offload enabled and 6 GHz enabled, it is reasonable for the commit, it
is because the first 11d scan request is sent to firmware before the
first hw scan request after wlan load, then the hw scan started event
will reported from firmware after the 11d scan finished, it needs about
6 seconds when 6 GHz enabled, so increased it from one second to 10
seconds in the commit to avoid timed out for hw scan started. Then
another commit 1f682dc9fb37 ("ath11k: reduce the wait time of 11d scan
and hw scan while add interface") change the sequence of the first 11d
scan and hw scan, then ath11k will receive the hw scan started event
from firmware immediately for the first hw scan, thus ath11k does not
need set the timeout value to max 10 seconds again, and this is to set
the timeout value back from 10 seconds to 1 second.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
---
drivers/net/wireless/ath/ath11k/mac.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c
index 4218211afa30..8a6dd4b04176 100644
--- a/drivers/net/wireless/ath/ath11k/mac.c
+++ b/drivers/net/wireless/ath/ath11k/mac.c
@@ -3560,7 +3560,6 @@ static int ath11k_start_scan(struct ath11k *ar,
struct scan_req_params *arg)
{
int ret;
- unsigned long timeout = 1 * HZ;
lockdep_assert_held(&ar->conf_mutex);
@@ -3571,14 +3570,7 @@ static int ath11k_start_scan(struct ath11k *ar,
if (ret)
return ret;
- if (test_bit(WMI_TLV_SERVICE_11D_OFFLOAD, ar->ab->wmi_ab.svc_map)) {
- timeout = 5 * HZ;
-
- if (ar->supports_6ghz)
- timeout += 5 * HZ;
- }
-
- ret = wait_for_completion_timeout(&ar->scan.started, timeout);
+ ret = wait_for_completion_timeout(&ar->scan.started, 1 * HZ);
if (ret == 0) {
ret = ath11k_scan_stop(ar);
if (ret)
base-commit: c6d18be90f9b0c7fb64c6138b51c49151140fb57
--
2.31.1
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
2022-09-19 2:41 ` Wen Gong
@ 2022-09-22 8:14 ` Kalle Valo
-1 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2022-09-22 8:14 UTC (permalink / raw)
To: Wen Gong; +Cc: ath11k, linux-wireless, quic_wgong
Wen Gong <quic_wgong@quicinc.com> wrote:
> For 11d scan, commit 9dcf6808b253 ("ath11k: add 11d scan offload support")
> increased the timeout from one second to max 10 seconds when 11d scan
> offload enabled and 6 GHz enabled, it is reasonable for the commit, it
> is because the first 11d scan request is sent to firmware before the
> first hw scan request after wlan load, then the hw scan started event
> will reported from firmware after the 11d scan finished, it needs about
> 6 seconds when 6 GHz enabled, so increased it from one second to 10
> seconds in the commit to avoid timed out for hw scan started. Then
> another commit 1f682dc9fb37 ("ath11k: reduce the wait time of 11d scan
> and hw scan while add interface") change the sequence of the first 11d
> scan and hw scan, then ath11k will receive the hw scan started event
> from firmware immediately for the first hw scan, thus ath11k does not
> need set the timeout value to max 10 seconds again, and this is to set
> the timeout value back from 10 seconds to 1 second.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
With this patch I started seeing new errors:
[ 1194.815104] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
[ 1196.864157] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
[ 1198.911926] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
This seems to happen after my suspend tests, but didn't have time to
investigate further.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220919024121.24820-1-quic_wgong@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
@ 2022-09-22 8:14 ` Kalle Valo
0 siblings, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2022-09-22 8:14 UTC (permalink / raw)
To: Wen Gong; +Cc: ath11k, linux-wireless, quic_wgong
Wen Gong <quic_wgong@quicinc.com> wrote:
> For 11d scan, commit 9dcf6808b253 ("ath11k: add 11d scan offload support")
> increased the timeout from one second to max 10 seconds when 11d scan
> offload enabled and 6 GHz enabled, it is reasonable for the commit, it
> is because the first 11d scan request is sent to firmware before the
> first hw scan request after wlan load, then the hw scan started event
> will reported from firmware after the 11d scan finished, it needs about
> 6 seconds when 6 GHz enabled, so increased it from one second to 10
> seconds in the commit to avoid timed out for hw scan started. Then
> another commit 1f682dc9fb37 ("ath11k: reduce the wait time of 11d scan
> and hw scan while add interface") change the sequence of the first 11d
> scan and hw scan, then ath11k will receive the hw scan started event
> from firmware immediately for the first hw scan, thus ath11k does not
> need set the timeout value to max 10 seconds again, and this is to set
> the timeout value back from 10 seconds to 1 second.
>
> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3
>
> Signed-off-by: Wen Gong <quic_wgong@quicinc.com>
With this patch I started seeing new errors:
[ 1194.815104] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
[ 1196.864157] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
[ 1198.911926] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
This seems to happen after my suspend tests, but didn't have time to
investigate further.
--
https://patchwork.kernel.org/project/linux-wireless/patch/20220919024121.24820-1-quic_wgong@quicinc.com/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
2022-09-22 8:14 ` Kalle Valo
@ 2022-09-23 2:36 ` Wen Gong
-1 siblings, 0 replies; 6+ messages in thread
From: Wen Gong @ 2022-09-23 2:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: ath11k, linux-wireless
On 9/22/2022 4:14 PM, Kalle Valo wrote:
> Wen Gong <quic_wgong@quicinc.com> wrote:
>
...
> With this patch I started seeing new errors:
>
> [ 1194.815104] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
> [ 1196.864157] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
> [ 1198.911926] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
>
> This seems to happen after my suspend tests, but didn't have time to
> investigate further.
Thanks Kalle.
I guess it is caused by 11d scan is running at that moment, I will
provide v2 for it to avoid the "failed to start hw scan: -110".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second
@ 2022-09-23 2:36 ` Wen Gong
0 siblings, 0 replies; 6+ messages in thread
From: Wen Gong @ 2022-09-23 2:36 UTC (permalink / raw)
To: Kalle Valo; +Cc: ath11k, linux-wireless
On 9/22/2022 4:14 PM, Kalle Valo wrote:
> Wen Gong <quic_wgong@quicinc.com> wrote:
>
...
> With this patch I started seeing new errors:
>
> [ 1194.815104] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
> [ 1196.864157] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
> [ 1198.911926] ath11k_pci 0000:06:00.0: failed to start hw scan: -110
>
> This seems to happen after my suspend tests, but didn't have time to
> investigate further.
Thanks Kalle.
I guess it is caused by 11d scan is running at that moment, I will
provide v2 for it to avoid the "failed to start hw scan: -110".
--
ath11k mailing list
ath11k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath11k
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-23 3:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-19 2:41 [PATCH] wifi: ath11k: reduce the timeout value back for hw scan from 10 seconds to 1 second Wen Gong
2022-09-19 2:41 ` Wen Gong
2022-09-22 8:14 ` Kalle Valo
2022-09-22 8:14 ` Kalle Valo
2022-09-23 2:36 ` Wen Gong
2022-09-23 2:36 ` Wen Gong
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.