From: Kalle Valo <kvalo@codeaurora.org>
To: linux-wireless@vger.kernel.org
Cc: ath11k@lists.infradead.org
Subject: [PATCH 04/10] ath11k: pktlog: fix sending/using the pdev id
Date: Wed, 27 Nov 2019 14:08:50 +0000 [thread overview]
Message-ID: <0101016ead3176e9-4ce1305f-5b82-4490-bf38-9caa4ddd9105-000000@us-west-2.amazonses.com> (raw)
In-Reply-To: <1574863720-25728-1-git-send-email-kvalo@codeaurora.org>
From: Anilkumar Kolli <akolli@codeaurora.org>
Fixes sending the pdev id(0,1,2 for mac0, mac1, mac2)
to FW in wmi cmd pktlog enable/disable.
Signed-off-by: Anilkumar Kolli <akolli@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
---
drivers/net/wireless/ath/ath11k/dp_rx.c | 8 +++++---
drivers/net/wireless/ath/ath11k/wmi.c | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index acad74658e64..67efa247bf65 100644
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -1265,7 +1265,6 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb)
u8 pdev_id;
len = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE, data->hdr);
-
if (len > ATH11K_HTT_PKTLOG_MAX_SIZE) {
ath11k_warn(ab, "htt pktlog buffer size %d, expected < %d\n",
len,
@@ -1274,8 +1273,11 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb)
}
pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data->hdr);
- pdev_id = DP_HW2SW_MACID(pdev_id);
- ar = ab->pdevs[pdev_id].ar;
+ ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id);
+ if (!ar) {
+ ath11k_warn(ab, "invalid pdev id %d on htt pktlog\n", pdev_id);
+ return;
+ }
trace_ath11k_htt_pktlog(ar, data->payload, len);
}
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index aae6e76330da..f349bf2c1ee8 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -2321,7 +2321,7 @@ int ath11k_wmi_pdev_peer_pktlog_filter(struct ath11k *ar, u8 *addr, u8 enable)
cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD) |
FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
- cmd->pdev_id = ar->pdev->pdev_id;
+ cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id);
cmd->num_mac = 1;
cmd->enable = enable;
@@ -2419,7 +2419,7 @@ int ath11k_wmi_pdev_pktlog_enable(struct ath11k *ar, u32 pktlog_filter)
cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PKTLOG_ENABLE_CMD) |
FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
- cmd->pdev_id = ar->pdev->pdev_id;
+ cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id);
cmd->evlist = pktlog_filter;
cmd->enable = ATH11K_WMI_PKTLOG_ENABLE_FORCE;
@@ -2449,7 +2449,7 @@ int ath11k_wmi_pdev_pktlog_disable(struct ath11k *ar)
cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PKTLOG_DISABLE_CMD) |
FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
- cmd->pdev_id = ar->pdev->pdev_id;
+ cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id);
ret = ath11k_wmi_cmd_send(wmi, skb,
WMI_PDEV_PKTLOG_DISABLE_CMDID);
--
2.7.4
next prev parent reply other threads:[~2019-11-27 14:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1574863720-25728-1-git-send-email-kvalo@codeaurora.org>
2019-11-27 14:08 ` [PATCH 01/10] ath11k: tracing: fix ath11k tracing Kalle Valo
2019-11-29 7:48 ` Kalle Valo
2019-11-27 14:08 ` [PATCH 02/10] ath11k: qmi clean up ce and HTC service config update Kalle Valo
2019-11-27 14:08 ` Kalle Valo [this message]
2019-11-27 14:08 ` [PATCH 03/10] ath11k: qmi clean up in ath11k_qmi_wlanfw_wlan_cfg_send() Kalle Valo
2019-11-27 14:08 ` [PATCH 05/10] ath11k: avoid burst time conversion logic Kalle Valo
2019-11-27 14:08 ` [PATCH 06/10] ath11k: avoid use_after_free in ath11k_dp_rx_msdu_coalesce API Kalle Valo
2019-11-27 14:08 ` [PATCH 07/10] ath11k: update bawindow size in delba process Kalle Valo
2019-11-27 14:08 ` [PATCH 08/10] ath11k: add support for controlling tx power to a station Kalle Valo
2019-11-27 14:08 ` [PATCH 09/10] ath11k: unlock mutex during failure in qmi fw ready Kalle Valo
2019-11-27 14:09 ` [PATCH 10/10] ath11k: add necessary peer assoc params in wmi dbg Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0101016ead3176e9-4ce1305f-5b82-4490-bf38-9caa4ddd9105-000000@us-west-2.amazonses.com \
--to=kvalo@codeaurora.org \
--cc=ath11k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).