wifi: ath12k: change soc name to device name

To have consistent nomenclature, replace the use of the term "soc"
with the term "device".

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-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: Vinith Kumar R <quic_vinithku@quicinc.com>
Signed-off-by: Nithyanantham Paramasivam <nithyanantham.paramasivam@oss.qualcomm.com>
Reviewed-by: Mahendran P <quic_mahep@quicinc.com>
Link: https://patch.msgid.link/20250425012802.698914-2-nithyanantham.paramasivam@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index dea25ce9000974fc04af3695acf6d7a1b4487477..3ca9cf12a30b46473a4277fa058af0aa7de597c8 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -1834,9 +1834,9 @@ static int ath12k_core_get_wsi_info(struct ath12k_hw_group *ag,
                of_node_put(next_rx_endpoint);
 
                device_count++;
-               if (device_count > ATH12K_MAX_SOCS) {
+               if (device_count > ATH12K_MAX_DEVICES) {
                        ath12k_warn(ab, "device count in DT %d is more than limit %d\n",
-                                   device_count, ATH12K_MAX_SOCS);
+                                   device_count, ATH12K_MAX_DEVICES);
                        of_node_put(next_wsi_dev);
                        return -EINVAL;
                }

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 3aafbac46e81af9ed2da34201522fb9e73650205..347ab6a0e39c71e11fe3b39b05240721ec1e97fb 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -63,8 +63,8 @@
 #define ATH12K_RECONFIGURE_TIMEOUT_HZ          (10 * HZ)
 #define ATH12K_RECOVER_START_TIMEOUT_HZ                (20 * HZ)
 
-#define ATH12K_MAX_SOCS 3
-#define ATH12K_GROUP_MAX_RADIO (ATH12K_MAX_SOCS * MAX_RADIOS)
+#define ATH12K_MAX_DEVICES 3
+#define ATH12K_GROUP_MAX_RADIO (ATH12K_MAX_DEVICES * MAX_RADIOS)
 #define ATH12K_INVALID_GROUP_ID  0xFF
 #define ATH12K_INVALID_DEVICE_ID 0xFF
 
@@ -904,7 +904,7 @@ struct ath12k_board_data {
        size_t len;
 };
 
-struct ath12k_soc_dp_tx_err_stats {
+struct ath12k_device_dp_tx_err_stats {
        /* TCL Ring Descriptor unavailable */
        u32 desc_na[DP_TCL_NUM_RING_MAX];
        /* Other failures during dp_tx due to mem allocation failure
@@ -913,13 +913,13 @@ struct ath12k_soc_dp_tx_err_stats {
        atomic_t misc_fail;
 };
 
-struct ath12k_soc_dp_stats {
+struct ath12k_device_dp_stats {
        u32 err_ring_pkts;
        u32 invalid_rbm;
        u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX];
        u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX];
        u32 hal_reo_error[DP_REO_DST_RING_MAX];
-       struct ath12k_soc_dp_tx_err_stats tx_err;
+       struct ath12k_device_dp_tx_err_stats tx_err;
 };
 
 struct ath12k_reg_freq {
@@ -948,7 +948,7 @@ struct ath12k_hw_group {
        u8 num_probed;
        u8 num_started;
        unsigned long flags;
-       struct ath12k_base *ab[ATH12K_MAX_SOCS];
+       struct ath12k_base *ab[ATH12K_MAX_DEVICES];
 
        /* protects access to this struct */
        struct mutex mutex;
@@ -962,7 +962,7 @@ struct ath12k_hw_group {
        struct ath12k_hw *ah[ATH12K_GROUP_MAX_RADIO];
        u8 num_hw;
        bool mlo_capable;
-       struct device_node *wsi_node[ATH12K_MAX_SOCS];
+       struct device_node *wsi_node[ATH12K_MAX_DEVICES];
        struct ath12k_mlo_memory mlo_mem;
        struct ath12k_hw_link hw_links[ATH12K_GROUP_MAX_RADIO];
        bool hw_link_id_init_done;
@@ -1074,7 +1074,7 @@ struct ath12k_base {
 
        /* Current DFS Regulatory */
        enum ath12k_dfs_region dfs_region;
-       struct ath12k_soc_dp_stats soc_stats;
+       struct ath12k_device_dp_stats device_stats;
 #ifdef CONFIG_ATH12K_DEBUGFS
        struct dentry *debugfs_soc;
 #endif

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index d606a29c89ed5d2e80d9462177a65f24b530ef4c..56beda0e0b804ba04051080b24fc8daabeca578d 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -2634,7 +2634,7 @@ static bool ath12k_dp_rx_check_nwifi_hdr_len_valid(struct ath12k_base *ab,
        if ((likely(hdr_len <= DP_MAX_NWIFI_HDR_LEN)))
                return true;
 
-       ab->soc_stats.invalid_rbm++;
+       ab->device_stats.invalid_rbm++;
        WARN_ON_ONCE(1);
        return false;
 }
@@ -2797,9 +2797,9 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,
                         struct napi_struct *napi, int budget)
 {
        struct ath12k_hw_group *ag = ab->ag;
-       struct list_head rx_desc_used_list[ATH12K_MAX_SOCS];
+       struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];
        struct ath12k_hw_link *hw_links = ag->hw_links;
-       int num_buffs_reaped[ATH12K_MAX_SOCS] = {};
+       int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};
        struct ath12k_rx_desc_info *desc_info;
        struct ath12k_dp *dp = &ab->dp;
        struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring;
@@ -2816,7 +2816,7 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id,
 
        __skb_queue_head_init(&msdu_list);
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++)
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++)
                INIT_LIST_HEAD(&rx_desc_used_list[device_id]);
 
        srng = &ab->hal.srng_list[dp->reo_dst_ring[ring_id].ring_id];
@@ -2883,7 +2883,7 @@ try_again:
                if (push_reason !=
                    HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {
                        dev_kfree_skb_any(msdu);
-                       ab->soc_stats.hal_reo_error[ring_id]++;
+                       ab->device_stats.hal_reo_error[ring_id]++;
                        continue;
                }
 
@@ -2933,7 +2933,7 @@ try_again:
        if (!total_msdu_reaped)
                goto exit;
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++) {
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++) {
                if (!num_buffs_reaped[device_id])
                        continue;
 
@@ -3650,9 +3650,9 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
                             int budget)
 {
        struct ath12k_hw_group *ag = ab->ag;
-       struct list_head rx_desc_used_list[ATH12K_MAX_SOCS];
+       struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];
        u32 msdu_cookies[HAL_NUM_RX_MSDUS_PER_LINK_DESC];
-       int num_buffs_reaped[ATH12K_MAX_SOCS] = {};
+       int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};
        struct dp_link_desc_bank *link_desc_banks;
        enum hal_rx_buf_return_buf_manager rbm;
        struct hal_rx_msdu_link *link_desc_va;
@@ -3674,7 +3674,7 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
        tot_n_bufs_reaped = 0;
        quota = budget;
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++)
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++)
                INIT_LIST_HEAD(&rx_desc_used_list[device_id]);
 
        reo_except = &ab->dp.reo_except_ring;
@@ -3688,7 +3688,7 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
        while (budget &&
               (reo_desc = ath12k_hal_srng_dst_get_next_entry(ab, srng))) {
                drop = false;
-               ab->soc_stats.err_ring_pkts++;
+               ab->device_stats.err_ring_pkts++;
 
                ret = ath12k_hal_desc_reo_parse_err(ab, reo_desc, &paddr,
                                                    &desc_bank);
@@ -3715,7 +3715,7 @@ int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi,
                if (rbm != partner_ab->dp.idle_link_rbm &&
                    rbm != HAL_RX_BUF_RBM_SW3_BM &&
                    rbm != partner_ab->hw_params->hal_params->rx_buf_rbm) {
-                       ab->soc_stats.invalid_rbm++;
+                       ab->device_stats.invalid_rbm++;
                        ath12k_warn(ab, "invalid return buffer manager %d\n", rbm);
                        ath12k_dp_rx_link_desc_return(partner_ab,
                                                      &reo_desc->buf_addr_info,
@@ -3764,7 +3764,7 @@ exit:
 
        spin_unlock_bh(&srng->lock);
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++) {
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++) {
                if (!num_buffs_reaped[device_id])
                        continue;
 
@@ -3880,7 +3880,7 @@ static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu,
        struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu);
        bool drop = false;
 
-       ar->ab->soc_stats.reo_error[rxcb->err_code]++;
+       ar->ab->device_stats.reo_error[rxcb->err_code]++;
 
        switch (rxcb->err_code) {
        case HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO:
@@ -3953,7 +3953,7 @@ static bool ath12k_dp_rx_h_rxdma_err(struct ath12k *ar,  struct sk_buff *msdu,
        bool drop = false;
        u32 err_bitmap;
 
-       ar->ab->soc_stats.rxdma_error[rxcb->err_code]++;
+       ar->ab->device_stats.rxdma_error[rxcb->err_code]++;
 
        switch (rxcb->err_code) {
        case HAL_REO_ENTR_RING_RXDMA_ECODE_DECRYPT_ERR:
@@ -4012,7 +4012,7 @@ static void ath12k_dp_rx_wbm_err(struct ath12k *ar,
 int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
                                 struct napi_struct *napi, int budget)
 {
-       struct list_head rx_desc_used_list[ATH12K_MAX_SOCS];
+       struct list_head rx_desc_used_list[ATH12K_MAX_DEVICES];
        struct ath12k_hw_group *ag = ab->ag;
        struct ath12k *ar;
        struct ath12k_dp *dp = &ab->dp;
@@ -4023,7 +4023,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
        struct sk_buff_head msdu_list, scatter_msdu_list;
        struct ath12k_skb_rxcb *rxcb;
        void *rx_desc;
-       int num_buffs_reaped[ATH12K_MAX_SOCS] = {};
+       int num_buffs_reaped[ATH12K_MAX_DEVICES] = {};
        int total_num_buffs_reaped = 0;
        struct ath12k_rx_desc_info *desc_info;
        struct ath12k_hw_link *hw_links = ag->hw_links;
@@ -4035,7 +4035,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
        __skb_queue_head_init(&msdu_list);
        __skb_queue_head_init(&scatter_msdu_list);
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++)
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++)
                INIT_LIST_HEAD(&rx_desc_used_list[device_id]);
 
        srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id];
@@ -4159,7 +4159,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
        if (!total_num_buffs_reaped)
                goto done;
 
-       for (device_id = 0; device_id < ATH12K_MAX_SOCS; device_id++) {
+       for (device_id = 0; device_id < ATH12K_MAX_DEVICES; device_id++) {
                if (!num_buffs_reaped[device_id])
                        continue;
 

diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index f6b02c1c035a60de957bf38526a22a106a891175..a62c9cff721969f218583e25206b9919e20ba707 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -350,7 +350,7 @@ tcl_ring_sel:
        default:
                /* TODO: Take care of other encap modes as well */
                ret = -EINVAL;
-               atomic_inc(&ab->soc_stats.tx_err.misc_fail);
+               atomic_inc(&ab->device_stats.tx_err.misc_fail);
                goto fail_remove_tx_buf;
        }
 
@@ -373,7 +373,7 @@ tcl_ring_sel:
 map:
        ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE);
        if (dma_mapping_error(ab->dev, ti.paddr)) {
-               atomic_inc(&ab->soc_stats.tx_err.misc_fail);
+               atomic_inc(&ab->device_stats.tx_err.misc_fail);
                ath12k_warn(ab, "failed to DMA map data Tx buffer\n");
                ret = -ENOMEM;
                goto fail_remove_tx_buf;
@@ -448,7 +448,7 @@ map:
                 * desc because the desc is directly enqueued onto hw queue.
                 */
                ath12k_hal_srng_access_end(ab, tcl_ring);
-               ab->soc_stats.tx_err.desc_na[ti.ring_id]++;
+               ab->device_stats.tx_err.desc_na[ti.ring_id]++;
                spin_unlock_bh(&tcl_ring->lock);
                ret = -ENOMEM;
 

diff --git a/drivers/net/wireless/ath/ath12k/hal_rx.c b/drivers/net/wireless/ath/ath12k/hal_rx.c
index d440dea37e992293978613ea6e8d3a94f54cf99f..48aa48c48606a43c0a2190796ae7ddfe81b0fe8a 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal_rx.c
+++ b/drivers/net/wireless/ath/ath12k/hal_rx.c
@@ -326,7 +326,7 @@ int ath12k_hal_desc_reo_parse_err(struct ath12k_base *ab,
                                    HAL_REO_DEST_RING_INFO0_PUSH_REASON);
        err_code = le32_get_bits(desc->info0,
                                 HAL_REO_DEST_RING_INFO0_ERROR_CODE);
-       ab->soc_stats.reo_error[err_code]++;
+       ab->device_stats.reo_error[err_code]++;
 
        if (push_reason != HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED &&
            push_reason != HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) {
@@ -381,7 +381,7 @@ int ath12k_hal_wbm_desc_parse_err(struct ath12k_base *ab, void *desc,
                val = le32_get_bits(wbm_desc->buf_addr_info.info1,
                                    BUFFER_ADDR_INFO1_RET_BUF_MGR);
                if (val != HAL_RX_BUF_RBM_SW3_BM) {
-                       ab->soc_stats.invalid_rbm++;
+                       ab->device_stats.invalid_rbm++;
                        return -EINVAL;
                }
 
@@ -393,7 +393,7 @@ int ath12k_hal_wbm_desc_parse_err(struct ath12k_base *ab, void *desc,
                val = le32_get_bits(wbm_cc_desc->info0,
                                    HAL_WBM_RELEASE_RX_CC_INFO0_RBM);
                if (val != HAL_RX_BUF_RBM_SW3_BM) {
-                       ab->soc_stats.invalid_rbm++;
+                       ab->device_stats.invalid_rbm++;
                        return -EINVAL;
                }