Received-SPF: pass (google.com: domain of linux-wireless+bounces-2822-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <119d60053afa6f5eb9af6597d895f1da1065d7c5.camel@sipsolutions.net>
Subject: Re: [PATCH 15/15] wifi: cfg80211/mac80211: move puncturing into
 chandef
From: Johannes Berg <johannes@sipsolutions.net>
To: linux-wireless@vger.kernel.org
Cc: Jeff Johnson <quic_jjohnson@quicinc.com>
Date: Tue, 30 Jan 2024 15:22:37 +0100
In-Reply-To: <20240129194108.307183a5d2e5.I4d7fe2f126b2366c1312010e2900dfb2abffa0f6@changeid>
References: <20240129184108.49639-17-johannes@sipsolutions.net>
	 <20240129194108.307183a5d2e5.I4d7fe2f126b2366c1312010e2900dfb2abffa0f6@changeid>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.50.3 (3.50.3-1.fc39) 
Precedence: bulk
MIME-Version: 1.0

>=20
> 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 ie=
ee80211_hw *hw,
 	}
=20
 	ath12k_mac_fils_discovery(arvif, info);
-
-	if (changed & BSS_CHANGED_EHT_PUNCTURING)
-		arvif->punct_bitmap =3D info->eht_puncturing;
-
 	mutex_unlock(&ar->conf_mutex);
 }
=20
@@ -6215,6 +6211,8 @@ ath12k_mac_update_vif_chan(struct ath12k *ar,
 		if (WARN_ON(!arvif->is_started))
 			continue;
=20
+		arvif->punct_bitmap =3D 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 ieee8=
0211_hw *hw,
 		goto unlock;
=20
 	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);
=20
 	/* 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);
=20
-	arvif->punct_bitmap =3D link_conf->eht_puncturing;
+	arvif->punct_bitmap =3D ctx->def.punctured;
=20
 	/* for some targets bss peer must be created before vdev_start */
 	if (ab->hw_params->vdev_start_delay &&


Any thoughts?

johannes