Received-SPF: pass (google.com: domain of linux-wireless+bounces-2966-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <1818e068-4075-4510-8985-f05e124d1246@quicinc.com>
Date: Thu, 1 Feb 2024 07:50:05 -0800
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 15/15] wifi: cfg80211/mac80211: move puncturing into
 chandef
Content-Language: en-US
To: Johannes Berg <johannes@sipsolutions.net>,
        <linux-wireless@vger.kernel.org>
References: <20240129184108.49639-17-johannes@sipsolutions.net>
 <20240129194108.307183a5d2e5.I4d7fe2f126b2366c1312010e2900dfb2abffa0f6@changeid>
 <119d60053afa6f5eb9af6597d895f1da1065d7c5.camel@sipsolutions.net>
From: Jeff Johnson <quic_jjohnson@quicinc.com>
In-Reply-To: <119d60053afa6f5eb9af6597d895f1da1065d7c5.camel@sipsolutions.net>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

On 1/30/2024 6:22 AM, Johannes Berg wrote:
>>
>> Move puncturing into the chandef, and adjust all the code
>> accordingly.
> 
> So I clearly forgot ath12k in "all the code" ;-)
> 
> Looking at the code, this seems to be an appropriate update for ath12k:
> 
> --- a/drivers/net/wireless/ath/ath12k/mac.c
> +++ b/drivers/net/wireless/ath/ath12k/mac.c
> @@ -2767,10 +2767,6 @@ static void ath12k_mac_op_bss_info_changed(struct ieee80211_hw *hw,
>  	}
>  
>  	ath12k_mac_fils_discovery(arvif, info);
> -
> -	if (changed & BSS_CHANGED_EHT_PUNCTURING)
> -		arvif->punct_bitmap = info->eht_puncturing;
> -
>  	mutex_unlock(&ar->conf_mutex);
>  }
>  
> @@ -6215,6 +6211,8 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
>  		if (WARN_ON(!arvif->is_started))
>  			continue;
>  
> +		arvif->punct_bitmap = vifs[i].new_ctx->def.punctured;
> +
>  		/* Firmware expect vdev_restart only if vdev is up.
>  		 * If vdev is down then it expect vdev_stop->vdev_start.
>  		 */
> @@ -6311,7 +6309,8 @@ static void ath12k_mac_op_change_chanctx(struct ieee80211_hw *hw,
>  		goto unlock;
>  
>  	if (changed & IEEE80211_CHANCTX_CHANGE_WIDTH ||
> -	    changed & IEEE80211_CHANCTX_CHANGE_RADAR)
> +	    changed & IEEE80211_CHANCTX_CHANGE_RADAR ||
> +	    changed & IEEE80211_CHANCTX_CHANGE_PUNCTURING)
>  		ath12k_mac_update_active_vif_chan(ar, ctx);
>  
>  	/* TODO: Recalc radar detection */
> @@ -6371,7 +6370,7 @@ ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
>  		   "mac chanctx assign ptr %pK vdev_id %i\n",
>  		   ctx, arvif->vdev_id);
>  
> -	arvif->punct_bitmap = link_conf->eht_puncturing;
> +	arvif->punct_bitmap = ctx->def.punctured;
>  
>  	/* for some targets bss peer must be created before vdev_start */
>  	if (ab->hw_params->vdev_start_delay &&
> 
> 
> Any thoughts?
Looks good