samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: revert 2 gerrits from 4k ini change

Browse Source 
This reverts commit Icd1bbe85182d6baf1e25dceed0b45994aa9f55fc.
This reverts commit Id00c6351bf6bc1b9df5e19064b2057dadd315e9b.

- revert add rx_buffer_size to softumac case
- revert 4k skb buffer change.

Change-Id: I623b200c0c5f08f0e372629cb1c972b521c25eaa
CRs-Fixed: 3623665
This commit is contained in:
Ruben Columbus
2023-09-24 21:53:49 -07:00
committed by Rahul Choudhary
parent 712dc13309
commit 4a7db7f38e
13 changed files with 25 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dp/wifi3.0/be/dp_be.c
View File

@@ -1747,9 +1747,6 @@ dp_rxdma_ring_sel_cfg_be(struct dp_soc *soc)
struct htt_rx_ring_tlv_filter htt_tlv_filter = {0};
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
/*
* In Beryllium chipset msdu_start, mpdu_end
@@ -1835,7 +1832,7 @@ dp_rxdma_ring_sel_cfg_be(struct dp_soc *soc)
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}
@@ -1856,9 +1853,6 @@ dp_rxdma_ring_sel_cfg_be(struct dp_soc *soc)
struct htt_rx_ring_tlv_filter htt_tlv_filter = {0};
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
/*
* In Beryllium chipset msdu_start, mpdu_end
@@ -1964,7 +1958,7 @@ dp_rxdma_ring_sel_cfg_be(struct dp_soc *soc)
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}

10
dp/wifi3.0/be/dp_be_rx.c
View File

@@ -226,7 +226,6 @@ uint32_t dp_rx_process_be(struct dp_intr *int_ctx,
uint32_t dsf;
uint32_t l3_pad;
uint8_t link_id = 0;
uint16_t buf_size;
DP_HIST_INIT();
@@ -238,7 +237,6 @@ uint32_t dp_rx_process_be(struct dp_intr *int_ctx,
intr_id = int_ctx->dp_intr_id;
num_entries = hal_srng_get_num_entries(hal_soc, hal_ring_hdl);
dp_runtime_pm_mark_last_busy(soc);
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
more_data:
/* reset local variables here to be re-used in the function */
@@ -402,7 +400,7 @@ more_data:
* reap this MPDU
*/
if ((QDF_NBUF_CB_RX_PKT_LEN(rx_desc->nbuf) /
(buf_size -
(RX_DATA_BUFFER_SIZE -
soc->rx_pkt_tlv_size) + 1) >
num_pending) {
DP_STATS_INC(soc,
@@ -2113,9 +2111,6 @@ dp_rx_null_q_desc_handle_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
uint16_t sa_idx = 0;
bool is_eapol = 0;
bool enh_flag;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
qdf_nbuf_set_rx_chfrag_start(
nbuf,
@@ -2143,7 +2138,8 @@ dp_rx_null_q_desc_handle_be(struct dp_soc *soc, qdf_nbuf_t nbuf,
goto drop_nbuf;
/* Set length in nbuf */
qdf_nbuf_set_pktlen(nbuf, qdf_min(pkt_len, (uint32_t)buf_size));
qdf_nbuf_set_pktlen(
nbuf, qdf_min(pkt_len, (uint32_t)RX_DATA_BUFFER_SIZE));
}
/*

6
dp/wifi3.0/dp_internal.h
View File

@@ -5067,9 +5067,6 @@ void dp_rx_err_send_pktlog(struct dp_soc *soc, struct dp_pdev *pdev,
uint16_t msdu_len, nbuf_len;
uint8_t *rx_tlv_hdr;
struct hal_rx_msdu_metadata msdu_metadata;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
if (qdf_unlikely(packetdump_cb)) {
rx_tlv_hdr = qdf_nbuf_data(nbuf);
@@ -5087,7 +5084,8 @@ void dp_rx_err_send_pktlog(struct dp_soc *soc, struct dp_pdev *pdev,
if (set_pktlen) {
msdu_len = nbuf_len + skip_size;
qdf_nbuf_set_pktlen(nbuf, qdf_min(msdu_len, buf_size));
qdf_nbuf_set_pktlen(nbuf, qdf_min(msdu_len,
(uint16_t)RX_DATA_BUFFER_SIZE));
}
qdf_nbuf_pull_head(nbuf, skip_size);

7
dp/wifi3.0/dp_ipa.c
View File

@@ -3874,11 +3874,8 @@ static qdf_nbuf_t dp_ipa_frag_nbuf_linearize(struct dp_soc *soc,
uint32_t nbuf_len = qdf_nbuf_len(nbuf);
bool is_nbuf_head = true;
uint32_t copy_len = 0;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
dst_nbuf = qdf_nbuf_alloc(soc->osdev, buf_size,
dst_nbuf = qdf_nbuf_alloc(soc->osdev, RX_DATA_BUFFER_SIZE,
RX_BUFFER_RESERVATION,
RX_DATA_BUFFER_ALIGNMENT, FALSE);
@@ -3887,7 +3884,7 @@ static qdf_nbuf_t dp_ipa_frag_nbuf_linearize(struct dp_soc *soc,
return NULL;
}
if ((nbuf_len + L3_HEADER_PADDING) > buf_size) {
if ((nbuf_len + L3_HEADER_PADDING) > RX_DATA_BUFFER_SIZE) {
qdf_nbuf_free(dst_nbuf);
dp_err_rl("nbuf is jumbo data");
return NULL;

14
dp/wifi3.0/dp_rx.c
View File

@@ -1774,16 +1774,13 @@ static inline bool dp_rx_adjust_nbuf_len(struct dp_soc *soc,
{
bool last_nbuf;
uint32_t pkt_hdr_size;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
pkt_hdr_size = soc->rx_pkt_tlv_size + l3_pad_len;
if ((*mpdu_len + pkt_hdr_size) > buf_size) {
qdf_nbuf_set_pktlen(nbuf, buf_size);
if ((*mpdu_len + pkt_hdr_size) > RX_DATA_BUFFER_SIZE) {
qdf_nbuf_set_pktlen(nbuf, RX_DATA_BUFFER_SIZE);
last_nbuf = false;
*mpdu_len -= (buf_size - pkt_hdr_size);
*mpdu_len -= (RX_DATA_BUFFER_SIZE - pkt_hdr_size);
} else {
qdf_nbuf_set_pktlen(nbuf, (*mpdu_len + pkt_hdr_size));
last_nbuf = true;
@@ -3305,11 +3302,8 @@ QDF_STATUS dp_rx_pdev_desc_pool_init(struct dp_pdev *pdev)
struct dp_srng *dp_rxdma_srng;
struct rx_desc_pool *rx_desc_pool;
uint32_t target_type = hal_get_target_type(soc->hal_soc);
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
rx_desc_pool = &soc->rx_desc_buf[mac_for_pdev];
if (wlan_cfg_get_dp_pdev_nss_enabled(pdev->wlan_cfg_ctx)) {
/*
* If NSS is enabled, rx_desc_pool is already filled.
@@ -3334,7 +3328,7 @@ QDF_STATUS dp_rx_pdev_desc_pool_init(struct dp_pdev *pdev)
wlan_cfg_get_dp_soc_rx_sw_desc_num(soc->wlan_cfg_ctx);
rx_desc_pool->owner = dp_rx_get_rx_bm_id(soc);
rx_desc_pool->buf_size = buf_size;
rx_desc_pool->buf_size = RX_DATA_BUFFER_SIZE;
rx_desc_pool->buf_alignment = RX_DATA_BUFFER_ALIGNMENT;
/* Disable monitor dest processing via frag */
if (target_type == TARGET_TYPE_QCN9160) {

12
dp/wifi3.0/dp_rx_err.c
View File

@@ -886,11 +886,7 @@ dp_rx_null_q_handle_invalid_peer_id_exception(struct dp_soc *soc,
bool dp_rx_check_pkt_len(struct dp_soc *soc, uint32_t pkt_len)
{
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
if (qdf_unlikely(pkt_len > buf_size)) {
if (qdf_unlikely(pkt_len > RX_DATA_BUFFER_SIZE)) {
DP_STATS_INC_PKT(soc, rx.err.rx_invalid_pkt_len,
1, pkt_len);
return true;
@@ -1637,9 +1633,6 @@ dp_rx_err_route_hdl(struct dp_soc *soc, qdf_nbuf_t nbuf,
struct dp_vdev *vdev;
struct hal_rx_msdu_metadata msdu_metadata;
bool is_eapol;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
qdf_nbuf_set_rx_chfrag_start(
nbuf,
@@ -1666,7 +1659,8 @@ dp_rx_err_route_hdl(struct dp_soc *soc, qdf_nbuf_t nbuf,
goto drop_nbuf;
/* Set length in nbuf */
qdf_nbuf_set_pktlen(nbuf, qdf_min(pkt_len, (uint32_t)buf_size));
qdf_nbuf_set_pktlen(
nbuf, qdf_min(pkt_len, (uint32_t)RX_DATA_BUFFER_SIZE));
}
/*

10
dp/wifi3.0/li/dp_li.c
View File

@@ -259,9 +259,6 @@ dp_rxdma_ring_sel_cfg_li(struct dp_soc *soc)
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint32_t target_type = hal_get_target_type(soc->hal_soc);
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
if (target_type == TARGET_TYPE_QCN9160)
return status;
@@ -330,7 +327,7 @@ dp_rxdma_ring_sel_cfg_li(struct dp_soc *soc)
rx_mac_srng = dp_get_rxdma_ring(pdev, lmac_id);
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}
@@ -347,9 +344,6 @@ dp_rxdma_ring_sel_cfg_li(struct dp_soc *soc)
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint32_t target_type = hal_get_target_type(soc->hal_soc);
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
if (target_type == TARGET_TYPE_QCN9160)
return status;
@@ -418,7 +412,7 @@ dp_rxdma_ring_sel_cfg_li(struct dp_soc *soc)
rx_mac_srng = dp_get_rxdma_ring(pdev, lmac_id);
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}

11
dp/wifi3.0/li/dp_li_rx.c
View File

@@ -245,7 +245,6 @@ uint32_t dp_rx_process_li(struct dp_intr *int_ctx,
uint32_t dsf;
uint32_t max_ast;
uint64_t current_time = 0;
uint16_t buf_size;
DP_HIST_INIT();
@@ -253,8 +252,6 @@ uint32_t dp_rx_process_li(struct dp_intr *int_ctx,
hal_soc = soc->hal_soc;
qdf_assert_always(hal_soc);
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
scn = soc->hif_handle;
intr_id = int_ctx->dp_intr_id;
num_entries = hal_srng_get_num_entries(hal_soc, hal_ring_hdl);
@@ -410,7 +407,7 @@ more_data:
* reap this MPDU
*/
if ((msdu_desc_info.msdu_len /
(buf_size -
(RX_DATA_BUFFER_SIZE -
soc->rx_pkt_tlv_size) + 1) >
num_pending) {
DP_STATS_INC(soc,
@@ -1348,9 +1345,6 @@ dp_rx_null_q_desc_handle_li(struct dp_soc *soc, qdf_nbuf_t nbuf,
uint16_t sa_idx = 0;
bool is_eapol = 0;
bool enh_flag;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
qdf_nbuf_set_rx_chfrag_start(
nbuf,
@@ -1378,7 +1372,8 @@ dp_rx_null_q_desc_handle_li(struct dp_soc *soc, qdf_nbuf_t nbuf,
goto drop_nbuf;
/* Set length in nbuf */
qdf_nbuf_set_pktlen(nbuf, qdf_min(pkt_len, (uint32_t)buf_size));
qdf_nbuf_set_pktlen(
nbuf, qdf_min(pkt_len, (uint32_t)RX_DATA_BUFFER_SIZE));
}
/*

10
dp/wifi3.0/rh/dp_rh.c
View File

@@ -718,9 +718,6 @@ dp_rxdma_ring_sel_cfg_rh(struct dp_soc *soc)
struct htt_rx_ring_tlv_filter htt_tlv_filter = {0};
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
htt_tlv_filter.mpdu_start = 1;
htt_tlv_filter.msdu_start = 1;
@@ -786,7 +783,7 @@ dp_rxdma_ring_sel_cfg_rh(struct dp_soc *soc)
rx_mac_srng = dp_get_rxdma_ring(pdev, lmac_id);
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}
@@ -806,9 +803,6 @@ dp_rxdma_ring_sel_cfg_rh(struct dp_soc *soc)
struct htt_rx_ring_tlv_filter htt_tlv_filter = {0};
struct dp_srng *rx_mac_srng;
QDF_STATUS status = QDF_STATUS_SUCCESS;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
htt_tlv_filter.mpdu_start = 1;
htt_tlv_filter.msdu_start = 1;
@@ -874,7 +868,7 @@ dp_rxdma_ring_sel_cfg_rh(struct dp_soc *soc)
rx_mac_srng = dp_get_rxdma_ring(pdev, lmac_id);
htt_h2t_rx_ring_cfg(soc->htt_handle, mac_for_pdev,
rx_mac_srng->hal_srng,
RXDMA_BUF, buf_size,
RXDMA_BUF, RX_DATA_BUFFER_SIZE,
&htt_tlv_filter);
}
}

9
dp/wifi3.0/rh/dp_rh_rx.c
View File

@@ -380,9 +380,6 @@ dp_rx_decrypt_unecrypt_err_handler_rh(struct dp_soc *soc, qdf_nbuf_t nbuf,
bool is_broadcast;
uint8_t *rx_tlv_hdr;
uint16_t peer_id;
uint16_t buf_size;
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
rx_tlv_hdr = qdf_nbuf_data(nbuf);
@@ -422,7 +419,7 @@ dp_rx_decrypt_unecrypt_err_handler_rh(struct dp_soc *soc, qdf_nbuf_t nbuf,
msdu_len = hal_rx_msdu_start_msdu_len_get(soc->hal_soc, rx_tlv_hdr);
pkt_len = msdu_len + l2_hdr_offset + soc->rx_pkt_tlv_size;
if (qdf_unlikely(pkt_len > buf_size)) {
if (qdf_unlikely(pkt_len > RX_DATA_BUFFER_SIZE)) {
DP_STATS_INC_PKT(soc, rx.err.rx_invalid_pkt_len,
1, pkt_len);
goto free_nbuf;
@@ -751,7 +748,6 @@ dp_rx_data_indication_handler(struct dp_soc *soc, qdf_nbuf_t data_ind,
uint32_t error;
uint32_t error_code;
QDF_STATUS status;
uint16_t buf_size;
DP_HIST_INIT();
@@ -761,7 +757,6 @@ dp_rx_data_indication_handler(struct dp_soc *soc, qdf_nbuf_t data_ind,
scn = soc->hif_handle;
dp_runtime_pm_mark_last_busy(soc);
buf_size = wlan_cfg_rx_buffer_size(soc->wlan_cfg_ctx);
/* reset local variables here to be re-used in the function */
nbuf_head = NULL;
@@ -839,7 +834,7 @@ dp_rx_data_indication_handler(struct dp_soc *soc, qdf_nbuf_t data_ind,
* reap this MPDU
*/
if ((msdu_len /
(buf_size -
(RX_DATA_BUFFER_SIZE -
soc->rx_pkt_tlv_size) + 1) >
num_pending) {
DP_STATS_INC(soc,

13
wlan_cfg/cfg_dp.h
View File

@@ -100,8 +100,6 @@
#define WLAN_CFG_TIME_CONTROL_BP 3000
#define WLAN_CFG_RX_BUFFER_SIZE 2048
#define WLAN_CFG_QREF_CONTROL_SIZE 0
#if defined(WLAN_MAX_PDEVS) && (WLAN_MAX_PDEVS == 1)
@@ -185,9 +183,6 @@
#define WLAN_CFG_TIME_CONTROL_BP_MIN 3000
#define WLAN_CFG_TIME_CONTROL_BP_MAX 1800000
#define WLAN_CFG_RX_BUFFER_SIZE_MIN 2048
#define WLAN_CFG_RX_BUFFER_SIZE_MAX 4096
#define WLAN_CFG_QREF_CONTROL_SIZE_MIN 0
#define WLAN_CFG_QREF_CONTROL_SIZE_MAX 4000
@@ -851,13 +846,6 @@
WLAN_CFG_TIME_CONTROL_BP,\
CFG_VALUE_OR_DEFAULT, "DP time control back pressure")
#define CFG_DP_RX_BUFFER_SIZE \
CFG_INI_UINT("dp_rx_buffer_size", \
WLAN_CFG_RX_BUFFER_SIZE_MIN,\
WLAN_CFG_RX_BUFFER_SIZE_MAX,\
WLAN_CFG_RX_BUFFER_SIZE,\
CFG_VALUE_OR_DEFAULT, "DP rx buffer size")
#define CFG_DP_QREF_CONTROL_SIZE \
CFG_INI_UINT("dp_qref_control_size", \
WLAN_CFG_QREF_CONTROL_SIZE_MIN,\
@@ -2079,7 +2067,6 @@
CFG(CFG_DP_NSS_COMP_RING_SIZE) \
CFG(CFG_DP_PDEV_LMAC_RING) \
CFG(CFG_DP_TIME_CONTROL_BP) \
CFG(CFG_DP_RX_BUFFER_SIZE) \
CFG(CFG_DP_QREF_CONTROL_SIZE) \
CFG(CFG_DP_BASE_HW_MAC_ID) \
CFG(CFG_DP_RX_HASH) \

9
wlan_cfg/wlan_cfg.c
View File

@@ -4189,7 +4189,6 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc)
wlan_soc_tx_packet_inspect_attach(psoc, wlan_cfg_ctx);
wlan_soc_local_pkt_capture_cfg_attach(psoc, wlan_cfg_ctx);
wlan_soc_umac_reset_cfg_attach(psoc, wlan_cfg_ctx);
wlan_cfg_ctx->rx_buffer_size = cfg_get(psoc, CFG_DP_RX_BUFFER_SIZE);
return wlan_cfg_ctx;
}
@@ -4231,7 +4230,6 @@ wlan_cfg_soc_attach(struct cdp_ctrl_objmgr_psoc *psoc)
wlan_cfg_ctx->tx_ring_size = cfg_get(psoc, CFG_DP_TX_RING_SIZE);
wlan_cfg_ctx->time_control_bp = cfg_get(psoc, CFG_DP_TIME_CONTROL_BP);
wlan_cfg_ctx->rx_buffer_size = cfg_get(psoc, CFG_DP_RX_BUFFER_SIZE);
wlan_cfg_ctx->qref_control_size =
cfg_get(psoc, CFG_DP_QREF_CONTROL_SIZE);
wlan_cfg_ctx->tx_comp_ring_size = cfg_get(psoc,
@@ -4852,13 +4850,6 @@ int wlan_cfg_time_control_bp(struct wlan_cfg_dp_soc_ctxt *cfg)
return cfg->time_control_bp;
}
int wlan_cfg_rx_buffer_size(struct wlan_cfg_dp_soc_ctxt *cfg)
{
return cfg->rx_buffer_size;
}
qdf_export_symbol(wlan_cfg_rx_buffer_size);
int wlan_cfg_qref_control_size(struct wlan_cfg_dp_soc_ctxt *cfg)
{
return cfg->qref_control_size;

10
wlan_cfg/wlan_cfg.h
View File

@@ -177,7 +177,6 @@ struct wlan_srng_cfg {
* @int_timer_threshold_mon_dest: Timer threshold counter for monitor dest
* @tx_ring_size:
* @time_control_bp:
* @rx_buffer_size: skb size
* @qref_control_size: list size for memory history arrays
* @tx_comp_ring_size:
* @tx_comp_ring_size_nss:
@@ -387,7 +386,6 @@ struct wlan_cfg_dp_soc_ctxt {
int int_timer_threshold_mon_dest;
int tx_ring_size;
int time_control_bp;
int rx_buffer_size;
int qref_control_size;
int tx_comp_ring_size;
int tx_comp_ring_size_nss;
@@ -1619,14 +1617,6 @@ void wlan_cfg_set_tx_ring_size(struct wlan_cfg_dp_soc_ctxt *cfg,
*/
int wlan_cfg_time_control_bp(struct wlan_cfg_dp_soc_ctxt *cfg);
/**
* wlan_cfg_rx_buffer_size - Get buffer size for skb
* @cfg: soc configuration context
*
* Return: buffer size
*/
int wlan_cfg_rx_buffer_size(struct wlan_cfg_dp_soc_ctxt *cfg);
/**
* wlan_cfg_qref_control_size - Get debug array size
* @cfg: soc configuration context