浏览代码

qcacmn: Initial changes for york bring-up in umac layer

Add device Id and target type checks for qcn9160 target
compilation.

Change-Id: I2a26e1c45c61630594efd86466f19ea04300939f
CRs-Fixed: 3282641
Kannan Saravanan 2 年之前
父节点
当前提交
38f0453c6d

+ 1 - 0
umac/cfr/dispatcher/inc/wlan_cfr_utils_api.h

@@ -121,6 +121,7 @@ enum cfrradiotype {
 	CFR_CAPTURE_RADIO_KIWI,
 	CFR_CAPTURE_RADIO_MANGO,
 	CFR_CAPTURE_RADIO_MIAMI,
+	CFR_CAPTURE_RADIO_YORK,
 	CFR_CAPTURE_RADIO_MAX = 0xFF,
 };
 

+ 3 - 0
umac/dfs/core/src/misc/dfs.c

@@ -844,6 +844,9 @@ bool dfs_is_true_160mhz_supported(struct wlan_dfs *dfs)
 	    tgt_tx_ops->tgt_is_tgt_type_qcn6122(target_type))
 		return true;
 
+	if (tgt_tx_ops->tgt_is_tgt_type_qcn9160 &&
+	    tgt_tx_ops->tgt_is_tgt_type_qcn9160(target_type))
+		return true;
 	return false;
 }
 

+ 4 - 2
umac/dfs/dispatcher/src/wlan_dfs_utils_api.c

@@ -345,10 +345,12 @@ bool utils_dfs_is_spruce_spur_war_applicable(struct wlan_objmgr_pdev *pdev)
 	target_type = lmac_get_target_type(dfs->dfs_pdev_obj);
 
 	/* Is the target Spruce? */
-	if (!tgt_tx_ops->tgt_is_tgt_type_qcn6122)
+	if (!tgt_tx_ops->tgt_is_tgt_type_qcn6122 ||
+	    !tgt_tx_ops->tgt_is_tgt_type_qcn9160)
 		return false;
 
-	if (!tgt_tx_ops->tgt_is_tgt_type_qcn6122(target_type))
+	if (!tgt_tx_ops->tgt_is_tgt_type_qcn6122(target_type) ||
+	    !tgt_tx_ops->tgt_is_tgt_type_qcn9160(target_type))
 		return false;
 
 	cur_freq = dfs->dfs_curchan->dfs_ch_freq;

+ 1 - 0
umac/global_umac_dispatcher/lmac_if/inc/wlan_lmac_if_def.h

@@ -1225,6 +1225,7 @@ struct wlan_lmac_if_target_tx_ops {
 	bool (*tgt_is_tgt_type_adrastea)(uint32_t);
 	bool (*tgt_is_tgt_type_qcn9000)(uint32_t);
 	bool (*tgt_is_tgt_type_qcn6122)(uint32_t);
+	bool (*tgt_is_tgt_type_qcn9160)(uint32_t);
 	bool (*tgt_is_tgt_type_qcn7605)(uint32_t);
 	uint32_t (*tgt_get_tgt_type)(struct wlan_objmgr_psoc *psoc);
 	uint32_t (*tgt_get_tgt_version)(struct wlan_objmgr_psoc *psoc);