Commit aa695615 authored by Johan Hovold's avatar Johan Hovold Committed by Jeff Johnson
Browse files

wifi: ath11k: fix dest ring-buffer corruption when ring is full 



Add the missing memory barriers to make sure that destination ring
descriptors are read before updating the tail pointer (and passing
ownership to the device) to avoid memory corruption on weakly ordered
architectures like aarch64 when the ring is full.

Tested-on: WCN6855 hw2.1 WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.41

Fixes: d5c65159 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Cc: stable@vger.kernel.org      # 5.6
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarBaochen Qiang <quic_bqiang@quicinc.com>
Link: https://patch.msgid.link/20250604143457.26032-6-johan+linaro@kernel.org


Signed-off-by: default avatarJeff Johnson <jeff.johnson@oss.qualcomm.com>
parent 6efa0df5

drivers/net/wireless/ath/ath11k/hal.c

+9 −2
Original line number Diff line number Diff line
@@ -856,7 +856,6 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng) 
{

	lockdep_assert_held(&srng->lock);



	/* TODO: See if we need a write memory barrier here */

	if (srng->flags & HAL_SRNG_FLAGS_LMAC_RING) {

		/* For LMAC rings, ring pointer updates are done through FW and

		 * hence written to a shared memory location that is read by FW
@@ -871,7 +870,11 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng) 
			WRITE_ONCE(*srng->u.src_ring.hp_addr, srng->u.src_ring.hp);

		} else {

			srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr;

			*srng->u.dst_ring.tp_addr = srng->u.dst_ring.tp;

			/* Make sure descriptor is read before updating the

			 * tail pointer.

			 */

			dma_mb();

			WRITE_ONCE(*srng->u.dst_ring.tp_addr, srng->u.dst_ring.tp);

		}

	} else {

		if (srng->ring_dir == HAL_SRNG_DIR_SRC) {
@@ -887,6 +890,10 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng) 
					   srng->u.src_ring.hp);

		} else {

			srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr;

			/* Make sure descriptor is read before updating the

			 * tail pointer.

			 */

			mb();

			ath11k_hif_write32(ab,

					   (unsigned long)srng->u.dst_ring.tp_addr -

					   (unsigned long)ab->mem,