From: Madhavan Ganesan <madhavan.ganesan@oss.qualcomm.com>
To: Jeff Johnson <jjohnson@kernel.org>
Cc: linux-wireless@vger.kernel.org, ath12k@lists.infradead.org,
linux-kernel@vger.kernel.org,
Madhavan Ganesan <madhavan.ganesan@oss.qualcomm.com>
Subject: [PATCH ath-next 1/2] wifi: ath12k: rename m3_mem_region to ath12k_fw_mem_region
Date: Tue, 03 Nov 2026 22:56:00 +0530 [thread overview]
Message-ID: <20261103-m3_and_aux_ucode-v1-1-e14f13fdfa41@oss.qualcomm.com> (raw)
In-Reply-To: <20261103-m3_and_aux_ucode-v1-0-e14f13fdfa41@oss.qualcomm.com>
struct m3_mem_region is also used for the aux_uc firmware memory
region, so the name no longer reflects its purpose. Rename it to
ath12k_fw_mem_region to make clear it is a generic firmware memory
region descriptor shared across m3 and aux_uc.
No functional change.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1
Signed-off-by: Madhavan Ganesan <madhavan.ganesan@oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/qmi.c | 12 ++++++------
drivers/net/wireless/ath/ath12k/qmi.h | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index 817bd820623d..b1efed1702cb 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -3227,7 +3227,7 @@ int ath12k_qmi_load_bdf_qmi(struct ath12k_base *ab,
static void ath12k_qmi_m3_free(struct ath12k_base *ab)
{
- struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+ struct ath12k_fw_mem_region *m3_mem = &ab->qmi.m3_mem;
if (ab->hw_params->fw.m3_loader == ath12k_m3_fw_loader_remoteproc)
return;
@@ -3244,7 +3244,7 @@ static void ath12k_qmi_m3_free(struct ath12k_base *ab)
static int ath12k_qmi_m3_load(struct ath12k_base *ab)
{
- struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+ struct ath12k_fw_mem_region *m3_mem = &ab->qmi.m3_mem;
const struct firmware *fw = NULL;
const void *m3_data;
char path[100];
@@ -3309,7 +3309,7 @@ static int ath12k_qmi_m3_load(struct ath12k_base *ab)
static noinline_for_stack
int ath12k_qmi_wlanfw_m3_info_send(struct ath12k_base *ab)
{
- struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+ struct ath12k_fw_mem_region *m3_mem = &ab->qmi.m3_mem;
struct qmi_wlanfw_m3_info_req_msg_v01 req = {};
struct qmi_wlanfw_m3_info_resp_msg_v01 resp = {};
struct qmi_txn txn;
@@ -3359,7 +3359,7 @@ int ath12k_qmi_wlanfw_m3_info_send(struct ath12k_base *ab)
static void ath12k_qmi_aux_uc_free(struct ath12k_base *ab)
{
- struct m3_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
+ struct ath12k_fw_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
if (!aux_uc_mem->vaddr)
return;
@@ -3373,7 +3373,7 @@ static void ath12k_qmi_aux_uc_free(struct ath12k_base *ab)
static int ath12k_qmi_aux_uc_load(struct ath12k_base *ab)
{
- struct m3_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
+ struct ath12k_fw_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
const struct firmware *fw = NULL;
const void *aux_uc_data;
char path[100];
@@ -3435,7 +3435,7 @@ static int ath12k_qmi_aux_uc_load(struct ath12k_base *ab)
static noinline_for_stack
int ath12k_qmi_wlanfw_aux_uc_info_send(struct ath12k_base *ab)
{
- struct m3_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
+ struct ath12k_fw_mem_region *aux_uc_mem = &ab->qmi.aux_uc_mem;
struct qmi_wlanfw_aux_uc_info_req_msg_v01 req = {};
struct qmi_wlanfw_aux_uc_info_resp_msg_v01 resp = {};
struct qmi_txn txn;
diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index 1b1c88906f1e..e43e4a42aad7 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -118,7 +118,7 @@ struct target_info {
char bdf_ext[ATH12K_QMI_BDF_EXT_STR_LENGTH];
};
-struct m3_mem_region {
+struct ath12k_fw_mem_region {
/* total memory allocated */
u32 total_size;
/* actual memory being used */
@@ -152,8 +152,8 @@ struct ath12k_qmi {
u8 num_radios;
struct target_info target;
- struct m3_mem_region m3_mem;
- struct m3_mem_region aux_uc_mem;
+ struct ath12k_fw_mem_region m3_mem;
+ struct ath12k_fw_mem_region aux_uc_mem;
unsigned int service_ins_id;
struct dev_mem_info dev_mem[ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01];
u8 dynamic_ddr_support;
--
2.34.1
next prev parent reply other threads:[~2026-11-03 17:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-03 17:25 [PATCH ath-next 0/2] wifi: ath12k: refactor m3/aux_uc firmware memory handling Madhavan Ganesan
2026-11-03 17:26 ` Madhavan Ganesan [this message]
2026-11-03 17:26 ` [PATCH ath-next 2/2] wifi: ath12k: refactor m3 and aux_uc " Madhavan Ganesan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261103-m3_and_aux_ucode-v1-1-e14f13fdfa41@oss.qualcomm.com \
--to=madhavan.ganesan@oss.qualcomm.com \
--cc=ath12k@lists.infradead.org \
--cc=jjohnson@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®