[PATCH 2/3] wifi: ath12k: fix DMA direction for re-injected Rx buffers
Lorenzo Bianconi
lorenzo.bianconi at oss.qualcomm.com
Thu Oct 8 06:15:59 PDT 2026
Defragmented MPDUs that are re-injected into the REO are mapped with
DMA_TO_DEVICE, but all the Rx reap and teardown paths unmap them with
DMA_FROM_DEVICE. The DMA API requires the unmap direction to match the
map direction, so this violates the contract.
The mapping actually spans both directions, since the host has written
the buffer before the REO reads it and the buffer is read back by the
host afterwards, so DMA_BIDIRECTIONAL is the correct choice.
Add a 'reinjected' flag to struct ath12k_skb_rxcb and a common
ath12k_dp_unmap_rx_buf() helper that selects DMA_BIDIRECTIONAL for
re-injected buffers and DMA_FROM_DEVICE otherwise, then use it in all the
Rx reap and cleanup paths. Map and unmap the re-injected buffer with
DMA_BIDIRECTIONAL consistently.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Fixes: 33322e3ef074 ("wifi: ath12k: change DMA direction while mapping reinjected packets")
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi at oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/core.h | 1 +
drivers/net/wireless/ath/ath12k/dp.c | 5 +---
drivers/net/wireless/ath/ath12k/dp_rx.h | 11 ++++++++
drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 5 +---
drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 37 +++++++++-----------------
5 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 99d71dab7c04..7a219249dc51 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -149,6 +149,7 @@ struct ath12k_skb_rxcb {
u8 tid;
u16 peer_id;
bool is_end_of_ppdu;
+ bool reinjected;
};
enum ath12k_hw_rev {
diff --git a/drivers/net/wireless/ath/ath12k/dp.c b/drivers/net/wireless/ath/ath12k/dp.c
index 83f9edfabf69..dd3b0dcfa055 100644
--- a/drivers/net/wireless/ath/ath12k/dp.c
+++ b/drivers/net/wireless/ath/ath12k/dp.c
@@ -1003,10 +1003,7 @@ static void ath12k_dp_cc_cleanup(struct ath12k_base *ab)
continue;
if (!ATH12K_SKB_RXCB(skb)->unmapped)
- dma_unmap_single(ab->dev,
- ATH12K_SKB_RXCB(skb)->paddr,
- skb->len + skb_tailroom(skb),
- DMA_FROM_DEVICE);
+ ath12k_dp_unmap_rx_buf(dp, skb);
dev_kfree_skb_any(skb);
}
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.h b/drivers/net/wireless/ath/ath12k/dp_rx.h
index 82700474548a..c3715c99054f 100644
--- a/drivers/net/wireless/ath/ath12k/dp_rx.h
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.h
@@ -187,6 +187,17 @@ void ath12k_dp_extract_rx_desc_data(struct ath12k_hal *hal,
hal->ops->extract_rx_desc_data(rx_info, rx_desc, ldesc);
}
+static inline void ath12k_dp_unmap_rx_buf(struct ath12k_dp *dp,
+ struct sk_buff *skb)
+{
+ struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(skb);
+ enum dma_data_direction dir;
+
+ dir = rxcb->reinjected ? DMA_BIDIRECTIONAL : DMA_FROM_DEVICE;
+ dma_unmap_single(dp->dev, rxcb->paddr, skb->len + skb_tailroom(skb),
+ dir);
+}
+
void ath12k_dp_rx_h_undecap(struct ath12k_pdev_dp *dp_pdev, struct sk_buff *msdu,
enum hal_encrypt_type enctype,
bool decrypted,
diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c b/drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c
index 1e29c13ad66d..e7d5dfa31361 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c
@@ -2722,10 +2722,7 @@ ath12k_wifi7_dp_rx_mon_mpdu_pop(struct ath12k *ar, int mac_id,
drop_mpdu = true;
}
if (!rxcb->unmapped) {
- dma_unmap_single(ar->ab->dev, rxcb->paddr,
- msdu->len +
- skb_tailroom(msdu),
- DMA_FROM_DEVICE);
+ ath12k_dp_unmap_rx_buf(dp, msdu);
rxcb->unmapped = 1;
}
if (drop_mpdu) {
diff --git a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
index 633cb91b9e5d..9cd9c0bb07db 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c
@@ -741,11 +741,7 @@ int ath12k_wifi7_dp_rx_process(struct ath12k_dp *dp, int ring_id,
list_add_tail(&desc_info->list, &rx_desc_used_list[device_id]);
- rxcb = ATH12K_SKB_RXCB(msdu);
- dma_unmap_single(partner_dp->dev, rxcb->paddr,
- msdu->len + skb_tailroom(msdu),
- DMA_FROM_DEVICE);
-
+ ath12k_dp_unmap_rx_buf(partner_dp, msdu);
num_buffs_reaped[device_id]++;
dp->device_stats.reo_rx[ring_id][dp->device_id]++;
@@ -761,6 +757,7 @@ int ath12k_wifi7_dp_rx_process(struct ath12k_dp *dp, int ring_id,
msdu_info = &desc->rx_msdu_info;
mpdu_info = &desc->rx_mpdu_info;
+ rxcb = ATH12K_SKB_RXCB(msdu);
rxcb->is_first_msdu = !!(le32_to_cpu(msdu_info->info0) &
RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU);
rxcb->is_last_msdu = !!(le32_to_cpu(msdu_info->info0) &
@@ -858,6 +855,7 @@ static int ath12k_wifi7_dp_rx_h_defrag_reo_reinject(struct ath12k_dp *dp,
struct ath12k_dp_rx_tid *rx_tid,
struct sk_buff *defrag_skb)
{
+ struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(defrag_skb);
struct ath12k_base *ab = dp->ab;
struct ath12k_hal *hal = dp->hal;
struct hal_rx_desc *rx_desc = (struct hal_rx_desc *)defrag_skb->data;
@@ -906,10 +904,13 @@ static int ath12k_wifi7_dp_rx_h_defrag_reo_reinject(struct ath12k_dp *dp,
buf_paddr = dma_map_single(dp->dev, defrag_skb->data,
defrag_skb->len + skb_tailroom(defrag_skb),
- DMA_TO_DEVICE);
+ DMA_BIDIRECTIONAL);
if (dma_mapping_error(dp->dev, buf_paddr))
return -ENOMEM;
+ rxcb->reinjected = true;
+ rxcb->paddr = buf_paddr;
+
spin_lock_bh(&dp->rx_desc_lock);
desc_info = list_first_entry_or_null(&dp->rx_desc_free_list,
struct ath12k_rx_desc_info,
@@ -927,8 +928,6 @@ static int ath12k_wifi7_dp_rx_h_defrag_reo_reinject(struct ath12k_dp *dp,
list_del(&desc_info->list);
spin_unlock_bh(&dp->rx_desc_lock);
- ATH12K_SKB_RXCB(defrag_skb)->paddr = buf_paddr;
-
ath12k_wifi7_hal_rx_buf_addr_info_set(&msdu0->buf_addr_info, buf_paddr,
desc_info->cookie,
HAL_RX_BUF_RBM_SW3_BM);
@@ -996,7 +995,7 @@ static int ath12k_wifi7_dp_rx_h_defrag_reo_reinject(struct ath12k_dp *dp,
spin_unlock_bh(&dp->rx_desc_lock);
err_unmap_dma:
dma_unmap_single(dp->dev, buf_paddr, defrag_skb->len + skb_tailroom(defrag_skb),
- DMA_TO_DEVICE);
+ DMA_BIDIRECTIONAL);
return ret;
}
@@ -1298,7 +1297,6 @@ ath12k_wifi7_dp_process_rx_err_buf(struct ath12k_pdev_dp *dp_pdev,
struct ath12k_dp *dp = dp_pdev->dp;
struct ath12k_hal *hal = dp->hal;
struct sk_buff *msdu;
- struct ath12k_skb_rxcb *rxcb;
struct hal_rx_desc_data rx_info;
struct hal_rx_desc *rx_desc;
u16 msdu_len;
@@ -1328,11 +1326,7 @@ ath12k_wifi7_dp_process_rx_err_buf(struct ath12k_pdev_dp *dp_pdev,
desc_info->skb = NULL;
list_add_tail(&desc_info->list, used_list);
-
- rxcb = ATH12K_SKB_RXCB(msdu);
- dma_unmap_single(dp->dev, rxcb->paddr,
- msdu->len + skb_tailroom(msdu),
- DMA_FROM_DEVICE);
+ ath12k_dp_unmap_rx_buf(dp, msdu);
if (drop) {
dev_kfree_skb_any(msdu);
@@ -1379,7 +1373,6 @@ static int ath12k_dp_h_msdu_buffer_type(struct ath12k_dp *dp,
struct hal_reo_dest_ring *desc)
{
struct ath12k_rx_desc_info *desc_info;
- struct ath12k_skb_rxcb *rxcb;
struct sk_buff *msdu;
u64 desc_va;
@@ -1410,9 +1403,7 @@ static int ath12k_dp_h_msdu_buffer_type(struct ath12k_dp *dp,
msdu = desc_info->skb;
desc_info->skb = NULL;
list_add_tail(&desc_info->list, list);
- rxcb = ATH12K_SKB_RXCB(msdu);
- dma_unmap_single(dp->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu),
- DMA_FROM_DEVICE);
+ ath12k_dp_unmap_rx_buf(dp, msdu);
dev_kfree_skb_any(msdu);
return 0;
@@ -1998,12 +1989,7 @@ int ath12k_wifi7_dp_rx_process_wbm_err(struct ath12k_dp *dp,
}
list_add_tail(&desc_info->list, &rx_desc_used_list[device_id]);
-
- rxcb = ATH12K_SKB_RXCB(msdu);
- dma_unmap_single(partner_dp->dev, rxcb->paddr,
- msdu->len + skb_tailroom(msdu),
- DMA_FROM_DEVICE);
-
+ ath12k_dp_unmap_rx_buf(partner_dp, msdu);
num_buffs_reaped[device_id]++;
total_num_buffs_reaped++;
@@ -2017,6 +2003,7 @@ int ath12k_wifi7_dp_rx_process_wbm_err(struct ath12k_dp *dp,
}
msdu_data = (struct hal_rx_desc *)msdu->data;
+ rxcb = ATH12K_SKB_RXCB(msdu);
rxcb->err_rel_src = err_info.err_rel_src;
rxcb->err_code = err_info.err_code;
rxcb->is_first_msdu = err_info.first_msdu;
--
2.56.0
More information about the ath12k
mailing list