qcacmn: Use monitor pkt tlvs and buffer size for monitor

Use monitor pkt tlvs size and monitor buffer size
instead of data pkt tlv size and data pkt buffer size.

Change-Id: I3099f6526aa11b353c8a5178de450d48f141a461
CRs-Fixed: 3406962
This commit is contained in:
Sushant Butta
2023-04-14 12:01:24 +05:30
committed by Madan Koyyalamudi
父節點 2567b43224
當前提交 aad187e304
共有 3 個文件被更改,包括 12 次插入10 次删除

查看文件

@@ -192,7 +192,7 @@ static inline void dp_mon_adjust_frag_len(struct dp_soc *soc,
uint32_t *frag_len,
uint16_t l2_hdr_pad)
{
uint32_t rx_pkt_tlv_len = soc->rx_pkt_tlv_size;
uint32_t rx_pkt_tlv_len = soc->rx_mon_pkt_tlv_size;
if (*total_len >= (RX_MONITOR_BUFFER_SIZE - rx_pkt_tlv_len)) {
*frag_len = RX_MONITOR_BUFFER_SIZE - rx_pkt_tlv_len -
@@ -414,7 +414,7 @@ dp_rx_mon_parse_desc_buffer(struct dp_soc *dp_soc,
{
struct hal_rx_mon_dest_buf_info frame_info;
uint16_t tot_payload_len =
RX_MONITOR_BUFFER_SIZE - dp_soc->rx_pkt_tlv_size;
RX_MONITOR_BUFFER_SIZE - dp_soc->rx_mon_pkt_tlv_size;
if (msdu_info->msdu_flags & HAL_MSDU_F_MSDU_CONTINUATION) {
/* First buffer of MSDU */

查看文件

@@ -1,6 +1,6 @@
/*
* Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -1933,7 +1933,7 @@ dp_rx_mon_frag_restitch_mpdu_from_msdus(struct dp_soc *soc,
* ------------------------------------------------------------
*/
pad_byte_pholder =
(RX_MONITOR_BUFFER_SIZE - soc->rx_pkt_tlv_size) - frag_size;
(RX_MONITOR_BUFFER_SIZE - soc->rx_mon_pkt_tlv_size) - frag_size;
/* Construct destination address
* --------------------------------------------------------------
* | RX_PKT_TLV | L2_HDR_PAD | Decap HDR | Payload |
@@ -2062,7 +2062,7 @@ dp_rx_mon_frag_restitch_mpdu_from_msdus(struct dp_soc *soc,
* to accommodate amsdu pad byte
*/
pad_byte_pholder =
(RX_MONITOR_BUFFER_SIZE - soc->rx_pkt_tlv_size)
(RX_MONITOR_BUFFER_SIZE - soc->rx_mon_pkt_tlv_size)
- frag_size;
/*
* We will come here only only three condition:

查看文件

@@ -296,14 +296,16 @@ dp_mon_ht2_rx_ring_cfg(struct dp_soc *soc,
switch (srng_type) {
case DP_MON_FILTER_SRNG_TYPE_RXDMA_BUF:
if (target_type == TARGET_TYPE_QCN9160)
if (target_type == TARGET_TYPE_QCN9160) {
hal_ring_hdl =
soc->rx_refill_buf_ring[lmac_id].hal_srng;
else
ring_buf_size = RX_MONITOR_BUFFER_SIZE;
} else {
hal_ring_hdl =
pdev->rx_mac_buf_ring[lmac_id].hal_srng;
ring_buf_size = RX_DATA_BUFFER_SIZE;
}
hal_ring_type = RXDMA_BUF;
ring_buf_size = RX_DATA_BUFFER_SIZE;
break;
case DP_MON_FILTER_SRNG_TYPE_RXDMA_MONITOR_STATUS:
@@ -331,14 +333,14 @@ dp_mon_ht2_rx_ring_cfg(struct dp_soc *soc,
hal_ring_hdl =
soc->rxdma_mon_buf_ring[lmac_id].hal_srng;
hal_ring_type = RXDMA_MONITOR_BUF;
ring_buf_size = RX_DATA_BUFFER_SIZE;
ring_buf_size = RX_MONITOR_BUFFER_SIZE;
break;
case DP_MON_FILTER_SRNG_TYPE_RXMON_DEST:
hal_ring_hdl =
soc->rxdma_mon_dst_ring[lmac_id].hal_srng;
hal_ring_type = RXDMA_MONITOR_DST;
ring_buf_size = RX_DATA_BUFFER_SIZE;
ring_buf_size = RX_MONITOR_BUFFER_SIZE;
break;
default:
return QDF_STATUS_E_FAILURE;