wifi: ath12k: add ath12k_get_num_hw()

Currently, one or more struct ath12k_hw is part of device (struct ath12k_base)
but in future, ath12k_hw would be part of device group (struct
ath12k_hw_group).  Hence, num_hw under device would be moved to device group.

To facilitate above transition, add helper ath12k_get_num_hw() to get the
number of radios per device. In future, this helper will return the number of
radios in a device group.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Signed-off-by: Harshitha Prem <quic_hprem@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20241128165026.2618331-4-kvalo@kernel.org

diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index 14d0aa26d850a95715aa51ebdac9cbef4107a5c3..386d42db29ac0aee3ee9a4549c1ac98fd384f1e0 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -985,7 +985,7 @@ static void ath12k_rfkill_work(struct work_struct *work)
        rfkill_radio_on = ab->rfkill_radio_on;
        spin_unlock_bh(&ab->base_lock);
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                ah = ath12k_ab_to_ah(ab, i);
                if (!ah)
                        continue;
@@ -1037,7 +1037,7 @@ static void ath12k_core_pre_reconfigure_recovery(struct ath12k_base *ab)
        if (ab->is_reset)
                set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags);
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                ah = ath12k_ab_to_ah(ab, i);
                if (!ah || ah->state == ATH12K_HW_STATE_OFF)
                        continue;
@@ -1076,7 +1076,7 @@ static void ath12k_core_post_reconfigure_recovery(struct ath12k_base *ab)
        struct ath12k *ar;
        int i, j;
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                ah = ath12k_ab_to_ah(ab, i);
                if (!ah || ah->state == ATH12K_HW_STATE_OFF)
                        continue;
@@ -1130,7 +1130,7 @@ static void ath12k_core_restart(struct work_struct *work)
        }
 
        if (ab->is_reset) {
-               for (i = 0; i < ab->num_hw; i++) {
+               for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                        ah = ath12k_ab_to_ah(ab, i);
                        ieee80211_restart_hw(ah->hw);
                }

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index ba52be1cfd0f85eaf508752e14810fac9a3088e6..4bfc7a7cc89488b594ad5ea864cb892315246669 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -1171,4 +1171,9 @@ static inline void ath12k_ab_set_ah(struct ath12k_base *ab, int idx,
 {
        ab->ah[idx] = ah;
 }
+
+static inline int ath12k_get_num_hw(struct ath12k_base *ab)
+{
+       return ab->num_hw;
+}
 #endif /* _CORE_H_ */

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 8cafb67523c9846b0ff923397b4fb1cd340e99f6..129607ac6c1a15773ba7a30aaa86cde6fc0f924e 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -10831,7 +10831,7 @@ int ath12k_mac_register(struct ath12k_base *ab)
        ab->cc_freq_hz = 320000;
        ab->free_vdev_map = (1LL << (ab->num_radios * TARGET_NUM_VDEVS)) - 1;
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                ah = ath12k_ab_to_ah(ab, i);
 
                ret = ath12k_mac_hw_register(ah);
@@ -10858,7 +10858,7 @@ void ath12k_mac_unregister(struct ath12k_base *ab)
        struct ath12k_hw *ah;
        int i;
 
-       for (i = ab->num_hw - 1; i >= 0; i--) {
+       for (i = ath12k_get_num_hw(ab) - 1; i >= 0; i--) {
                ah = ath12k_ab_to_ah(ab, i);
                if (!ah)
                        continue;
@@ -10928,7 +10928,7 @@ void ath12k_mac_destroy(struct ath12k_base *ab)
                pdev->ar = NULL;
        }
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                ah = ath12k_ab_to_ah(ab, i);
                if (!ah)
                        continue;
@@ -10951,7 +10951,7 @@ int ath12k_mac_allocate(struct ath12k_base *ab)
        ab->num_hw = ab->num_radios;
        radio_per_hw = 1;
 
-       for (i = 0; i < ab->num_hw; i++) {
+       for (i = 0; i < ath12k_get_num_hw(ab); i++) {
                for (j = 0; j < radio_per_hw; j++) {
                        pdev_map[j].ab = ab;
                        pdev_map[j].pdev_idx = (i * radio_per_hw) + j;