Merge tag 'ath-current-20250714' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath

jmberg-intel · jmberg-intel · commit 2aec790e666b · 2025-07-15T10:26:22.000+02:00
Jeff Johnson says:
==================
ath.git update for v6.16-rc7

Fix an ath12k performance regression introduce in v6.16-rc1
==================

Signed-off-by: Johannes Berg &lt;johannes.berg@intel.com&gt;
diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -1060,7 +1060,6 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_
 	}
 
 	rx_tid = &peer->rx_tid[tid];
-	paddr_aligned = rx_tid->qbuf.paddr_aligned;
 	/* Update the tid queue if it is already setup */
 	if (rx_tid->active) {
 		ret = ath12k_peer_rx_tid_reo_update(ar, peer, rx_tid,
@@ -1072,6 +1071,7 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_
 		}
 
 		if (!ab->hw_params->reoq_lut_support) {
+			paddr_aligned = rx_tid->qbuf.paddr_aligned;
 			ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id,
 								     peer_mac,
 								     paddr_aligned, tid,
@@ -1098,6 +1098,7 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_
 		return ret;
 	}
 
+	paddr_aligned = rx_tid->qbuf.paddr_aligned;
 	if (ab->hw_params->reoq_lut_support) {
 		/* Update the REO queue LUT at the corresponding peer id
 		 * and tid with qaddr.

Original file line number	Diff line number	Diff line change
`@@ -1060,7 +1060,6 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k ar, const u8 peer_mac, int vdev_`
`1060`	`1060`	`}`
`1061`	`1061`
`1062`	`1062`	`rx_tid = &peer->rx_tid[tid];`
`1063`		`- paddr_aligned = rx_tid->qbuf.paddr_aligned;`
`1064`	`1063`	`/* Update the tid queue if it is already setup */`
`1065`	`1064`	`if (rx_tid->active) {`
`1066`	`1065`	`ret = ath12k_peer_rx_tid_reo_update(ar, peer, rx_tid,`
`@@ -1072,6 +1071,7 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k ar, const u8 peer_mac, int vdev_`
`1072`	`1071`	`}`
`1073`	`1072`
`1074`	`1073`	`if (!ab->hw_params->reoq_lut_support) {`
	`1074`	`+ paddr_aligned = rx_tid->qbuf.paddr_aligned;`
`1075`	`1075`	`ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id,`
`1076`	`1076`	`peer_mac,`
`1077`	`1077`	`paddr_aligned, tid,`
`@@ -1098,6 +1098,7 @@ int ath12k_dp_rx_peer_tid_setup(struct ath12k ar, const u8 peer_mac, int vdev_`
`1098`	`1098`	`return ret;`
`1099`	`1099`	`}`
`1100`	`1100`
	`1101`	`+ paddr_aligned = rx_tid->qbuf.paddr_aligned;`
`1101`	`1102`	`if (ab->hw_params->reoq_lut_support) {`
`1102`	`1103`	`/* Update the REO queue LUT at the corresponding peer id`
`1103`	`1104`	`* and tid with qaddr.`