Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <54733de9-db66-f1c4-9ad5-4d1f31529c05@quicinc.com>
Date:   Wed, 2 Aug 2023 07:59:48 -0700
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 1/2] wifi: ath12k: fix WARN_ON during
 ath12k_mac_update_vif_chan
Content-Language: en-US
To:     Manish Dharanenthiran <quic_mdharane@quicinc.com>,
        <ath12k@lists.infradead.org>
CC:     <linux-wireless@vger.kernel.org>
References: <20230802085852.19821-1-quic_mdharane@quicinc.com>
 <20230802085852.19821-2-quic_mdharane@quicinc.com>
From:   Jeff Johnson <quic_jjohnson@quicinc.com>
In-Reply-To: <20230802085852.19821-2-quic_mdharane@quicinc.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 8/2/2023 1:58 AM, Manish Dharanenthiran wrote:
> Fix WARN_ON() from ath12k_mac_update_vif_chan() if vdev is not up.
> Since change_chanctx can be called even before vdev_up.
> 
> Do vdev stop followed by a vdev start in case of vdev is down.
> 
> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0-02903-QCAHKSWPL_SILICONZ-1

Has this been tested on WCN7850? My understanding is that firmware may 
expect vdev down and then vdev restart

> 
> Signed-off-by: Manish Dharanenthiran <quic_mdharane@quicinc.com>
> ---
>   drivers/net/wireless/ath/ath12k/mac.c | 27 +++++++++++++++++++++------
>   1 file changed, 21 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
> index 1bb9802ef569..0ab95e138d1d 100644
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@ -5698,13 +5698,28 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
>   		if (WARN_ON(!arvif->is_started))
>   			continue;
>   
> -		if (WARN_ON(!arvif->is_up))
> -			continue;
> +		/* Firmware expect vdev_restart only if vdev is up.
> +		 * If vdev is down then it expect vdev_stop->vdev_start.
> +		 */
> +		if (arvif->is_up) {
> +			ret = ath12k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def);
> +			if (ret) {
> +				ath12k_warn(ab, "failed to restart vdev %d: %d\n",
> +					    arvif->vdev_id, ret);
> +				continue;
> +			}
> +		} else {
> +			ret = ath12k_mac_vdev_stop(arvif);
> +			if (ret) {
> +				ath12k_warn(ab, "failed to stop vdev %d: %d\n",
> +					    arvif->vdev_id, ret);
> +				continue;
> +			}
>   
> -		ret = ath12k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def);
> -		if (ret) {
> -			ath12k_warn(ab, "failed to restart vdev %d: %d\n",
> -				    arvif->vdev_id, ret);
> +			ret = ath12k_mac_vdev_start(arvif, &vifs[i].new_ctx->def);
> +			if (ret)
> +				ath12k_warn(ab, "failed to start vdev %d: %d\n",
> +					    arvif->vdev_id, ret);
>   			continue;
>   		}
>