Commit 00575bb4 authored by Baochen Qiang's avatar Baochen Qiang Committed by Jeff Johnson
Browse files

wifi: ath12k: fix reusing m3 memory 



During firmware recovery or suspend/resume, m3 memory could be reused if
the size of the new m3 binary is equal to or less than that of the
existing memory. There will be issues for the latter case, since
m3_mem->size will be updated with a smaller value and this value is
eventually used in the free path, where the original total size should be
used instead.

To fix it, add a new member in m3_mem_region structure to track the original
memory size and use it in free path.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c5-00302-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.115823.3

Fixes: 05090ae8 ("wifi: ath12k: check M3 buffer size as well whey trying to reuse it")
Signed-off-by: default avatarBaochen Qiang <baochen.qiang@oss.qualcomm.com>
Reviewed-by: default avatarVasanthakumar Thiagarajan <vasanthakumar.thiagarajan@oss.qualcomm.com>
Link: https://patch.msgid.link/20251029-ath12k-fix-m3-reuse-v1-1-69225bacfc5d@oss.qualcomm.com


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

drivers/net/wireless/ath/ath12k/qmi.c

+7 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: BSD-3-Clause-Clear

/*

 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.

 */



#include <linux/elf.h>
@@ -3114,9 +3114,10 @@ static void ath12k_qmi_m3_free(struct ath12k_base *ab) 
	if (!m3_mem->vaddr)

		return;



	dma_free_coherent(ab->dev, m3_mem->size,

	dma_free_coherent(ab->dev, m3_mem->total_size,

			  m3_mem->vaddr, m3_mem->paddr);

	m3_mem->vaddr = NULL;

	m3_mem->total_size = 0;

	m3_mem->size = 0;

}
@@ -3152,7 +3153,7 @@ static int ath12k_qmi_m3_load(struct ath12k_base *ab) 


	/* In recovery/resume cases, M3 buffer is not freed, try to reuse that */

	if (m3_mem->vaddr) {

		if (m3_mem->size >= m3_len)

		if (m3_mem->total_size >= m3_len)

			goto skip_m3_alloc;



		/* Old buffer is too small, free and reallocate */
@@ -3164,11 +3165,13 @@ static int ath12k_qmi_m3_load(struct ath12k_base *ab) 
					   GFP_KERNEL);

	if (!m3_mem->vaddr) {

		ath12k_err(ab, "failed to allocate memory for M3 with size %zu\n",

			   fw->size);

			   m3_len);

		ret = -ENOMEM;

		goto out;

	}



	m3_mem->total_size = m3_len;



skip_m3_alloc:

	memcpy(m3_mem->vaddr, m3_data, m3_len);

	m3_mem->size = m3_len;

drivers/net/wireless/ath/ath12k/qmi.h

+4 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: BSD-3-Clause-Clear */

/*

 * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.

 */



#ifndef ATH12K_QMI_H
@@ -120,6 +120,9 @@ struct target_info { 
};



struct m3_mem_region {

	/* total memory allocated */

	u32 total_size;

	/* actual memory being used */

	u32 size;

	dma_addr_t paddr;

	void *vaddr;