wifi: ath12k: Change the Tx monitor SRNG ring ID

The Tx monitor SRNG ring ID does not align with the ath12k 802.11be
hardware architecture. Currently, there is no issue since the Tx monitor
is not enabled. However, in the future, the Tx monitor will be enabled.
Therefore, change the HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0 SRNG ID and
assign the correct start ring ID for the ring type HAL_TX_MONITOR_BUF.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Acked-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241217084511.2981515-8-quic_periyasa@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/hal.c b/drivers/net/wireless/ath/ath12k/hal.c
index fd98fac16dd5faec1af1e17cfc780e377d4a07a8..cd59ff8e6c7b0c0b6fcf26ce776f4cbd4613ec51 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal.c
+++ b/drivers/net/wireless/ath/ath12k/hal.c
@@ -181,7 +181,7 @@ static const struct hal_srng_config hw_srng_config_template[] = {
                .max_size = HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE,
        },
        [HAL_TX_MONITOR_BUF] = {
-               .start_ring_id = HAL_SRNG_SW2TXMON_BUF0,
+               .start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0,
                .max_rings = 1,
                .entry_size = sizeof(struct hal_mon_buf_ring) >> 2,
                .mac_type = ATH12K_HAL_SRNG_PMAC,

diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 8a78bb9a10bc15a3c715c2c2b03ed18e21b5816e..94e2e8735958312c410d8176af4114899cad1549 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -485,8 +485,8 @@ enum hal_srng_ring_id {
        HAL_SRNG_RING_ID_WMAC1_RXMON2SW0 = HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1,
        HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_DESC,
        HAL_SRNG_RING_ID_RXDMA_DIR_BUF,
-       HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0,
        HAL_SRNG_RING_ID_WMAC1_TXMON2SW0_BUF0,
+       HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0,
 
        HAL_SRNG_RING_ID_PMAC1_ID_END,
 };