| Message ID | 20241030114625.2416942-1-quic_bpothuno@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: ath11k: Fix unexpected return buffer manager error for WCN6750/WCN6855 | expand |
On 10/30/2024 4:46 AM, Balaji Pothunoori wrote: > The following error messages were encountered while parsing fragmented RX > packets for WCN6750/WCN6855: > > ath11k 17a10040.wifi: invalid return buffer manager 4 > > This issue arose due to a hardcoded check for HAL_RX_BUF_RBM_SW3_BM > introduced in 'commit 71c748b5e01e ("ath11k: Fix unexpected return buffer > manager error for QCA6390")' > > For WCN6750 and WCN6855, the return buffer manager ID should be > HAL_RX_BUF_RBM_SW1_BM. The incorrect conditional check caused fragmented > packets to be dropped, resulting in the above error log. > > Fix this by adding a check for HAL_RX_BUF_RBM_SW1_BM. > > Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.2.0.c2-00258-QCAMSLSWPL-1 > Tested-on: WCN6855 hw2.1 WLAN.HSP.1.1-04479-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1 > > Fixes: 71c748b5e01e ("ath11k: Fix unexpected return buffer manager error for QCA6390") > Signed-off-by: Balaji Pothunoori <quic_bpothuno@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Balaji Pothunoori <quic_bpothuno@quicinc.com> writes: > The following error messages were encountered while parsing fragmented RX > packets for WCN6750/WCN6855: > > ath11k 17a10040.wifi: invalid return buffer manager 4 > > This issue arose due to a hardcoded check for HAL_RX_BUF_RBM_SW3_BM > introduced in 'commit 71c748b5e01e ("ath11k: Fix unexpected return buffer > manager error for QCA6390")' > > For WCN6750 and WCN6855, the return buffer manager ID should be > HAL_RX_BUF_RBM_SW1_BM. The incorrect conditional check caused fragmented > packets to be dropped, resulting in the above error log. > > Fix this by adding a check for HAL_RX_BUF_RBM_SW1_BM. > > Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.2.0.c2-00258-QCAMSLSWPL-1 > Tested-on: WCN6855 hw2.1 WLAN.HSP.1.1-04479-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1 > > Fixes: 71c748b5e01e ("ath11k: Fix unexpected return buffer manager error for QCA6390") > Signed-off-by: Balaji Pothunoori <quic_bpothuno@quicinc.com> Acked-by: Kalle Valo <kvalo@kernel.org>
On Wed, 30 Oct 2024 17:16:25 +0530, Balaji Pothunoori wrote: > The following error messages were encountered while parsing fragmented RX > packets for WCN6750/WCN6855: > > ath11k 17a10040.wifi: invalid return buffer manager 4 > > This issue arose due to a hardcoded check for HAL_RX_BUF_RBM_SW3_BM > introduced in 'commit 71c748b5e01e ("ath11k: Fix unexpected return buffer > manager error for QCA6390")' > > [...] Applied, thanks! [1/1] wifi: ath11k: Fix unexpected return buffer manager error for WCN6750/WCN6855 commit: 78e154d42f2c72905fe66a400847e1b2b101b7b2 Best regards,
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 40088e62572e..40b52d12b432 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -3872,6 +3872,7 @@ int ath11k_dp_process_rx_err(struct ath11k_base *ab, struct napi_struct *napi, ath11k_hal_rx_msdu_link_info_get(link_desc_va, &num_msdus, msdu_cookies, &rbm); if (rbm != HAL_RX_BUF_RBM_WBM_IDLE_DESC_LIST && + rbm != HAL_RX_BUF_RBM_SW1_BM && rbm != HAL_RX_BUF_RBM_SW3_BM) { ab->soc_stats.invalid_rbm++; ath11k_warn(ab, "invalid return buffer manager %d\n", rbm); diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c index 8f7dd43dc1bd..753bd93f0212 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -372,7 +372,8 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc, ret_buf_mgr = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, wbm_desc->buf_addr_info.info1); - if (ret_buf_mgr != HAL_RX_BUF_RBM_SW3_BM) { + if (ret_buf_mgr != HAL_RX_BUF_RBM_SW1_BM && + ret_buf_mgr != HAL_RX_BUF_RBM_SW3_BM) { ab->soc_stats.invalid_rbm++; return -EINVAL; }
The following error messages were encountered while parsing fragmented RX packets for WCN6750/WCN6855: ath11k 17a10040.wifi: invalid return buffer manager 4 This issue arose due to a hardcoded check for HAL_RX_BUF_RBM_SW3_BM introduced in 'commit 71c748b5e01e ("ath11k: Fix unexpected return buffer manager error for QCA6390")' For WCN6750 and WCN6855, the return buffer manager ID should be HAL_RX_BUF_RBM_SW1_BM. The incorrect conditional check caused fragmented packets to be dropped, resulting in the above error log. Fix this by adding a check for HAL_RX_BUF_RBM_SW1_BM. Tested-on: WCN6750 hw1.0 AHB WLAN.MSL.2.0.c2-00258-QCAMSLSWPL-1 Tested-on: WCN6855 hw2.1 WLAN.HSP.1.1-04479-QCAHSPSWPL_V1_V2_SILICONZ_IOE-1 Fixes: 71c748b5e01e ("ath11k: Fix unexpected return buffer manager error for QCA6390") Signed-off-by: Balaji Pothunoori <quic_bpothuno@quicinc.com> --- drivers/net/wireless/ath/ath11k/dp_rx.c | 1 + drivers/net/wireless/ath/ath11k/hal_rx.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)