From 0ae4abc97bf098c282b9b87fff533d1432b268b7 Mon Sep 17 00:00:00 2001 From: Ankit Kumar Date: Thu, 2 May 2019 15:08:42 +0530 Subject: [PATCH] qcacmn: Replace QDF_DMA_BIDIRECTIONAL to QDF_DMA_FROM_DEVICE in rx In Rx path, We really don't need to flush data and invalidate. Hence replacing map/unmap flag to QDF_DMA_FROM_DEVICE. Change-Id: I3de0c73e11a08a875114167a55fe9fe4432f1dd4 CRs-fixed: 2449712 --- dp/wifi3.0/dp_rx.c | 10 +++++----- dp/wifi3.0/dp_rx.h | 6 +++--- dp/wifi3.0/dp_rx_defrag.c | 4 ++-- dp/wifi3.0/dp_rx_desc.c | 4 ++-- dp/wifi3.0/dp_rx_err.c | 4 ++-- dp/wifi3.0/dp_rx_mon_status.c | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dp/wifi3.0/dp_rx.c b/dp/wifi3.0/dp_rx.c index ac356206d1..dd7e6d9a02 100644 --- a/dp/wifi3.0/dp_rx.c +++ b/dp/wifi3.0/dp_rx.c @@ -195,7 +195,7 @@ QDF_STATUS dp_rx_buffers_replenish(struct dp_soc *dp_soc, uint32_t mac_id, } ret = qdf_nbuf_map_single(dp_soc->osdev, rx_netbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); if (qdf_unlikely(QDF_IS_STATUS_ERROR(ret))) { qdf_nbuf_free(rx_netbuf); DP_STATS_INC(dp_pdev, replenish.map_err, 1); @@ -1846,7 +1846,7 @@ more_data: * phyiscal address */ qdf_nbuf_unmap_single(soc->osdev, rx_desc->nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); rx_desc->unmapped = 1; core_id = smp_processor_id(); @@ -2291,7 +2291,7 @@ dp_pdev_rx_buffers_attach(struct dp_soc *dp_soc, uint32_t mac_id, } ret = qdf_nbuf_map_single(dp_soc->osdev, nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); if (qdf_unlikely(QDF_IS_STATUS_ERROR(ret))) { qdf_nbuf_free(nbuf); QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, @@ -2305,7 +2305,7 @@ dp_pdev_rx_buffers_attach(struct dp_soc *dp_soc, uint32_t mac_id, ret = check_x86_paddr(dp_soc, &nbuf, &paddr, dp_pdev); if (ret == QDF_STATUS_E_FAILURE) { qdf_nbuf_unmap_single(dp_soc->osdev, nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); qdf_nbuf_free(nbuf); QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "nbuf check x86 failed"); @@ -2440,7 +2440,7 @@ dp_rx_nbuf_prepare(struct dp_soc *soc, struct dp_pdev *pdev) memset(buf, 0, RX_BUFFER_SIZE); ret = qdf_nbuf_map_single(soc->osdev, nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); /* nbuf map failed */ if (qdf_unlikely(QDF_IS_STATUS_ERROR(ret))) { diff --git a/dp/wifi3.0/dp_rx.h b/dp/wifi3.0/dp_rx.h index 0193c63f6a..ec9f87030f 100644 --- a/dp/wifi3.0/dp_rx.h +++ b/dp/wifi3.0/dp_rx.h @@ -712,7 +712,7 @@ static inline int check_x86_paddr(struct dp_soc *dp_soc, qdf_nbuf_t *rx_netbuf, nbuf_retry++; if ((*rx_netbuf)) { qdf_nbuf_unmap_single(dp_soc->osdev, *rx_netbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); /* Not freeing buffer intentionally. * Observed that same buffer is getting * re-allocated resulting in longer load time @@ -731,7 +731,7 @@ static inline int check_x86_paddr(struct dp_soc *dp_soc, qdf_nbuf_t *rx_netbuf, return QDF_STATUS_E_FAILURE; ret = qdf_nbuf_map_single(dp_soc->osdev, *rx_netbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); if (qdf_unlikely(ret == QDF_STATUS_E_FAILURE)) { qdf_nbuf_free(*rx_netbuf); @@ -745,7 +745,7 @@ static inline int check_x86_paddr(struct dp_soc *dp_soc, qdf_nbuf_t *rx_netbuf, if ((*rx_netbuf)) { qdf_nbuf_unmap_single(dp_soc->osdev, *rx_netbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); qdf_nbuf_free(*rx_netbuf); } diff --git a/dp/wifi3.0/dp_rx_defrag.c b/dp/wifi3.0/dp_rx_defrag.c index dee961578c..a8a2a866a0 100644 --- a/dp/wifi3.0/dp_rx_defrag.c +++ b/dp/wifi3.0/dp_rx_defrag.c @@ -1058,7 +1058,7 @@ dp_rx_defrag_nwifi_to_8023(qdf_nbuf_t nbuf, uint16_t hdrsize) /* map the nbuf before reinject it into HW */ ret = qdf_nbuf_map_single(soc->osdev, head, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); if (qdf_unlikely(ret == QDF_STATUS_E_FAILURE)) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, @@ -1666,7 +1666,7 @@ uint32_t dp_rx_frag_handle(struct dp_soc *soc, void *ring_desc, msdu = rx_desc->nbuf; - qdf_nbuf_unmap_single(soc->osdev, msdu, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap_single(soc->osdev, msdu, QDF_DMA_FROM_DEVICE); rx_desc->rx_buf_start = qdf_nbuf_data(msdu); diff --git a/dp/wifi3.0/dp_rx_desc.c b/dp/wifi3.0/dp_rx_desc.c index 19a9560b5a..ec244547b9 100644 --- a/dp/wifi3.0/dp_rx_desc.c +++ b/dp/wifi3.0/dp_rx_desc.c @@ -95,7 +95,7 @@ void dp_rx_desc_pool_free(struct dp_soc *soc, uint32_t pool_id, false); qdf_nbuf_unmap_single(soc->osdev, nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); } qdf_nbuf_free(nbuf); } @@ -129,7 +129,7 @@ void dp_rx_desc_nbuf_pool_free(struct dp_soc *soc, false); qdf_nbuf_unmap_single(soc->osdev, nbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); } qdf_nbuf_free(nbuf); diff --git a/dp/wifi3.0/dp_rx_err.c b/dp/wifi3.0/dp_rx_err.c index ec1ccee4d8..aaff522717 100644 --- a/dp/wifi3.0/dp_rx_err.c +++ b/dp/wifi3.0/dp_rx_err.c @@ -280,7 +280,7 @@ static uint32_t dp_rx_msdus_drop(struct dp_soc *soc, void *ring_desc, } qdf_nbuf_unmap_single(soc->osdev, - rx_desc->nbuf, QDF_DMA_BIDIRECTIONAL); + rx_desc->nbuf, QDF_DMA_FROM_DEVICE); rx_desc->rx_buf_start = qdf_nbuf_data(rx_desc->nbuf); @@ -1383,7 +1383,7 @@ dp_rx_wbm_err_process(struct dp_soc *soc, void *hal_ring, uint32_t quota) } nbuf = rx_desc->nbuf; - qdf_nbuf_unmap_single(soc->osdev, nbuf, QDF_DMA_BIDIRECTIONAL); + qdf_nbuf_unmap_single(soc->osdev, nbuf, QDF_DMA_FROM_DEVICE); /* * save the wbm desc info in nbuf TLV. We will need this diff --git a/dp/wifi3.0/dp_rx_mon_status.c b/dp/wifi3.0/dp_rx_mon_status.c index 43bc7a2015..de5de6d492 100644 --- a/dp/wifi3.0/dp_rx_mon_status.c +++ b/dp/wifi3.0/dp_rx_mon_status.c @@ -1007,7 +1007,7 @@ QDF_STATUS dp_rx_mon_status_buffers_replenish(struct dp_soc *dp_soc, "[%s][%d] rxdma_ring_entry is NULL, count - %d", __func__, __LINE__, count); qdf_nbuf_unmap_single(dp_soc->osdev, rx_netbuf, - QDF_DMA_BIDIRECTIONAL); + QDF_DMA_FROM_DEVICE); qdf_nbuf_free(rx_netbuf); break; }