Browse Source

qcacmn: Add target check for reo shared qaddr enabling

Enable REO shared qref for 11be targets.
Fix a compilation issue in printing dma_paddr type. 

Change-Id: Ib8568a82e96016ea367c8e0122d862e3d6e70d00
CRs-Fixed: 3178147
sumedh baikady 3 năm trước cách đây
mục cha
commit
324dcd5688
2 tập tin đã thay đổi với 22 bổ sung7 xóa
  1. 6 6
      hal/wifi3.0/be/hal_be_generic_api.h
  2. 16 1
      target_if/core/inc/target_if.h

+ 6 - 6
hal/wifi3.0/be/hal_be_generic_api.h

@@ -658,10 +658,10 @@ static void hal_reo_shared_qaddr_write_be(hal_soc_handle_t hal_soc_hdl,
 	else
 		reo_qref->receive_queue_number = 0;
 
-	hal_verbose_debug("hw_qdesc_paddr: %llx, tid: %d, reo_qref:%pK,"
+	hal_verbose_debug("hw_qdesc_paddr: %pK, tid: %d, reo_qref:%pK,"
 			  "rx_reo_queue_desc_addr_31_0: %x,"
 			  "rx_reo_queue_desc_addr_39_32: %x",
-			  hw_qdesc_paddr, tid, reo_qref,
+			  (void *)hw_qdesc_paddr, tid, reo_qref,
 			  reo_qref->rx_reo_queue_desc_addr_31_0,
 			  reo_qref->rx_reo_queue_desc_addr_39_32);
 }
@@ -719,12 +719,12 @@ static void hal_reo_shared_qaddr_setup_be(hal_soc_handle_t hal_soc_hdl)
 				REO_QUEUE_REF_NON_ML_TABLE_SIZE,
 				&hal->reo_qref.non_mlo_reo_qref_table_paddr);
 
-	hal_verbose_debug("MLO table start paddr:%llx,"
-			  "Non-MLO table start paddr:%llx,"
+	hal_verbose_debug("MLO table start paddr:%pK,"
+			  "Non-MLO table start paddr:%pK,"
 			  "MLO table start vaddr: %pK,"
 			  "Non MLO table start vaddr: %pK",
-			  hal->reo_qref.mlo_reo_qref_table_paddr,
-			  hal->reo_qref.non_mlo_reo_qref_table_paddr,
+			  (void *)hal->reo_qref.mlo_reo_qref_table_paddr,
+			  (void *)hal->reo_qref.non_mlo_reo_qref_table_paddr,
 			  hal->reo_qref.mlo_reo_qref_table_vaddr,
 			  hal->reo_qref.non_mlo_reo_qref_table_vaddr);
 }

+ 16 - 1
target_if/core/inc/target_if.h

@@ -30,6 +30,7 @@
 #include "wmi_unified_api.h"
 #include "wmi_unified_priv.h"
 #include "wmi_unified_param.h"
+#include <target_type.h>
 
 #define TGT_WMI_PDEV_ID_SOC	0	/* WMI SOC ID */
 
@@ -2778,8 +2779,22 @@ QDF_STATUS target_if_mlo_teardown_req(struct wlan_objmgr_pdev **pdev,
 static inline void target_if_set_reo_shared_qref_feature(struct wlan_objmgr_psoc *psoc,
 							 struct tgt_info *info)
 {
-	info->wlan_res_cfg.reo_qdesc_shared_addr_table_enabled = true;
+	struct target_psoc_info *tgt_hdl;
+
+	tgt_hdl = wlan_psoc_get_tgt_if_handle(psoc);
+	if (!tgt_hdl) {
+		target_if_err("target_psoc_info is null");
+		info->wlan_res_cfg.reo_qdesc_shared_addr_table_enabled = false;
+		return;
+	}
+
+	if (target_psoc_get_target_type(tgt_hdl) == TARGET_TYPE_QCN9224)
+		info->wlan_res_cfg.reo_qdesc_shared_addr_table_enabled = true;
+	else
+		info->wlan_res_cfg.reo_qdesc_shared_addr_table_enabled = false;
+
 }
+
 #else
 static inline void target_if_set_reo_shared_qref_feature(struct wlan_objmgr_psoc *psoc,
 							 struct tgt_info *info)