wifi: ath12k: Refactor the hardware cookie conversion init

Currently, the Rx descriptor is placed before the Tx descriptor in the
primary page table of the hardware cookie conversion configuration. The
Tx and Rx descriptor offsets are implicitly hardcoded. To allow for easy
displacement of Tx and Rx descriptors, introduce Tx and Rx offset based
cookie conversion initializationi. Additionally, should consider
validating the respective offset ranges while retrieving the Tx and Rx
descriptors. This change will be utilize by the next patch in the series.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-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>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240411102226.4045323-3-quic_periyasa@quicinc.com

diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 796c757c0f58b1c588fca9b9447182f61b04f73e..c8b2eb80b160b207b9bbb28271be34d8abef9ec0 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -1344,12 +1344,16 @@ struct ath12k_rx_desc_info *ath12k_dp_get_rx_desc(struct ath12k_base *ab,
                                                  u32 cookie)
 {
        struct ath12k_rx_desc_info **desc_addr_ptr;
-       u16 ppt_idx, spt_idx;
+       u16 start_ppt_idx, end_ppt_idx, ppt_idx, spt_idx;
 
        ppt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_PPT);
        spt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_SPT);
 
-       if (ppt_idx > ATH12K_NUM_RX_SPT_PAGES ||
+       start_ppt_idx = ATH12K_RX_SPT_PAGE_OFFSET;
+       end_ppt_idx = start_ppt_idx + ATH12K_NUM_RX_SPT_PAGES;
+
+       if (ppt_idx < start_ppt_idx ||
+           ppt_idx >= end_ppt_idx ||
            spt_idx > ATH12K_MAX_SPT_ENTRIES)
                return NULL;
 
@@ -1362,13 +1366,17 @@ struct ath12k_tx_desc_info *ath12k_dp_get_tx_desc(struct ath12k_base *ab,
                                                  u32 cookie)
 {
        struct ath12k_tx_desc_info **desc_addr_ptr;
-       u16 ppt_idx, spt_idx;
+       u16 start_ppt_idx, end_ppt_idx, ppt_idx, spt_idx;
 
        ppt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_PPT);
        spt_idx = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_SPT);
 
-       if (ppt_idx < ATH12K_NUM_RX_SPT_PAGES ||
-           ppt_idx > ab->dp.num_spt_pages ||
+       start_ppt_idx = ATH12K_TX_SPT_PAGE_OFFSET;
+       end_ppt_idx = start_ppt_idx +
+                     (ATH12K_TX_SPT_PAGES_PER_POOL * ATH12K_HW_MAX_QUEUES);
+
+       if (ppt_idx < start_ppt_idx ||
+           ppt_idx >= end_ppt_idx ||
            spt_idx > ATH12K_MAX_SPT_ENTRIES)
                return NULL;
 
@@ -1397,15 +1405,16 @@ static int ath12k_dp_cc_desc_init(struct ath12k_base *ab)
                        return -ENOMEM;
                }
 
+               ppt_idx = ATH12K_RX_SPT_PAGE_OFFSET + i;
                dp->spt_info->rxbaddr[i] = &rx_descs[0];
 
                for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) {
-                       rx_descs[j].cookie = ath12k_dp_cc_cookie_gen(i, j);
+                       rx_descs[j].cookie = ath12k_dp_cc_cookie_gen(ppt_idx, j);
                        rx_descs[j].magic = ATH12K_DP_RX_DESC_MAGIC;
                        list_add_tail(&rx_descs[j].list, &dp->rx_desc_free_list);
 
                        /* Update descriptor VA in SPT */
-                       rx_desc_addr = ath12k_dp_cc_get_desc_addr_ptr(ab, i, j);
+                       rx_desc_addr = ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, j);
                        *rx_desc_addr = &rx_descs[j];
                }
        }
@@ -1425,7 +1434,7 @@ static int ath12k_dp_cc_desc_init(struct ath12k_base *ab)
                        }
 
                        tx_spt_page = i + pool_id * ATH12K_TX_SPT_PAGES_PER_POOL;
-                       ppt_idx = ATH12K_NUM_RX_SPT_PAGES + tx_spt_page;
+                       ppt_idx = ATH12K_TX_SPT_PAGE_OFFSET + tx_spt_page;
 
                        dp->spt_info->txbaddr[tx_spt_page] = &tx_descs[0];
 

diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h
index 4939aa41dd87997edc43d65139f70606eda0af5e..57aba97cbdce2b5b000821ec7c6f924ed3450603 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.h
+++ b/drivers/net/wireless/ath/ath12k/dp.h
@@ -223,6 +223,9 @@ struct ath12k_pdev_dp {
 #define ATH12K_NUM_TX_SPT_PAGES        (ATH12K_TX_SPT_PAGES_PER_POOL * ATH12K_HW_MAX_QUEUES)
 #define ATH12K_NUM_SPT_PAGES   (ATH12K_NUM_RX_SPT_PAGES + ATH12K_NUM_TX_SPT_PAGES)
 
+#define ATH12K_TX_SPT_PAGE_OFFSET ATH12K_NUM_RX_SPT_PAGES
+#define ATH12K_RX_SPT_PAGE_OFFSET 0
+
 /* The SPT pages are divided for RX and TX, first block for RX
  * and remaining for TX
  */