[PATCH 3/3] wifi: wcn36xx: Stop waiting on a dead firmware during remove

Loic Poulain loic.poulain at oss.qualcomm.com
Wed Nov 18 12:29:08 PST 2026


On Wed, Nov 18, 2026 at 3:58 PM Alexandre Rapaille via B4 Relay
<devnull+arapaille.atlr-engineering.com at kernel.org> wrote:
>
> From: Alexandre Rapaille <arapaille at atlr-engineering.com>
>
> After a WCNSS crash, remove sends ~16 HAL commands nobody can answer,
> each waiting HAL_MSG_TIMEOUT: recovery took 160 s on msm8974. Once one
> times out during remove, fail the rest at once; recovery now takes ~20 s.
>
> Signed-off-by: Alexandre Rapaille <arapaille at atlr-engineering.com>
> ---
>  drivers/net/wireless/ath/wcn36xx/main.c    | 1 +
>  drivers/net/wireless/ath/wcn36xx/smd.c     | 8 ++++++++
>  drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 4 ++++
>  3 files changed, 13 insertions(+)
>
> diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c
> index ad8a4bd910..77a1029108 100644
> --- a/drivers/net/wireless/ath/wcn36xx/main.c
> +++ b/drivers/net/wireless/ath/wcn36xx/main.c
> @@ -1651,6 +1651,7 @@ static void wcn36xx_remove(struct platform_device *pdev)
>
>         release_firmware(wcn->nv);
>
> +       WRITE_ONCE(wcn->removing, true);
>         ieee80211_unregister_hw(hw);
>
>         qcom_smem_state_put(wcn->tx_enable_state);
> diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
> index c0b4773458..d07ea967ac 100644
> --- a/drivers/net/wireless/ath/wcn36xx/smd.c
> +++ b/drivers/net/wireless/ath/wcn36xx/smd.c
> @@ -427,6 +427,12 @@ static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
>                 (struct wcn36xx_hal_msg_header *)wcn->hal_buf;
>         u16 req_type = hdr->msg_type;
>
> +       /* After a WCNSS crash every teardown command would wait the full
> +        * timeout; one is enough to know nobody will answer.
> +        */
> +       if (wcn->fw_dead)

It's not clear from the commit message why you need two variables
here, why not simply testing  wcn->removing.

> +               return -ETIME;
> +
>         wcn36xx_dbg_dump(WCN36XX_DBG_SMD_DUMP, "HAL >>> ", wcn->hal_buf, len);
>
>         init_completion(&wcn->hal_rsp_compl);
> @@ -440,6 +446,8 @@ static int wcn36xx_smd_send_and_wait(struct wcn36xx *wcn, size_t len)
>                 msecs_to_jiffies(HAL_MSG_TIMEOUT)) <= 0) {
>                 wcn36xx_err("Timeout! No SMD response to req %d in %dms\n",
>                             req_type, HAL_MSG_TIMEOUT);
> +               if (READ_ONCE(wcn->removing))
> +                       wcn->fw_dead = true;
>                 ret = -ETIME;
>                 goto out;
>         }
> diff --git a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
> index 8c43f67bd7..9e5f3918ca 100644
> --- a/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
> +++ b/drivers/net/wireless/ath/wcn36xx/wcn36xx.h
> @@ -276,6 +276,10 @@ struct wcn36xx {
>         spinlock_t      dxe_lock;
>         bool                    queues_stopped;
>
> +       /* Set in remove; a HAL timeout then means the firmware is gone. */
> +       bool                    removing;
> +       bool                    fw_dead;
> +
>         /* Memory pools */
>         struct wcn36xx_dxe_mem_pool mgmt_mem_pool;
>         struct wcn36xx_dxe_mem_pool data_mem_pool;
>
> --
> 2.43.0
>
>



More information about the wcn36xx mailing list