wifi: ath11k: fix Tx power value during active CAC
authorAditya Kumar Singh <quic_adisi@quicinc.com>
Tue, 3 Oct 2023 14:26:54 +0000 (17:26 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Nov 2023 10:59:00 +0000 (11:59 +0100)
[ Upstream commit 77f1ee6fd8b6e470f721d05a2e269039d5cafcb7 ]

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: 9a2aa68afe3d ("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>
drivers/net/wireless/ath/ath11k/mac.c

index c071bf5841af60e67cc2b815e732f4bca86e63c8..b328a0599818b1bf53be2cec34f56154036964ea 100644 (file)
@@ -9042,6 +9042,14 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw,
        if (ar->state != ATH11K_STATE_ON)
                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.stats_id = WMI_REQUEST_PDEV_STAT;