[PATCH V2 0/3] Fix few WMI/HTT interfaces

[PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

This patch set fixes mismatch in peer_assoc complete wmi command for
version 10.4 and peer_id configuration for HTT version < 3.4.

V2:
	- Add cover letter
	- Rename ath10k_mac_need_offchan_tx_work() to
	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
	  to the helper and use it in ath10k_htt_tx() while configuring
	  peerid.

Vasanthakumar Thiagarajan (3):
  ath10k: Fix peer assoc complete WMI command for 10.4
  ath10k: Rename the helper which is used for off-channel tx
  ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

 drivers/net/wireless/ath/ath10k/htt.h    |  9 ++++++--
 drivers/net/wireless/ath/ath10k/htt_tx.c | 11 ++++++++--
 drivers/net/wireless/ath/ath10k/mac.c    |  9 ++++----
 drivers/net/wireless/ath/ath10k/mac.h    |  1 +
 drivers/net/wireless/ath/ath10k/wmi.c    | 37 +++++++++++++++++++++++++++++++-
 drivers/net/wireless/ath/ath10k/wmi.h    |  5 +++++
 6 files changed, 63 insertions(+), 9 deletions(-)

-- 
1.9.1


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

[PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

This patch set fixes mismatch in peer_assoc complete wmi command for
version 10.4 and peer_id configuration for HTT version < 3.4.

V2:
	- Add cover letter
	- Rename ath10k_mac_need_offchan_tx_work() to
	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
	  to the helper and use it in ath10k_htt_tx() while configuring
	  peerid.

Vasanthakumar Thiagarajan (3):
  ath10k: Fix peer assoc complete WMI command for 10.4
  ath10k: Rename the helper which is used for off-channel tx
  ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

 drivers/net/wireless/ath/ath10k/htt.h    |  9 ++++++--
 drivers/net/wireless/ath/ath10k/htt_tx.c | 11 ++++++++--
 drivers/net/wireless/ath/ath10k/mac.c    |  9 ++++----
 drivers/net/wireless/ath/ath10k/mac.h    |  1 +
 drivers/net/wireless/ath/ath10k/wmi.c    | 37 +++++++++++++++++++++++++++++++-
 drivers/net/wireless/ath/ath10k/wmi.h    |  5 +++++
 6 files changed, 63 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH V2 1/3] ath10k: Fix peer assoc complete WMI command for 10.4

[Vasanthakumar Thiagarajan]

There is an extra 4-byte member when compared to WMI 10.2 added to
assoc complete command in WMI 10.4. This new member is used for 160Mhz
related configuration. This WMI command mismatch between host and
firmware does not cause any real issues because this new member is not
used in 10.4 firmwares so far (10.4.1.00030-1). This difference in WMI
command interface brings in a new wmi_ops for 10.4 gen_peer_assoc().
No noticeable functionality differences with this change can be seen
with the current 10.4 firmwares, but the WMI interface has to be
fixed to work with future 10.4 firmwares which may be using this new
member.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/wmi.c | 37 ++++++++++++++++++++++++++++++++++-
 drivers/net/wireless/ath/ath10k/wmi.h |  5 +++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 7569db0..e8614ab 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -6328,6 +6328,16 @@ ath10k_wmi_peer_assoc_fill_10_2(struct ath10k *ar, void *buf,
 	cmd->info0 = __cpu_to_le32(info0);
 }
 
+static void
+ath10k_wmi_peer_assoc_fill_10_4(struct ath10k *ar, void *buf,
+				const struct wmi_peer_assoc_complete_arg *arg)
+{
+	struct wmi_10_4_peer_assoc_complete_cmd *cmd = buf;
+
+	ath10k_wmi_peer_assoc_fill_10_2(ar, buf, arg);
+	cmd->peer_bw_rxnss_override = 0;
+}
+
 static int
 ath10k_wmi_peer_assoc_check_arg(const struct wmi_peer_assoc_complete_arg *arg)
 {
@@ -6417,6 +6427,31 @@ ath10k_wmi_10_2_op_gen_peer_assoc(struct ath10k *ar,
 }
 
 static struct sk_buff *
+ath10k_wmi_10_4_op_gen_peer_assoc(struct ath10k *ar,
+				  const struct wmi_peer_assoc_complete_arg *arg)
+{
+	size_t len = sizeof(struct wmi_10_4_peer_assoc_complete_cmd);
+	struct sk_buff *skb;
+	int ret;
+
+	ret = ath10k_wmi_peer_assoc_check_arg(arg);
+	if (ret)
+		return ERR_PTR(ret);
+
+	skb = ath10k_wmi_alloc_skb(ar, len);
+	if (!skb)
+		return ERR_PTR(-ENOMEM);
+
+	ath10k_wmi_peer_assoc_fill_10_4(ar, skb->data, arg);
+
+	ath10k_dbg(ar, ATH10K_DBG_WMI,
+		   "wmi peer assoc vdev %d addr %pM (%s)\n",
+		   arg->vdev_id, arg->addr,
+		   arg->peer_reassoc ? "reassociate" : "new");
+	return skb;
+}
+
+static struct sk_buff *
 ath10k_wmi_10_2_op_gen_pdev_get_temperature(struct ath10k *ar)
 {
 	struct sk_buff *skb;
@@ -7536,6 +7571,7 @@ static const struct wmi_ops wmi_10_4_ops = {
 	.gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
 	.gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
 	.gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+	.gen_peer_assoc = ath10k_wmi_10_4_op_gen_peer_assoc,
 	.gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
 	.gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
 	.gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
@@ -7555,7 +7591,6 @@ static const struct wmi_ops wmi_10_4_ops = {
 	.fw_stats_fill = ath10k_wmi_10_4_op_fw_stats_fill,
 
 	/* shared with 10.2 */
-	.gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
 	.gen_request_stats = ath10k_wmi_op_gen_request_stats,
 };
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index a8ea93e..ab6d218 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -5741,6 +5741,11 @@ struct wmi_10_2_peer_assoc_complete_cmd {
 	__le32 info0; /* WMI_PEER_ASSOC_INFO0_ */
 } __packed;
 
+struct wmi_10_4_peer_assoc_complete_cmd {
+	struct wmi_10_2_peer_assoc_complete_cmd cmd;
+	__le32 peer_bw_rxnss_override;
+} __packed;
+
 struct wmi_peer_assoc_complete_arg {
 	u8 addr[ETH_ALEN];
 	u32 vdev_id;
-- 
1.9.1


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

[PATCH V2 1/3] ath10k: Fix peer assoc complete WMI command for 10.4

[Vasanthakumar Thiagarajan]

There is an extra 4-byte member when compared to WMI 10.2 added to
assoc complete command in WMI 10.4. This new member is used for 160Mhz
related configuration. This WMI command mismatch between host and
firmware does not cause any real issues because this new member is not
used in 10.4 firmwares so far (10.4.1.00030-1). This difference in WMI
command interface brings in a new wmi_ops for 10.4 gen_peer_assoc().
No noticeable functionality differences with this change can be seen
with the current 10.4 firmwares, but the WMI interface has to be
fixed to work with future 10.4 firmwares which may be using this new
member.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/wmi.c | 37 ++++++++++++++++++++++++++++++++++-
 drivers/net/wireless/ath/ath10k/wmi.h |  5 +++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
index 7569db0..e8614ab 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.c
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -6328,6 +6328,16 @@ ath10k_wmi_peer_assoc_fill_10_2(struct ath10k *ar, void *buf,
 	cmd->info0 = __cpu_to_le32(info0);
 }
 
+static void
+ath10k_wmi_peer_assoc_fill_10_4(struct ath10k *ar, void *buf,
+				const struct wmi_peer_assoc_complete_arg *arg)
+{
+	struct wmi_10_4_peer_assoc_complete_cmd *cmd = buf;
+
+	ath10k_wmi_peer_assoc_fill_10_2(ar, buf, arg);
+	cmd->peer_bw_rxnss_override = 0;
+}
+
 static int
 ath10k_wmi_peer_assoc_check_arg(const struct wmi_peer_assoc_complete_arg *arg)
 {
@@ -6417,6 +6427,31 @@ ath10k_wmi_10_2_op_gen_peer_assoc(struct ath10k *ar,
 }
 
 static struct sk_buff *
+ath10k_wmi_10_4_op_gen_peer_assoc(struct ath10k *ar,
+				  const struct wmi_peer_assoc_complete_arg *arg)
+{
+	size_t len = sizeof(struct wmi_10_4_peer_assoc_complete_cmd);
+	struct sk_buff *skb;
+	int ret;
+
+	ret = ath10k_wmi_peer_assoc_check_arg(arg);
+	if (ret)
+		return ERR_PTR(ret);
+
+	skb = ath10k_wmi_alloc_skb(ar, len);
+	if (!skb)
+		return ERR_PTR(-ENOMEM);
+
+	ath10k_wmi_peer_assoc_fill_10_4(ar, skb->data, arg);
+
+	ath10k_dbg(ar, ATH10K_DBG_WMI,
+		   "wmi peer assoc vdev %d addr %pM (%s)\n",
+		   arg->vdev_id, arg->addr,
+		   arg->peer_reassoc ? "reassociate" : "new");
+	return skb;
+}
+
+static struct sk_buff *
 ath10k_wmi_10_2_op_gen_pdev_get_temperature(struct ath10k *ar)
 {
 	struct sk_buff *skb;
@@ -7536,6 +7571,7 @@ static const struct wmi_ops wmi_10_4_ops = {
 	.gen_peer_delete = ath10k_wmi_op_gen_peer_delete,
 	.gen_peer_flush = ath10k_wmi_op_gen_peer_flush,
 	.gen_peer_set_param = ath10k_wmi_op_gen_peer_set_param,
+	.gen_peer_assoc = ath10k_wmi_10_4_op_gen_peer_assoc,
 	.gen_set_psmode = ath10k_wmi_op_gen_set_psmode,
 	.gen_set_sta_ps = ath10k_wmi_op_gen_set_sta_ps,
 	.gen_set_ap_ps = ath10k_wmi_op_gen_set_ap_ps,
@@ -7555,7 +7591,6 @@ static const struct wmi_ops wmi_10_4_ops = {
 	.fw_stats_fill = ath10k_wmi_10_4_op_fw_stats_fill,
 
 	/* shared with 10.2 */
-	.gen_peer_assoc = ath10k_wmi_10_2_op_gen_peer_assoc,
 	.gen_request_stats = ath10k_wmi_op_gen_request_stats,
 };
 
diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
index a8ea93e..ab6d218 100644
--- a/drivers/net/wireless/ath/ath10k/wmi.h
+++ b/drivers/net/wireless/ath/ath10k/wmi.h
@@ -5741,6 +5741,11 @@ struct wmi_10_2_peer_assoc_complete_cmd {
 	__le32 info0; /* WMI_PEER_ASSOC_INFO0_ */
 } __packed;
 
+struct wmi_10_4_peer_assoc_complete_cmd {
+	struct wmi_10_2_peer_assoc_complete_cmd cmd;
+	__le32 peer_bw_rxnss_override;
+} __packed;
+
 struct wmi_peer_assoc_complete_arg {
 	u8 addr[ETH_ALEN];
 	u32 vdev_id;
-- 
1.9.1

[PATCH V2 2/3] ath10k: Rename the helper which is used for off-channel tx

[Vasanthakumar Thiagarajan]

Rename ath10k_mac_need_offchan_tx_work() to ath10k_mac_tx_frm_has_freq()
to make it more meaningful. This helper will be used in the future
change. No functionality change.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index a7411fe..f121021 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3280,7 +3280,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
 	}
 }
 
-static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
+static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 {
 	/* FIXME: Not really sure since when the behaviour changed. At some
 	 * point new firmware stopped requiring creation of peer entries for
@@ -3288,8 +3288,8 @@ static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
 	 * tx credit replenishment and reliability). Assuming it's at least 3.4
 	 * because that's when the `freq` was introduced to TX_FRM HTT command.
 	 */
-	return !(ar->htt.target_version_major >= 3 &&
-		 ar->htt.target_version_minor >= 4);
+	return (ar->htt.target_version_major >= 3 &&
+		ar->htt.target_version_minor >= 4);
 }
 
 static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
@@ -3673,7 +3673,7 @@ static void ath10k_tx(struct ieee80211_hw *hw,
 		ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id;
 		spin_unlock_bh(&ar->data_lock);
 
-		if (ath10k_mac_need_offchan_tx_work(ar)) {
+		if (!ath10k_mac_tx_frm_has_freq(ar)) {
 			ATH10K_SKB_CB(skb)->htt.freq = 0;
 			ATH10K_SKB_CB(skb)->htt.is_offchan = true;
 
-- 
1.9.1


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

[PATCH V2 2/3] ath10k: Rename the helper which is used for off-channel tx

[Vasanthakumar Thiagarajan]

Rename ath10k_mac_need_offchan_tx_work() to ath10k_mac_tx_frm_has_freq()
to make it more meaningful. This helper will be used in the future
change. No functionality change.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/mac.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index a7411fe..f121021 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3280,7 +3280,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
 	}
 }
 
-static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
+static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 {
 	/* FIXME: Not really sure since when the behaviour changed. At some
 	 * point new firmware stopped requiring creation of peer entries for
@@ -3288,8 +3288,8 @@ static bool ath10k_mac_need_offchan_tx_work(struct ath10k *ar)
 	 * tx credit replenishment and reliability). Assuming it's at least 3.4
 	 * because that's when the `freq` was introduced to TX_FRM HTT command.
 	 */
-	return !(ar->htt.target_version_major >= 3 &&
-		 ar->htt.target_version_minor >= 4);
+	return (ar->htt.target_version_major >= 3 &&
+		ar->htt.target_version_minor >= 4);
 }
 
 static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
@@ -3673,7 +3673,7 @@ static void ath10k_tx(struct ieee80211_hw *hw,
 		ATH10K_SKB_CB(skb)->vdev_id = ar->scan.vdev_id;
 		spin_unlock_bh(&ar->data_lock);
 
-		if (ath10k_mac_need_offchan_tx_work(ar)) {
+		if (!ath10k_mac_tx_frm_has_freq(ar)) {
 			ATH10K_SKB_CB(skb)->htt.freq = 0;
 			ATH10K_SKB_CB(skb)->htt.is_offchan = true;
 
-- 
1.9.1

[PATCH V2 3/3] ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

[Vasanthakumar Thiagarajan]

Of a word in struct htt_data_tx_desc htt version >= 3.4 firmware uses
LSB 16-bit for frequency configuration which is used for offchannel tx
and MSB 16-bit is for peerid. But other firmwares using version 2.X
(10.1, 10.2.2, 10.2.4 and 10.4) are using 32-bit for peerid in htt tx
desc. So far no issue is found with the existing code setting peerid and
freq for HTT version 2.X, this could be mainly because of 0 as frequecy
(home channel) is being always passed with those firmwares. There may be
issues when non-zero freq is passed with firmware using < 3.4 htt version.
To be safe use target_version_major and target_version_minor along with
htt-op-version before configuring peer id and freq in htt tx desc. This
patch extends ath10k_mac_tx_frm_has_freq() to check for htt_op_version_tlv
and uses the helper while setting peerid in htt_tx_desc.

Fixes: 8d6d36243610 ("ath10k: fix offchan reliability")
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/htt.h    |  9 +++++++--
 drivers/net/wireless/ath/ath10k/htt_tx.c | 11 +++++++++--
 drivers/net/wireless/ath/ath10k/mac.c    |  5 +++--
 drivers/net/wireless/ath/ath10k/mac.h    |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 2bad50e..44fb4f2 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -166,8 +166,13 @@ struct htt_data_tx_desc {
 	__le16 len;
 	__le16 id;
 	__le32 frags_paddr;
-	__le16 peerid;
-	__le16 freq;
+	union {
+		__le32 peerid;
+		struct {
+			__le16 peerid;
+			__le16 freq;
+		} __packed offchan_tx;
+	} __packed;
 	u8 prefetch[0]; /* start of frame, for FW classification engine */
 } __packed;
 
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 1682397..2dcea48 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -681,8 +681,15 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
 	skb_cb->htt.txbuf->cmd_tx.len = __cpu_to_le16(msdu->len);
 	skb_cb->htt.txbuf->cmd_tx.id = __cpu_to_le16(msdu_id);
 	skb_cb->htt.txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr);
-	skb_cb->htt.txbuf->cmd_tx.peerid = __cpu_to_le16(HTT_INVALID_PEERID);
-	skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(skb_cb->htt.freq);
+	if (ath10k_mac_tx_frm_has_freq(ar)) {
+		skb_cb->htt.txbuf->cmd_tx.offchan_tx.peerid =
+				__cpu_to_le16(HTT_INVALID_PEERID);
+		skb_cb->htt.txbuf->cmd_tx.offchan_tx.freq =
+				__cpu_to_le16(skb_cb->htt.freq);
+	} else {
+		skb_cb->htt.txbuf->cmd_tx.peerid =
+				__cpu_to_le32(HTT_INVALID_PEERID);
+	}
 
 	trace_ath10k_htt_tx(ar, msdu_id, msdu->len, vdev_id, tid);
 	ath10k_dbg(ar, ATH10K_DBG_HTT,
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f121021..7fe51bf 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3280,7 +3280,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
 	}
 }
 
-static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
+bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 {
 	/* FIXME: Not really sure since when the behaviour changed. At some
 	 * point new firmware stopped requiring creation of peer entries for
@@ -3289,7 +3289,8 @@ static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 	 * because that's when the `freq` was introduced to TX_FRM HTT command.
 	 */
 	return (ar->htt.target_version_major >= 3 &&
-		ar->htt.target_version_minor >= 4);
+		ar->htt.target_version_minor >= 4 &&
+		ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_TLV);
 }
 
 static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index e3cefe4..f504804 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -74,6 +74,7 @@ void ath10k_mac_tx_lock(struct ath10k *ar, int reason);
 void ath10k_mac_tx_unlock(struct ath10k *ar, int reason);
 void ath10k_mac_vif_tx_lock(struct ath10k_vif *arvif, int reason);
 void ath10k_mac_vif_tx_unlock(struct ath10k_vif *arvif, int reason);
+bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar);
 
 static inline struct ath10k_vif *ath10k_vif_to_arvif(struct ieee80211_vif *vif)
 {
-- 
1.9.1


_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

[PATCH V2 3/3] ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

[Vasanthakumar Thiagarajan]

Of a word in struct htt_data_tx_desc htt version >= 3.4 firmware uses
LSB 16-bit for frequency configuration which is used for offchannel tx
and MSB 16-bit is for peerid. But other firmwares using version 2.X
(10.1, 10.2.2, 10.2.4 and 10.4) are using 32-bit for peerid in htt tx
desc. So far no issue is found with the existing code setting peerid and
freq for HTT version 2.X, this could be mainly because of 0 as frequecy
(home channel) is being always passed with those firmwares. There may be
issues when non-zero freq is passed with firmware using < 3.4 htt version.
To be safe use target_version_major and target_version_minor along with
htt-op-version before configuring peer id and freq in htt tx desc. This
patch extends ath10k_mac_tx_frm_has_freq() to check for htt_op_version_tlv
and uses the helper while setting peerid in htt_tx_desc.

Fixes: 8d6d36243610 ("ath10k: fix offchan reliability")
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/htt.h    |  9 +++++++--
 drivers/net/wireless/ath/ath10k/htt_tx.c | 11 +++++++++--
 drivers/net/wireless/ath/ath10k/mac.c    |  5 +++--
 drivers/net/wireless/ath/ath10k/mac.h    |  1 +
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h
index 2bad50e..44fb4f2 100644
--- a/drivers/net/wireless/ath/ath10k/htt.h
+++ b/drivers/net/wireless/ath/ath10k/htt.h
@@ -166,8 +166,13 @@ struct htt_data_tx_desc {
 	__le16 len;
 	__le16 id;
 	__le32 frags_paddr;
-	__le16 peerid;
-	__le16 freq;
+	union {
+		__le32 peerid;
+		struct {
+			__le16 peerid;
+			__le16 freq;
+		} __packed offchan_tx;
+	} __packed;
 	u8 prefetch[0]; /* start of frame, for FW classification engine */
 } __packed;
 
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index 1682397..2dcea48 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -681,8 +681,15 @@ int ath10k_htt_tx(struct ath10k_htt *htt, struct sk_buff *msdu)
 	skb_cb->htt.txbuf->cmd_tx.len = __cpu_to_le16(msdu->len);
 	skb_cb->htt.txbuf->cmd_tx.id = __cpu_to_le16(msdu_id);
 	skb_cb->htt.txbuf->cmd_tx.frags_paddr = __cpu_to_le32(frags_paddr);
-	skb_cb->htt.txbuf->cmd_tx.peerid = __cpu_to_le16(HTT_INVALID_PEERID);
-	skb_cb->htt.txbuf->cmd_tx.freq = __cpu_to_le16(skb_cb->htt.freq);
+	if (ath10k_mac_tx_frm_has_freq(ar)) {
+		skb_cb->htt.txbuf->cmd_tx.offchan_tx.peerid =
+				__cpu_to_le16(HTT_INVALID_PEERID);
+		skb_cb->htt.txbuf->cmd_tx.offchan_tx.freq =
+				__cpu_to_le16(skb_cb->htt.freq);
+	} else {
+		skb_cb->htt.txbuf->cmd_tx.peerid =
+				__cpu_to_le32(HTT_INVALID_PEERID);
+	}
 
 	trace_ath10k_htt_tx(ar, msdu_id, msdu->len, vdev_id, tid);
 	ath10k_dbg(ar, ATH10K_DBG_HTT,
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index f121021..7fe51bf 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -3280,7 +3280,7 @@ static void ath10k_tx_h_add_p2p_noa_ie(struct ath10k *ar,
 	}
 }
 
-static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
+bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 {
 	/* FIXME: Not really sure since when the behaviour changed. At some
 	 * point new firmware stopped requiring creation of peer entries for
@@ -3289,7 +3289,8 @@ static bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar)
 	 * because that's when the `freq` was introduced to TX_FRM HTT command.
 	 */
 	return (ar->htt.target_version_major >= 3 &&
-		ar->htt.target_version_minor >= 4);
+		ar->htt.target_version_minor >= 4 &&
+		ar->htt.op_version == ATH10K_FW_HTT_OP_VERSION_TLV);
 }
 
 static int ath10k_mac_tx_wmi_mgmt(struct ath10k *ar, struct sk_buff *skb)
diff --git a/drivers/net/wireless/ath/ath10k/mac.h b/drivers/net/wireless/ath/ath10k/mac.h
index e3cefe4..f504804 100644
--- a/drivers/net/wireless/ath/ath10k/mac.h
+++ b/drivers/net/wireless/ath/ath10k/mac.h
@@ -74,6 +74,7 @@ void ath10k_mac_tx_lock(struct ath10k *ar, int reason);
 void ath10k_mac_tx_unlock(struct ath10k *ar, int reason);
 void ath10k_mac_vif_tx_lock(struct ath10k_vif *arvif, int reason);
 void ath10k_mac_vif_tx_unlock(struct ath10k_vif *arvif, int reason);
+bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar);
 
 static inline struct ath10k_vif *ath10k_vif_to_arvif(struct ieee80211_vif *vif)
 {
-- 
1.9.1

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Kalle Valo]

Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:

> This patch set fixes mismatch in peer_assoc complete wmi command for
> version 10.4 and peer_id configuration for HTT version < 3.4.
>
> V2:
> 	- Add cover letter
> 	- Rename ath10k_mac_need_offchan_tx_work() to
> 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
> 	  to the helper and use it in ath10k_htt_tx() while configuring
> 	  peerid.
>
> Vasanthakumar Thiagarajan (3):
>   ath10k: Fix peer assoc complete WMI command for 10.4
>   ath10k: Rename the helper which is used for off-channel tx
>   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

These had a conflict but you didn't use ath.git as the baseline so I
can't easily fix them. Please try always to use clean ath.git master
branch as the baseline for your patches.

Applying: ath10k: Fix peer assoc complete WMI command for 10.4
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Kalle Valo]

Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:

> This patch set fixes mismatch in peer_assoc complete wmi command for
> version 10.4 and peer_id configuration for HTT version < 3.4.
>
> V2:
> 	- Add cover letter
> 	- Rename ath10k_mac_need_offchan_tx_work() to
> 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
> 	  to the helper and use it in ath10k_htt_tx() while configuring
> 	  peerid.
>
> Vasanthakumar Thiagarajan (3):
>   ath10k: Fix peer assoc complete WMI command for 10.4
>   ath10k: Rename the helper which is used for off-channel tx
>   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4

These had a conflict but you didn't use ath.git as the baseline so I
can't easily fix them. Please try always to use clean ath.git master
branch as the baseline for your patches.

Applying: ath10k: Fix peer assoc complete WMI command for 10.4
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4

-- 
Kalle Valo

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
> 
> > This patch set fixes mismatch in peer_assoc complete wmi command for
> > version 10.4 and peer_id configuration for HTT version < 3.4.
> >
> > V2:
> > 	- Add cover letter
> > 	- Rename ath10k_mac_need_offchan_tx_work() to
> > 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
> > 	  to the helper and use it in ath10k_htt_tx() while configuring
> > 	  peerid.
> >
> > Vasanthakumar Thiagarajan (3):
> >   ath10k: Fix peer assoc complete WMI command for 10.4
> >   ath10k: Rename the helper which is used for off-channel tx
> >   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
> 
> These had a conflict but you didn't use ath.git as the baseline so I
> can't easily fix them. Please try always to use clean ath.git master
> branch as the baseline for your patches.
> 
> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4

Sorry for this. I prepared these patches on ath:master on top of my other pending
patch set. Not sure what went wrong. Ill resend this. Thanks.

Vasanth

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
> 
> > This patch set fixes mismatch in peer_assoc complete wmi command for
> > version 10.4 and peer_id configuration for HTT version < 3.4.
> >
> > V2:
> > 	- Add cover letter
> > 	- Rename ath10k_mac_need_offchan_tx_work() to
> > 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
> > 	  to the helper and use it in ath10k_htt_tx() while configuring
> > 	  peerid.
> >
> > Vasanthakumar Thiagarajan (3):
> >   ath10k: Fix peer assoc complete WMI command for 10.4
> >   ath10k: Rename the helper which is used for off-channel tx
> >   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
> 
> These had a conflict but you didn't use ath.git as the baseline so I
> can't easily fix them. Please try always to use clean ath.git master
> branch as the baseline for your patches.
> 
> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4

Sorry for this. I prepared these patches on ath:master on top of my other pending
patch set. Not sure what went wrong. Ill resend this. Thanks.

Vasanth

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Kalle Valo]

Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:

> On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
>> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>> 
>> > This patch set fixes mismatch in peer_assoc complete wmi command for
>> > version 10.4 and peer_id configuration for HTT version < 3.4.
>> >
>> > V2:
>> > 	- Add cover letter
>> > 	- Rename ath10k_mac_need_offchan_tx_work() to
>> > 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
>> > 	  to the helper and use it in ath10k_htt_tx() while configuring
>> > 	  peerid.
>> >
>> > Vasanthakumar Thiagarajan (3):
>> >   ath10k: Fix peer assoc complete WMI command for 10.4
>> >   ath10k: Rename the helper which is used for off-channel tx
>> >   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
>> 
>> These had a conflict but you didn't use ath.git as the baseline so I
>> can't easily fix them. Please try always to use clean ath.git master
>> branch as the baseline for your patches.
>> 
>> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4
>
> Sorry for this. I prepared these patches on ath:master on top of my other pending
> patch set. Not sure what went wrong.

If you have two patchsets you shouldn't have them on the same branch,
unless they have a strict dependency with each other of course. I prefer
that you have two separate topic branches which both use the master
branch as the baseline as then it's easiest for me to handle conflicts
etc.

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Kalle Valo]

Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:

> On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
>> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>> 
>> > This patch set fixes mismatch in peer_assoc complete wmi command for
>> > version 10.4 and peer_id configuration for HTT version < 3.4.
>> >
>> > V2:
>> > 	- Add cover letter
>> > 	- Rename ath10k_mac_need_offchan_tx_work() to
>> > 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
>> > 	  to the helper and use it in ath10k_htt_tx() while configuring
>> > 	  peerid.
>> >
>> > Vasanthakumar Thiagarajan (3):
>> >   ath10k: Fix peer assoc complete WMI command for 10.4
>> >   ath10k: Rename the helper which is used for off-channel tx
>> >   ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
>> 
>> These had a conflict but you didn't use ath.git as the baseline so I
>> can't easily fix them. Please try always to use clean ath.git master
>> branch as the baseline for your patches.
>> 
>> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4
>
> Sorry for this. I prepared these patches on ath:master on top of my other pending
> patch set. Not sure what went wrong.

If you have two patchsets you shouldn't have them on the same branch,
unless they have a strict dependency with each other of course. I prefer
that you have two separate topic branches which both use the master
branch as the baseline as then it's easiest for me to handle conflicts
etc.

-- 
Kalle Valo

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

On Thursday 05 November 2015 04:33 PM, Kalle Valo wrote:
> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>
>> On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
>>> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>>>
>>>> This patch set fixes mismatch in peer_assoc complete wmi command for
>>>> version 10.4 and peer_id configuration for HTT version < 3.4.
>>>>
>>>> V2:
>>>> 	- Add cover letter
>>>> 	- Rename ath10k_mac_need_offchan_tx_work() to
>>>> 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
>>>> 	  to the helper and use it in ath10k_htt_tx() while configuring
>>>> 	  peerid.
>>>>
>>>> Vasanthakumar Thiagarajan (3):
>>>>    ath10k: Fix peer assoc complete WMI command for 10.4
>>>>    ath10k: Rename the helper which is used for off-channel tx
>>>>    ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
>>>
>>> These had a conflict but you didn't use ath.git as the baseline so I
>>> can't easily fix them. Please try always to use clean ath.git master
>>> branch as the baseline for your patches.
>>>
>>> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
>>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
>>> Repository lacks necessary blobs to fall back on 3-way merge.
>>> Cannot fall back to three-way merge.
>>> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4
>>
>> Sorry for this. I prepared these patches on ath:master on top of my other pending
>> patch set. Not sure what went wrong.
>
> If you have two patchsets you shouldn't have them on the same branch,
> unless they have a strict dependency with each other of course. I prefer
> that you have two separate topic branches which both use the master
> branch as the baseline as then it's easiest for me to handle conflicts
> etc.
>

Sure, thanks.

Vasanth

_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k

Re: [PATCH V2 0/3] Fix few WMI/HTT interfaces

[Vasanthakumar Thiagarajan]

On Thursday 05 November 2015 04:33 PM, Kalle Valo wrote:
> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>
>> On Wed, Nov 04, 2015 at 07:59:39PM +0200, Kalle Valo wrote:
>>> Vasanthakumar Thiagarajan <vthiagar@qti.qualcomm.com> writes:
>>>
>>>> This patch set fixes mismatch in peer_assoc complete wmi command for
>>>> version 10.4 and peer_id configuration for HTT version < 3.4.
>>>>
>>>> V2:
>>>> 	- Add cover letter
>>>> 	- Rename ath10k_mac_need_offchan_tx_work() to
>>>> 	  ath10k_mac_tx_frm_has_freq(). Add htt-op-version check
>>>> 	  to the helper and use it in ath10k_htt_tx() while configuring
>>>> 	  peerid.
>>>>
>>>> Vasanthakumar Thiagarajan (3):
>>>>    ath10k: Fix peer assoc complete WMI command for 10.4
>>>>    ath10k: Rename the helper which is used for off-channel tx
>>>>    ath10k: Fix peerid configuration in htt tx desc for htt version < 3.4
>>>
>>> These had a conflict but you didn't use ath.git as the baseline so I
>>> can't easily fix them. Please try always to use clean ath.git master
>>> branch as the baseline for your patches.
>>>
>>> Applying: ath10k: Fix peer assoc complete WMI command for 10.4
>>> fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/wmi.h).
>>> Repository lacks necessary blobs to fall back on 3-way merge.
>>> Cannot fall back to three-way merge.
>>> Patch failed at 0001 ath10k: Fix peer assoc complete WMI command for 10.4
>>
>> Sorry for this. I prepared these patches on ath:master on top of my other pending
>> patch set. Not sure what went wrong.
>
> If you have two patchsets you shouldn't have them on the same branch,
> unless they have a strict dependency with each other of course. I prefer
> that you have two separate topic branches which both use the master
> branch as the baseline as then it's easiest for me to handle conflicts
> etc.
>

Sure, thanks.

Vasanth