diff options
| author | Eva Huang <evahuang@google.com> | 2021-06-30 15:52:56 +0800 |
|---|---|---|
| committer | Eva Huang <evahuang@google.com> | 2021-06-30 15:52:56 +0800 |
| commit | 90ae365a1c9210bdc56fd00d61d2a8a36dde9541 (patch) | |
| tree | a9d6b5899eb2e060e5479737ca4f781998e4e61a | |
| parent | 33c6b064b7e6722e23f55759dd2081e822425f7e (diff) | |
| parent | 997001f446effaf4fd9db0aa19bca6ebd92fd65f (diff) | |
| download | qca-wfi-host-cmn-android-msm-sunfish-4.14-android11-qpr3.tar.gz | |
Merge branch 'android-msm-pixel-4.14-rvc-security' into android-msm-pixel-4.14-rvc-qpr3android-11.0.0_r0.114android-11.0.0_r0.104android-msm-sunfish-4.14-android11-qpr3
Sep 2021.1
Bug: 192423477
Change-Id: I5803a410332cb4523d4294d0454adcf7c7460926
| -rw-r--r-- | dp/wifi3.0/dp_rx.c | 1 | ||||
| -rw-r--r-- | dp/wifi3.0/dp_rx_defrag.c | 2 | ||||
| -rw-r--r-- | dp/wifi3.0/dp_rx_err.c | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index 2d47beb28..aaabb9b69 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -1377,6 +1377,7 @@ dp_rx_process(struct dp_intr *int_ctx, void *hal_ring, uint32_t quota) qdf_assert(rx_desc); rx_bufs_reaped[rx_desc->pool_id]++; + dp_ipa_handle_rx_buf_smmu_mapping(soc, rx_desc->nbuf, false); /* TODO */ /* * Need a separate API for unmapping based on diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index 0f35d9cd5..1c9043d8f 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -1612,6 +1612,8 @@ uint32_t dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, msdu = rx_desc->nbuf; + dp_ipa_handle_rx_buf_smmu_mapping(soc, msdu, false); + qdf_nbuf_unmap_single(soc->osdev, msdu, QDF_DMA_BIDIRECTIONAL); diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index c3a5edaf9..7f77d2e8c 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -29,6 +29,7 @@ #include <linux/ieee80211.h> #endif #include "dp_rx_defrag.h" +#include "dp_ipa.h" #include <enet.h> /* LLC_SNAP_HDR_LEN */ #ifdef RX_DESC_DEBUG_CHECK @@ -1087,6 +1088,7 @@ dp_rx_wbm_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota) } nbuf = rx_desc->nbuf; + dp_ipa_handle_rx_buf_smmu_mapping(soc, nbuf, false); qdf_nbuf_unmap_single(soc->osdev, nbuf, QDF_DMA_BIDIRECTIONAL); /* @@ -1303,6 +1305,7 @@ dp_rx_err_mpdu_pop(struct dp_soc *soc, uint32_t mac_id, qdf_assert(rx_desc); msdu = rx_desc->nbuf; + dp_ipa_handle_rx_buf_smmu_mapping(soc, msdu, false); qdf_nbuf_unmap_single(soc->osdev, msdu, QDF_DMA_FROM_DEVICE); |