iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: ath11k: fix Tx power value during active CAC

Browse Source 
[ Upstream commit 77f1ee6fd8 ]

Tx power is fetched from firmware's pdev stats. However, during active
CAC, firmware does not fill the current Tx power and sends the max
initialised value filled during firmware init. If host sends this power
to user space, this is wrong since in certain situations, the Tx power
could be greater than the max allowed by the regulatory. Hence, host
should not be fetching the Tx power during an active CAC.

Fix this issue by returning -EAGAIN error so that user space knows that there's
no valid value available.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1

Fixes: 9a2aa68afe ("wifi: ath11k: add get_txpower mac ops")
Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20230912051857.2284-4-quic_adisi@quicinc.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Aditya Kumar Singh
2023-10-03 17:26:54 +03:00
committed by Greg Kroah-Hartman
parent 66eee612a1
commit 2d88afdac2
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ath11k/mac.c
View File

@ -9042,6 +9042,14 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,
if (ar->state != ATH11K_STATE_ON) if (ar->state != ATH11K_STATE_ON)
goto err_fallback; goto err_fallback;
/* Firmware doesn't provide Tx power during CAC hence no need to fetch
* the stats.
*/
if (test_bit(ATH11K_CAC_RUNNING, &ar->dev_flags)) {
mutex_unlock(&ar->conf_mutex);
return -EAGAIN;
}
req_param.pdev_id = ar->pdev->pdev_id; req_param.pdev_id = ar->pdev->pdev_id;
req_param.stats_id = WMI_REQUEST_PDEV_STAT; req_param.stats_id = WMI_REQUEST_PDEV_STAT;