ath11k: pktlog: fix sending/using the pdev id
PATCH 1/1 ath11k: pktlog: fix sending/using the pdev id
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 <[email protected]>
--- drivers/net/wireless/ath/ath11k/dp_rx.c | 8 +++++--- drivers/net/wireless/ath/ath11k/wmi.c | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/ath11k/dp_rx.c +5 -3
@@ -1287,7 +1287,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,
@@ -1296,8 +1295,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); }
drivers/net/wireless/ath/ath11k/wmi.c +3 -3
@@ -2313,7 +2313,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;
@@ -2411,7 +2411,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 ;
@@ -2441,7 +2441,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 );
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 5 lines · Anilkumar Kolli
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 <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath11k-post-bringup branch of ath.git, thanks.
e5d30440486d ath11k: pktlog: fix sending/using the pdev id
Signature · 9 lines
https://patchwork.kernel.org/patch/11219095/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k