lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0351/1039] ath11k: Fix unexpected return buffer manager error for QCA6390
    Date
    From: Baochen Qiang <quic_bqiang@quicinc.com>

    [ Upstream commit 71c748b5e01e3e28838a8e26a8966fb5adb03df7 ]

    We are seeing below error on QCA6390:
    ...
    [70211.671189] ath11k_pci 0000:72:00.0: failed to parse rx error in wbm_rel ring desc -22
    [70212.696154] ath11k_pci 0000:72:00.0: failed to parse rx error in wbm_rel ring desc -22
    [70213.092941] ath11k_pci 0000:72:00.0: failed to parse rx error in wbm_rel ring desc -22
    ...

    The reason is that, with commit 734223d78428 ("ath11k: change return
    buffer manager for QCA6390"), ath11k expects the return buffer manager
    (RBM) field of descriptor configured as HAL_RX_BUF_RBM_SW1_BM when
    parsing error frames from WBM2SW3_RELEASE ring. This is a wrong change
    cause the RBM field is set as HAL_RX_BUF_RBM_SW3_BM.

    The same issue also applies to REO2TCL ring though we have not got any
    error reported.

    Fix it by changing RBM from HAL_RX_BUF_RBM_SW1_BM to HAL_RX_BUF_RBM_SW3_BM
    for these two rings.

    Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

    Fixes: 734223d78428 ("ath11k: change return buffer manager for QCA6390")
    Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
    Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
    Link: https://lore.kernel.org/r/20211222013536.582527-1-quic_bqiang@quicinc.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/wireless/ath/ath11k/dp_rx.c | 2 +-
    drivers/net/wireless/ath/ath11k/hal_rx.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
    index c5320847b80a7..22b6b6a470d4c 100644
    --- a/drivers/net/wireless/ath/ath11k/dp_rx.c
    +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
    @@ -3800,7 +3800,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 != ab->hw_params.hal_params->rx_buf_rbm) {
    + rbm != HAL_RX_BUF_RBM_SW3_BM) {
    ab->soc_stats.invalid_rbm++;
    ath11k_warn(ab, "invalid return buffer manager %d\n", rbm);
    ath11k_dp_rx_link_desc_return(ab, desc,
    diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c
    index 329c404cfa80d..922926246db7a 100644
    --- a/drivers/net/wireless/ath/ath11k/hal_rx.c
    +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c
    @@ -374,7 +374,7 @@ 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 != ab->hw_params.hal_params->rx_buf_rbm) {
    + if (ret_buf_mgr != HAL_RX_BUF_RBM_SW3_BM) {
    ab->soc_stats.invalid_rbm++;
    return -EINVAL;
    }
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-09-17 16:13    [W:4.903 / U:0.676 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site