wifi: ath12k: add hardware ops support for QCC2072

Due to HAL descriptors, QCC2027 has different offsets of MPDU start tag
and MSDU end tag, compared with other chips. Hence add new hardware
ops structure for QCC2072. All ops are directly taken from WCN7850, with
the exception to rxdma_ring_sel_config, which needs a new function
ath12k_dp_rxdma_ring_sel_config_qcc2072() to handle the difference
mentioned above.

Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0-01560-QCACOLSWPL_V1_TO_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3

Signed-off-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20260112-ath12k-support-qcc2072-v2-12-fc8ce1e43969@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
index dc8d72aeca4574a4a062c5b90d400498a900fb4e..7450938adf6576260ab6ab826d730427ce89ce21 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
@@ -9,6 +9,7 @@
 #include "../peer.h"
 #include "hal_qcn9274.h"
 #include "hal_wcn7850.h"
+#include "hal_qcc2072.h"
 
 static u16 ath12k_wifi7_dp_rx_get_peer_id(struct ath12k_dp *dp,
                                          enum ath12k_peer_metadata_version ver,
@@ -2110,6 +2111,49 @@ int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab)
        return ret;
 }
 
+int ath12k_dp_rxdma_ring_sel_config_qcc2072(struct ath12k_base *ab)
+{
+       struct ath12k_dp *dp = ath12k_ab_to_dp(ab);
+       struct htt_rx_ring_tlv_filter tlv_filter = {};
+       u32 ring_id;
+       int ret = 0;
+       u32 hal_rx_desc_sz = ab->hal.hal_desc_sz;
+       int i;
+
+       ring_id = dp->rx_refill_buf_ring.refill_buf_ring.ring_id;
+
+       tlv_filter.rx_filter = HTT_RX_TLV_FLAGS_RXDMA_RING;
+       tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR;
+       tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST |
+                                      HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST |
+                                      HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_NULL_DATA;
+       tlv_filter.offset_valid = true;
+       tlv_filter.rx_packet_offset = hal_rx_desc_sz;
+
+       tlv_filter.rx_header_offset = offsetof(struct hal_rx_desc_qcc2072, pkt_hdr_tlv);
+
+       tlv_filter.rx_mpdu_start_offset =
+               ath12k_hal_rx_desc_get_mpdu_start_offset_qcc2072();
+       tlv_filter.rx_msdu_end_offset =
+               ath12k_hal_rx_desc_get_msdu_end_offset_qcc2072();
+
+       /*
+        * TODO: Selectively subscribe to required qwords within msdu_end
+        * and mpdu_start and setup the mask in below msg
+        * and modify the rx_desc struct
+        */
+
+       for (i = 0; i < ab->hw_params->num_rxdma_per_pdev; i++) {
+               ring_id = dp->rx_mac_buf_ring[i].ring_id;
+               ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, i,
+                                                      HAL_RXDMA_BUF,
+                                                      DP_RXDMA_REFILL_RING_SIZE,
+                                                      &tlv_filter);
+       }
+
+       return ret;
+}
+
 void ath12k_wifi7_dp_rx_process_reo_status(struct ath12k_dp *dp)
 {
        struct ath12k_base *ab = dp->ab;

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h
index a98836b83f482a70287899d4f97d6c57186cc505..8aa79faf567fd061b1717f7b9da09c8962990027 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h
@@ -22,6 +22,7 @@ int ath12k_wifi7_dp_rx_process(struct ath12k_dp *dp, int mac_id,
 void ath12k_wifi7_dp_rx_process_reo_status(struct ath12k_dp *dp);
 int ath12k_dp_rxdma_ring_sel_config_qcn9274(struct ath12k_base *ab);
 int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab);
+int ath12k_dp_rxdma_ring_sel_config_qcc2072(struct ath12k_base *ab);
 void ath12k_wifi7_dp_setup_pn_check_reo_cmd(struct ath12k_hal_reo_cmd *cmd,
                                            struct ath12k_dp_rx_tid *rx_tid,
                                            u32 cipher, enum set_key_cmd key_cmd);

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.c b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.c
index 847484ece2044885a6ce54beec1e77175f591769..522b94b04f9f40578473a6ccdb649517f3f9e6f1 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.c
@@ -454,3 +454,13 @@ const struct hal_ops hal_qcc2072_ops = {
        .reo_cmd_enc_tlv_hdr = ath12k_hal_encode_tlv64_hdr,
        .reo_status_dec_tlv_hdr = ath12k_hal_decode_tlv64_hdr,
 };
+
+u32 ath12k_hal_rx_desc_get_mpdu_start_offset_qcc2072(void)
+{
+       return offsetof(struct hal_rx_desc_qcc2072, mpdu_start_tag);
+}
+
+u32 ath12k_hal_rx_desc_get_msdu_end_offset_qcc2072(void)
+{
+       return offsetof(struct hal_rx_desc_qcc2072, msdu_end_tag);
+}

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.h b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.h
index 392bfbb6a4124a3f2c709048a3ffea5fc8b13de9..6de943df77864d7ec58d8f12c099237b4510a3c4 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.h
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hal_qcc2072.h
@@ -8,3 +8,6 @@
 
 extern const struct ath12k_hw_regs qcc2072_regs;
 extern const struct hal_ops hal_qcc2072_ops;
+
+u32 ath12k_hal_rx_desc_get_mpdu_start_offset_qcc2072(void);
+u32 ath12k_hal_rx_desc_get_msdu_end_offset_qcc2072(void);

diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hw.c b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
index 38c388319e008d7c2ab40d1ca5b783cc47816c2e..f75690f586cd934552510c5e3cbb98d0492d2e44 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wifi7/hw.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
@@ -170,6 +170,16 @@ static const struct ath12k_hw_ops wcn7850_ops = {
        .is_frame_link_agnostic = ath12k_wifi7_is_frame_link_agnostic_wcn7850,
 };
 
+static const struct ath12k_hw_ops qcc2072_ops = {
+       .get_hw_mac_from_pdev_id = ath12k_wifi7_hw_qcn9274_mac_from_pdev_id,
+       .mac_id_to_pdev_id = ath12k_wifi7_hw_mac_id_to_pdev_id_wcn7850,
+       .mac_id_to_srng_id = ath12k_wifi7_hw_mac_id_to_srng_id_wcn7850,
+       .rxdma_ring_sel_config = ath12k_dp_rxdma_ring_sel_config_qcc2072,
+       .get_ring_selector = ath12k_wifi7_hw_get_ring_selector_wcn7850,
+       .dp_srng_is_tx_comp_ring = ath12k_wifi7_dp_srng_is_comp_ring_wcn7850,
+       .is_frame_link_agnostic = ath12k_wifi7_is_frame_link_agnostic_wcn7850,
+};
+
 #define ATH12K_TX_RING_MASK_0 0x1
 #define ATH12K_TX_RING_MASK_1 0x2
 #define ATH12K_TX_RING_MASK_2 0x4
@@ -673,7 +683,7 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
                .qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850,
                .internal_sleep_clock = true,
 
-               .hw_ops = &wcn7850_ops,
+               .hw_ops = &qcc2072_ops,
                .ring_mask = &ath12k_wifi7_hw_ring_mask_wcn7850,
 
                .host_ce_config = ath12k_wifi7_host_ce_config_wcn7850,