wifi: ath11k: HAL SRNG: don't deinitialize and re-initialize again

[ Upstream commit 32be3ca4cf78b309dfe7ba52fe2d7cc3c23c5634 ]

Don't deinitialize and reinitialize the HAL helpers. The dma memory is
deallocated and there is high possibility that we'll not be able to get
the same memory allocated from dma when there is high memory pressure.

Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_CE-2.52297.6

Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Cc: stable@vger.kernel.org
Cc: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Link: https://patch.msgid.link/20250722053121.1145001-1-usama.anjum@collabora.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index 6282ccad79d5ea85ef1de2c40182e7279f4c9e49..67c78ad2243b957bc1af13cc4f56199b63a13a2f 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -710,14 +710,10 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab)
        mutex_unlock(&ab->core_lock);
 
        ath11k_dp_free(ab);
-       ath11k_hal_srng_deinit(ab);
+       ath11k_hal_srng_clear(ab);
 
        ab->free_vdev_map = (1LL << (ab->num_radios * TARGET_NUM_VDEVS)) - 1;
 
-       ret = ath11k_hal_srng_init(ab);
-       if (ret)
-               return ret;
-
        clear_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags);
 
        ret = ath11k_core_qmi_firmware_ready(ab);

diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c
index d5921805af636c301d6f44b3b21ccb7e7978254a..029827e14a15a84d668a520e09eafaf6f26ec2a2 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hal.c
+++ b/drivers/net/wireless/ath/ath11k/hal.c
@@ -1317,6 +1317,22 @@ void ath11k_hal_srng_deinit(struct ath11k_base *ab)
 }
 EXPORT_SYMBOL(ath11k_hal_srng_deinit);
 
+void ath11k_hal_srng_clear(struct ath11k_base *ab)
+{
+       /* No need to memset rdp and wrp memory since each individual
+        * segment would get cleared in ath11k_hal_srng_src_hw_init()
+        * and ath11k_hal_srng_dst_hw_init().
+        */
+       memset(ab->hal.srng_list, 0,
+              sizeof(ab->hal.srng_list));
+       memset(ab->hal.shadow_reg_addr, 0,
+              sizeof(ab->hal.shadow_reg_addr));
+       ab->hal.avail_blk_resource = 0;
+       ab->hal.current_blk_index = 0;
+       ab->hal.num_shadow_reg_configured = 0;
+}
+EXPORT_SYMBOL(ath11k_hal_srng_clear);
+
 void ath11k_hal_dump_srng_stats(struct ath11k_base *ab)
 {
        struct hal_srng *srng;

diff --git a/drivers/net/wireless/ath/ath11k/hal.h b/drivers/net/wireless/ath/ath11k/hal.h
index 5fbfded8d546c4193daa9d8dbb7a10963a1f2d9d..00ab4f46e429a060d77d28a519acccb1b00244de 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hal.h
+++ b/drivers/net/wireless/ath/ath11k/hal.h
@@ -940,6 +940,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type,
                          struct hal_srng_params *params);
 int ath11k_hal_srng_init(struct ath11k_base *ath11k);
 void ath11k_hal_srng_deinit(struct ath11k_base *ath11k);
+void ath11k_hal_srng_clear(struct ath11k_base *ab);
 void ath11k_hal_dump_srng_stats(struct ath11k_base *ab);
 void ath11k_hal_srng_get_shadow_config(struct ath11k_base *ab,
                                       u32 **cfg, u32 *len);