wifi: ath12k: Use HTT_TCL_METADATA_VER_V1 in FTM mode

Currently host sends HTT_TCL_METADATA_VER_V2 to the firmware
regardless of the operating mode (Mission or FTM).

Firmware expects additional software information (like peer ID, vdev
ID, and link ID) in Tx packets when HTT_TCL_METADATA_VER_V2 is set.
However, in FTM (Factory Test Mode) mode, no vdev is created on the
host side (this is expected). As a result, the firmware fails to find
the expected vdev during packet processing and ends up dropping
packets.

To fix this, send HTT_TCL_METADATA_VER_V1 in FTM mode because FTM
mode doesn't support HTT_TCL_METADATA_VER_V2.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.5-01651-QCAHKSWPL_SILICONZ-1

Fixes: 5d964966bd3f ("wifi: ath12k: Update HTT_TCL_METADATA version and bit mask definitions")
Signed-off-by: Aaradhana Sahu <aaradhana.sahu@oss.qualcomm.com>
Reviewed-by: Vasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250711035420.1509029-1-aaradhana.sahu@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/dp.h b/drivers/net/wireless/ath/ath12k/dp.h
index 623facc2cce72c61b5e89cde88ea8bc92e184940..7baa48b86f7ad0979d8a6b160ff3813a5000c2e1 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp.h
+++ b/drivers/net/wireless/ath/ath12k/dp.h
@@ -474,6 +474,7 @@ enum htt_h2t_msg_type {
 };
 
 #define HTT_VER_REQ_INFO_MSG_ID                GENMASK(7, 0)
+#define HTT_OPTION_TCL_METADATA_VER_V1 1
 #define HTT_OPTION_TCL_METADATA_VER_V2 2
 #define HTT_OPTION_TAG                 GENMASK(7, 0)
 #define HTT_OPTION_LEN                 GENMASK(15, 8)

diff --git a/drivers/net/wireless/ath/ath12k/dp_tx.c b/drivers/net/wireless/ath/ath12k/dp_tx.c
index 0e93afbc48665333a5a024136694511dcbcb3193..7005f05d3aaaec35eadc36ddb24b108a31dafdac 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_tx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_tx.c
@@ -1200,6 +1200,7 @@ int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab)
        struct sk_buff *skb;
        struct htt_ver_req_cmd *cmd;
        int len = sizeof(*cmd);
+       u32 metadata_version;
        int ret;
 
        init_completion(&dp->htt_tgt_version_received);
@@ -1212,12 +1213,14 @@ int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab)
        cmd = (struct htt_ver_req_cmd *)skb->data;
        cmd->ver_reg_info = le32_encode_bits(HTT_H2T_MSG_TYPE_VERSION_REQ,
                                             HTT_OPTION_TAG);
+       metadata_version = ath12k_ftm_mode ? HTT_OPTION_TCL_METADATA_VER_V1 :
+                          HTT_OPTION_TCL_METADATA_VER_V2;
 
        cmd->tcl_metadata_version = le32_encode_bits(HTT_TAG_TCL_METADATA_VERSION,
                                                     HTT_OPTION_TAG) |
                                    le32_encode_bits(HTT_TCL_METADATA_VER_SZ,
                                                     HTT_OPTION_LEN) |
-                                   le32_encode_bits(HTT_OPTION_TCL_METADATA_VER_V2,
+                                   le32_encode_bits(metadata_version,
                                                     HTT_OPTION_VALUE);
 
        ret = ath12k_htc_send(&ab->htc, dp->eid, skb);