From b2864fabe4c2b7bba72a67bd306cb3220a480f86 Mon Sep 17 00:00:00 2001 From: Venkateswara Swamy Bandaru Date: Tue, 23 Jan 2018 22:44:37 +0530 Subject: [PATCH] Revert "qcacmn: Mesh throughput enhancements" This reverts commit I89ff27994477a5637979a9cd6a397286144b2535. Change-Id: I7421f3572c46ed27a2d96724b2bbbe40c0704e5f CRs-Fixed: 2177160 --- dp/inc/cdp_txrx_cmn_struct.h | 8 --- dp/wifi3.0/dp_main.c | 16 +---- dp/wifi3.0/dp_tx.c | 126 +++++++++-------------------------- dp/wifi3.0/dp_tx.h | 6 +- qdf/linux/src/i_qdf_nbuf.h | 1 - 5 files changed, 36 insertions(+), 121 deletions(-) diff --git a/dp/inc/cdp_txrx_cmn_struct.h b/dp/inc/cdp_txrx_cmn_struct.h index 07f8f82435a2..03230afc6413 100644 --- a/dp/inc/cdp_txrx_cmn_struct.h +++ b/dp/inc/cdp_txrx_cmn_struct.h @@ -1006,14 +1006,6 @@ struct cdp_tx_ingress_stats { uint32_t res_full; } dropped; - /* Mesh packets info */ - struct { - /* packets sent to fw */ - uint32_t exception_fw; - /* packets completions received from fw */ - uint32_t completion_fw; - } mesh; - /*Number of packets classified by CCE*/ uint32_t cce_classified; diff --git a/dp/wifi3.0/dp_main.c b/dp/wifi3.0/dp_main.c index 6e1ee6b6ca2a..34713c2c9c92 100644 --- a/dp/wifi3.0/dp_main.c +++ b/dp/wifi3.0/dp_main.c @@ -2978,10 +2978,7 @@ static void dp_vdev_register_wifi3(struct cdp_vdev *vdev_handle, vdev->me_convert = txrx_ops->me_convert; /* TODO: Enable the following once Tx code is integrated */ - if (vdev->mesh_vdev) - txrx_ops->tx.tx = dp_tx_send_mesh; - else - txrx_ops->tx.tx = dp_tx_send; + txrx_ops->tx.tx = dp_tx_send; QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_LOW, "DP Vdev Register success"); @@ -4290,8 +4287,6 @@ static inline void dp_aggregate_pdev_stats(struct dp_pdev *pdev) DP_STATS_AGGR(pdev, vdev, tx_i.dropped.res_full); DP_STATS_AGGR(pdev, vdev, tx_i.cce_classified); DP_STATS_AGGR(pdev, vdev, tx_i.cce_classified_raw); - DP_STATS_AGGR(pdev, vdev, tx_i.mesh.exception_fw); - DP_STATS_AGGR(pdev, vdev, tx_i.mesh.completion_fw); pdev->stats.tx_i.dropped.dropped_pkt.num = pdev->stats.tx_i.dropped.dma_error + @@ -4411,15 +4406,10 @@ dp_print_pdev_tx_stats(struct dp_pdev *pdev) DP_PRINT_STATS(" Bytes = %llu", pdev->stats.tx_i.nawds_mcast.bytes); DP_PRINT_STATS("CCE Classified:"); - DP_PRINT_STATS(" CCE Classified Packets: %u", + DP_TRACE(FATAL, " CCE Classified Packets: %u", pdev->stats.tx_i.cce_classified); - DP_PRINT_STATS(" RAW CCE Classified Packets: %u", + DP_TRACE(FATAL, " RAW CCE Classified Packets: %u", pdev->stats.tx_i.cce_classified_raw); - DP_PRINT_STATS("Mesh stats:"); - DP_PRINT_STATS(" frames to firmware: %u", - pdev->stats.tx_i.mesh.exception_fw); - DP_PRINT_STATS(" completions from fw: %u", - pdev->stats.tx_i.mesh.completion_fw); } /** diff --git a/dp/wifi3.0/dp_tx.c b/dp/wifi3.0/dp_tx.c index 77d0ddc5e1ab..723728ecb482 100644 --- a/dp/wifi3.0/dp_tx.c +++ b/dp/wifi3.0/dp_tx.c @@ -471,8 +471,7 @@ struct dp_tx_ext_desc_elem_s *dp_tx_prepare_ext_desc(struct dp_vdev *vdev, return NULL; } - if (msdu_info->exception_fw && - qdf_unlikely(vdev->mesh_vdev)) { + if (qdf_unlikely(vdev->mesh_vdev)) { qdf_mem_copy(&cached_ext_desc[HAL_TX_EXTENSION_DESC_LEN_BYTES], &msdu_info->meta_data[0], sizeof(struct htt_tx_msdu_desc_ext2_t)); @@ -527,7 +526,7 @@ struct dp_tx_ext_desc_elem_s *dp_tx_prepare_ext_desc(struct dp_vdev *vdev, static struct dp_tx_desc_s *dp_tx_prepare_desc_single(struct dp_vdev *vdev, qdf_nbuf_t nbuf, uint8_t desc_pool_id, - struct dp_tx_msdu_info_s *msdu_info) + uint32_t *meta_data) { uint8_t align_pad; uint8_t is_exception = 0; @@ -587,8 +586,8 @@ struct dp_tx_desc_s *dp_tx_prepare_desc_single(struct dp_vdev *vdev, * | | * |-----------------------------| */ - if (qdf_unlikely((msdu_info->exception_fw)) || - (vdev->opmode == wlan_op_mode_ocb)) { + if (qdf_unlikely(vdev->mesh_vdev || + (vdev->opmode == wlan_op_mode_ocb))) { align_pad = ((unsigned long) qdf_nbuf_data(nbuf)) & 0x7; if (qdf_nbuf_push_head(nbuf, align_pad) == NULL) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, @@ -597,7 +596,7 @@ struct dp_tx_desc_s *dp_tx_prepare_desc_single(struct dp_vdev *vdev, } htt_hdr_size = dp_tx_prepare_htt_metadata(vdev, nbuf, - msdu_info->meta_data); + meta_data); if (htt_hdr_size == 0) goto failure; tx_desc->pkt_offset = align_pad + htt_hdr_size; @@ -697,7 +696,7 @@ static struct dp_tx_desc_s *dp_tx_prepare_desc(struct dp_vdev *vdev, tx_desc->flags |= DP_TX_DESC_FLAG_TO_FW; qdf_atomic_inc(&pdev->num_tx_exception); #endif - if (qdf_unlikely(msdu_info->exception_fw)) + if (qdf_unlikely(vdev->mesh_vdev)) tx_desc->flags |= DP_TX_DESC_FLAG_TO_FW; tx_desc->msdu_ext_desc = msdu_ext_desc; @@ -1170,21 +1169,19 @@ static void dp_non_std_tx_comp_free_buff(struct dp_tx_desc_s *tx_desc, * nbuf when it fails to send */ static qdf_nbuf_t dp_tx_send_msdu_single(struct dp_vdev *vdev, qdf_nbuf_t nbuf, - struct dp_tx_msdu_info_s *msdu_info, - uint16_t peer_id) + uint8_t tid, struct dp_tx_queue *tx_q, + uint32_t *meta_data, uint16_t peer_id) { struct dp_pdev *pdev = vdev->pdev; struct dp_soc *soc = pdev->soc; struct dp_tx_desc_s *tx_desc; QDF_STATUS status; - struct dp_tx_queue *tx_q = &(msdu_info->tx_queue); void *hal_srng = soc->tcl_data_ring[tx_q->ring_id].hal_srng; uint16_t htt_tcl_metadata = 0; - uint8_t tid = msdu_info->tid; HTT_TX_TCL_METADATA_VALID_HTT_SET(htt_tcl_metadata, 0); /* Setup Tx descriptor for an MSDU, and MSDU extension descriptor */ - tx_desc = dp_tx_prepare_desc_single(vdev, nbuf, tx_q->desc_pool_id, msdu_info); + tx_desc = dp_tx_prepare_desc_single(vdev, nbuf, tx_q->desc_pool_id, meta_data); if (!tx_desc) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "%s Tx_desc prepare Fail vdev %pK queue %d\n", @@ -1490,14 +1487,14 @@ qdf_nbuf_t dp_tx_extract_mesh_meta_data(struct dp_vdev *vdev, qdf_nbuf_t nbuf, struct htt_tx_msdu_desc_ext2_t *meta_data = (struct htt_tx_msdu_desc_ext2_t *)&msdu_info->meta_data[0]; - mhdr = (struct meta_hdr_s *)qdf_nbuf_data(nbuf); - - if (CB_FTYPE_MESH_TX_INFO != qdf_nbuf_get_tx_ftype(nbuf)) { - msdu_info->exception_fw = 0; - goto remove_meta_hdr; + nbuf = qdf_nbuf_unshare(nbuf); + if (nbuf == NULL) { + QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, + "qdf_nbuf_unshare failed\n"); + return nbuf; } - msdu_info->exception_fw = 1; + mhdr = (struct meta_hdr_s *)qdf_nbuf_data(nbuf); qdf_mem_set(meta_data, sizeof(struct htt_tx_msdu_desc_ext2_t), 0); @@ -1534,7 +1531,6 @@ qdf_nbuf_t dp_tx_extract_mesh_meta_data(struct dp_vdev *vdev, qdf_nbuf_t nbuf, meta_data->valid_key_flags = 1; meta_data->key_flags = (mhdr->keyix & 0x3); -remove_meta_hdr: if (qdf_nbuf_pull_head(nbuf, sizeof(struct meta_hdr_s)) == NULL) { QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, "qdf_nbuf_pull_head failed\n"); @@ -1543,12 +1539,12 @@ remove_meta_hdr: } QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG, - "%s , Meta hdr %0x %0x %0x %0x %0x to_fw %d\n", + "%s , Meta hdr %0x %0x %0x %0x %0x\n", __func__, msdu_info->meta_data[0], msdu_info->meta_data[1], msdu_info->meta_data[2], msdu_info->meta_data[3], - msdu_info->meta_data[4], msdu_info->exception_fw); + msdu_info->meta_data[4]); return nbuf; } @@ -1575,7 +1571,7 @@ qdf_nbuf_t dp_tx_extract_mesh_meta_data(struct dp_vdev *vdev, qdf_nbuf_t nbuf, * return: NULL on success nbuf on failure */ static qdf_nbuf_t dp_tx_prepare_nawds(struct dp_vdev *vdev, qdf_nbuf_t nbuf, - struct dp_tx_msdu_info_s *msdu_info) + uint8_t tid, struct dp_tx_queue *tx_q, uint32_t *meta_data) { struct dp_peer *peer = NULL; struct dp_soc *soc = vdev->pdev->soc; @@ -1613,8 +1609,8 @@ static qdf_nbuf_t dp_tx_prepare_nawds(struct dp_vdev *vdev, qdf_nbuf_t nbuf, } peer_id = peer->peer_ids[0]; - nbuf_copy = dp_tx_send_msdu_single(vdev, nbuf_copy, - msdu_info, peer_id); + nbuf_copy = dp_tx_send_msdu_single(vdev, nbuf_copy, tid, + tx_q, meta_data, peer_id); if (nbuf_copy != NULL) { qdf_nbuf_free(nbuf_copy); continue; @@ -1630,64 +1626,6 @@ static qdf_nbuf_t dp_tx_prepare_nawds(struct dp_vdev *vdev, qdf_nbuf_t nbuf, } #endif -/** - * dp_tx_send_mesh() - Transmit mesh frame on a given VAP - * @vap_dev: DP vdev handle - * @nbuf: skb - * - * Entry point for Core Tx layer (DP_TX) invoked from - * hard_start_xmit in OSIF/HDD - * - * Return: NULL on success, - * nbuf when it fails to send - */ -#ifdef MESH_MODE_SUPPORT -qdf_nbuf_t dp_tx_send_mesh(void *vap_dev, qdf_nbuf_t nbuf) -{ - struct meta_hdr_s *mhdr; - qdf_nbuf_t nbuf_mesh = NULL; - qdf_nbuf_t nbuf_clone = NULL; - struct dp_vdev *vdev = (struct dp_vdev *) vap_dev; - - nbuf_mesh = qdf_nbuf_unshare(nbuf); - if (nbuf_mesh == NULL) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "qdf_nbuf_unshare failed\n"); - return nbuf; - } - nbuf = nbuf_mesh; - - mhdr = (struct meta_hdr_s *)qdf_nbuf_data(nbuf); - if (mhdr->flags & METAHDR_FLAG_INFO_UPDATED) { - nbuf_clone = qdf_nbuf_clone(nbuf); - if (nbuf_clone == NULL) { - QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, - "qdf_nbuf_clone failed\n"); - return nbuf; - } - qdf_nbuf_set_tx_ftype(nbuf_clone, CB_FTYPE_MESH_TX_INFO); - } - - if (nbuf_clone) { - if (!dp_tx_send(vap_dev, nbuf_clone)) { - DP_STATS_INC(vdev, tx_i.mesh.exception_fw, 1); - } else - qdf_nbuf_free(nbuf_clone); - } - - qdf_nbuf_set_tx_ftype(nbuf, CB_FTYPE_INVALID); - return dp_tx_send(vap_dev, nbuf); -} - -#else - -qdf_nbuf_t dp_tx_send_mesh(void *vap_dev, qdf_nbuf_t nbuf) -{ - return dp_tx_send(vap_dev, nbuf); -} - -#endif - /** * dp_tx_send() - Transmit a frame on a given VAP * @vap_dev: DP vdev handle @@ -1833,7 +1771,8 @@ qdf_nbuf_t dp_tx_send(void *vap_dev, qdf_nbuf_t nbuf) * prepare direct-buffer type TCL descriptor and enqueue to TCL * SRNG. There is no need to setup a MSDU extension descriptor. */ - nbuf = dp_tx_send_msdu_single(vdev, nbuf, &msdu_info, peer_id); + nbuf = dp_tx_send_msdu_single(vdev, nbuf, msdu_info.tid, + &msdu_info.tx_queue, msdu_info.meta_data, peer_id); return nbuf; @@ -1970,7 +1909,9 @@ void dp_tx_reinject_handler(struct dp_tx_desc_s *tx_desc, uint8_t *status) nbuf_copy = dp_tx_send_msdu_single(vdev, nbuf_copy, - &msdu_info, + msdu_info.tid, + &msdu_info.tx_queue, + msdu_info.meta_data, peer_id); if (nbuf_copy) { @@ -1995,7 +1936,9 @@ void dp_tx_reinject_handler(struct dp_tx_desc_s *tx_desc, uint8_t *status) 1, qdf_nbuf_len(nbuf)); nbuf = dp_tx_send_msdu_single(vdev, - nbuf, &msdu_info, peer_id); + nbuf, msdu_info.tid, + &msdu_info.tx_queue, + msdu_info.meta_data, peer_id); if (nbuf) { QDF_TRACE(QDF_MODULE_ID_DP, @@ -2144,14 +2087,10 @@ static inline void dp_tx_comp_free_buf(struct dp_soc *soc, ts.ppdu_id, nbuf) == QDF_STATUS_SUCCESS) return; - if (qdf_likely(!vdev->mesh_vdev)) + if (!vdev->mesh_vdev) { qdf_nbuf_free(nbuf); - else { - if (desc->flags & DP_TX_DESC_FLAG_TO_FW) { - qdf_nbuf_free(nbuf); - DP_STATS_INC(vdev, tx_i.mesh.completion_fw, 1); - } else - vdev->osif_tx_free_ext((nbuf)); + } else { + vdev->osif_tx_free_ext((nbuf)); } } @@ -2447,8 +2386,7 @@ static inline void dp_tx_comp_process_tx_status(struct dp_tx_desc_s *tx_desc, (ts.status == HAL_TX_TQM_RR_REM_CMD_REM)); /* Update per-packet stats */ - if (qdf_unlikely(vdev->mesh_vdev) && - !(tx_desc->flags & DP_TX_DESC_FLAG_TO_FW)) + if (qdf_unlikely(vdev->mesh_vdev)) dp_tx_comp_fill_tx_completion_stats(tx_desc, &ts); /* Update peer level stats */ diff --git a/dp/wifi3.0/dp_tx.h b/dp/wifi3.0/dp_tx.h index 71d19551801c..263df96f77e7 100644 --- a/dp/wifi3.0/dp_tx.h +++ b/dp/wifi3.0/dp_tx.h @@ -115,8 +115,6 @@ struct dp_tx_queue { * @u.tso_info: TSO information for TSO frame types * (chain of the TSO segments, number of segments) * @u.sg_info: Scatter Gather information for non-TSO SG frames - * @meta_data: Mesh meta header information - * @exception_fw: Duplicate frame to be sent to firmware * * This structure holds the complete MSDU information needed to program the * Hardware TCL and MSDU extension descriptors for different frame types @@ -131,8 +129,7 @@ struct dp_tx_msdu_info_s { struct qdf_tso_info_t tso_info; struct dp_tx_sg_info_s sg_info; } u; - uint32_t meta_data[6]; - uint8_t exception_fw; + uint32_t meta_data[5]; }; QDF_STATUS dp_tx_vdev_attach(struct dp_vdev *vdev); @@ -146,7 +143,6 @@ QDF_STATUS dp_tx_pdev_detach(struct dp_pdev *pdev); QDF_STATUS dp_tx_pdev_attach(struct dp_pdev *pdev); qdf_nbuf_t dp_tx_send(void *data_vdev, qdf_nbuf_t nbuf); -qdf_nbuf_t dp_tx_send_mesh(void *data_vdev, qdf_nbuf_t nbuf); #ifdef CONVERGED_TDLS_ENABLE qdf_nbuf_t dp_tx_non_std(struct cdp_vdev *vdev_handle, diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h index cf7c4483c1ad..e2fc4d63a9fa 100644 --- a/qdf/linux/src/i_qdf_nbuf.h +++ b/qdf/linux/src/i_qdf_nbuf.h @@ -583,7 +583,6 @@ typedef enum { CB_FTYPE_INTRABSS_FWD = 5, CB_FTYPE_RX_INFO = 6, CB_FTYPE_MESH_RX_INFO = 7, - CB_FTYPE_MESH_TX_INFO = 8, } CB_FTYPE; /*