* [PATCH ath-next 1/2] wifi: ath12k: move firmware_mode enum to qmi.h
2026-07-25 18:11 [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Jeff Johnson
@ 2026-07-25 18:11 ` Jeff Johnson
2026-07-25 18:11 ` [PATCH ath-next 2/2] wifi: ath12k: rename firmware_mode enum members to use QMI namespace Jeff Johnson
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2026-07-25 18:11 UTC (permalink / raw)
To: Jeff Johnson; +Cc: linux-wireless, ath12k, linux-kernel, Jeff Johnson
The enum ath12k_firmware_mode defines values that are part of the QMI
ABI, so it belongs in qmi.h rather than core.h. Consolidate it there
along with ATH12K_FIRMWARE_MODE_OFF, which is currently a bare macro.
Rename the enum to ath12k_qmi_firmware_mode to align with the naming
convention of the other enums in qmi.h, and place it with the other
ath12k_qmi_* enums.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Assisted-by: Claude:claude-sonnet-4-6
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/core.c | 3 ++-
drivers/net/wireless/ath/ath12k/core.h | 10 +---------
drivers/net/wireless/ath/ath12k/pci.c | 1 +
drivers/net/wireless/ath/ath12k/qmi.c | 4 ++--
drivers/net/wireless/ath/ath12k/qmi.h | 14 ++++++++++++--
5 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index a9112760185f..a052a77828f3 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -23,6 +23,7 @@
#include "wow.h"
#include "dp_cmn.h"
#include "peer.h"
+#include "qmi.h"
unsigned int ath12k_debug_mask;
module_param_named(debug_mask, ath12k_debug_mask, uint, 0644);
@@ -1188,7 +1189,7 @@ static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag)
}
static int ath12k_core_start_firmware(struct ath12k_base *ab,
- enum ath12k_firmware_mode mode)
+ enum ath12k_qmi_firmware_mode mode)
{
int ret;
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index f9fb1399e0b6..a43959ebf46f 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -160,14 +160,6 @@ enum ath12k_hw_rev {
ATH12K_HW_IPQ5424_HW10,
};
-enum ath12k_firmware_mode {
- /* the default mode, standard 802.11 functionality */
- ATH12K_FIRMWARE_MODE_NORMAL,
-
- /* factory tests etc */
- ATH12K_FIRMWARE_MODE_FTM,
-};
-
#define ATH12K_IRQ_NUM_MAX 57
#define ATH12K_EXT_IRQ_NUM_MAX 16
#define ATH12K_MAX_TCL_RING_NUM 3
@@ -1143,7 +1135,7 @@ struct ath12k_base {
struct ath12k_hw_group *ag;
struct ath12k_wsi_info wsi_info;
- enum ath12k_firmware_mode fw_mode;
+ enum ath12k_qmi_firmware_mode fw_mode;
struct ath12k_ftm_event_obj ftm_event_obj;
bool hw_group_ref;
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index ad74140e0fa5..907d29b1020c 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -17,6 +17,7 @@
#include "mhi.h"
#include "debug.h"
#include "hal.h"
+#include "qmi.h"
#define ATH12K_PCI_BAR_NUM 0
#define ATH12K_PCI_DMA_MASK 36
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index bb61c78e5c29..c466c3ae793a 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -3431,7 +3431,7 @@ int ath12k_qmi_wlanfw_aux_uc_info_send(struct ath12k_base *ab)
}
static int ath12k_qmi_wlanfw_mode_send(struct ath12k_base *ab,
- u32 mode)
+ enum ath12k_qmi_firmware_mode mode)
{
struct qmi_wlanfw_wlan_mode_req_msg_v01 req = {};
struct qmi_wlanfw_wlan_mode_resp_msg_v01 resp = {};
@@ -3631,7 +3631,7 @@ void ath12k_qmi_firmware_stop(struct ath12k_base *ab)
}
int ath12k_qmi_firmware_start(struct ath12k_base *ab,
- u32 mode)
+ enum ath12k_qmi_firmware_mode mode)
{
int ret;
diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index cbe5be30053a..27b69847a15e 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -32,7 +32,6 @@
#define QMI_WLFW_FW_READY_IND_V01 0x0038
#define QMI_WLANFW_MAX_DATA_SIZE_V01 6144
-#define ATH12K_FIRMWARE_MODE_OFF 4
#define ATH12K_BOARD_ID_DEFAULT 0xFF
@@ -602,6 +601,17 @@ enum ath12k_qmi_mem_mode {
ATH12K_QMI_MEMORY_MODE_LOW_512_M,
};
+enum ath12k_qmi_firmware_mode {
+ /* the default mode, standard 802.11 functionality */
+ ATH12K_FIRMWARE_MODE_NORMAL,
+
+ /* factory tests etc */
+ ATH12K_FIRMWARE_MODE_FTM,
+
+ /* firmware offline */
+ ATH12K_FIRMWARE_MODE_OFF = 4,
+};
+
static inline void ath12k_qmi_set_event_block(struct ath12k_qmi *qmi, bool block)
{
lockdep_assert_held(&qmi->event_lock);
@@ -617,7 +627,7 @@ static inline bool ath12k_qmi_get_event_block(struct ath12k_qmi *qmi)
}
int ath12k_qmi_firmware_start(struct ath12k_base *ab,
- u32 mode);
+ enum ath12k_qmi_firmware_mode mode);
void ath12k_qmi_firmware_stop(struct ath12k_base *ab);
void ath12k_qmi_deinit_service(struct ath12k_base *ab);
int ath12k_qmi_init_service(struct ath12k_base *ab);
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH ath-next 2/2] wifi: ath12k: rename firmware_mode enum members to use QMI namespace
2026-07-25 18:11 [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Jeff Johnson
2026-07-25 18:11 ` [PATCH ath-next 1/2] wifi: ath12k: move firmware_mode enum to qmi.h Jeff Johnson
@ 2026-07-25 18:11 ` Jeff Johnson
2026-07-27 3:42 ` [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Baochen Qiang
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2026-07-25 18:11 UTC (permalink / raw)
To: Jeff Johnson; +Cc: linux-wireless, ath12k, linux-kernel, Jeff Johnson
The enumerator names ATH12K_FIRMWARE_MODE_* lack the QMI infix that all
other constants in qmi.h use (ATH12K_QMI_FILE_TYPE_*,
ATH12K_QMI_BDF_TYPE_*, ATH12K_QMI_MEMORY_MODE_*, etc.). Rename them to
ATH12K_QMI_FIRMWARE_MODE_* for consistency and to prevent a future
re-introduction of ATH12K_FIRMWARE_MODE_* names causing a silent collision.
While here, add a comment noting that values 2-3 are reserved by the
firmware QMI ABI to explain the gap before ATH12K_QMI_FIRMWARE_MODE_OFF = 4.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Assisted-by: Claude:claude-sonnet-4-6
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/core.c | 2 +-
drivers/net/wireless/ath/ath12k/mac.c | 2 +-
drivers/net/wireless/ath/ath12k/pci.c | 2 +-
drivers/net/wireless/ath/ath12k/qmi.c | 4 ++--
drivers/net/wireless/ath/ath12k/qmi.h | 8 ++++----
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index a052a77828f3..d023c646478f 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -795,7 +795,7 @@ static int ath12k_core_soc_create(struct ath12k_base *ab)
int ret;
if (ath12k_ftm_mode) {
- ab->fw_mode = ATH12K_FIRMWARE_MODE_FTM;
+ ab->fw_mode = ATH12K_QMI_FIRMWARE_MODE_FTM;
ath12k_info(ab, "Booting in ftm mode\n");
}
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 553bcad0b5d0..6ed1f5502507 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -859,7 +859,7 @@ struct ath12k *ath12k_mac_get_ar_by_pdev_id(struct ath12k_base *ab, u32 pdev_id)
return NULL;
for (i = 0; i < ab->num_radios; i++) {
- if (ab->fw_mode == ATH12K_FIRMWARE_MODE_FTM)
+ if (ab->fw_mode == ATH12K_QMI_FIRMWARE_MODE_FTM)
pdev = &ab->pdevs[i];
else
pdev = rcu_dereference(ab->pdevs_active[i]);
diff --git a/drivers/net/wireless/ath/ath12k/pci.c b/drivers/net/wireless/ath/ath12k/pci.c
index 907d29b1020c..6441927b5382 100644
--- a/drivers/net/wireless/ath/ath12k/pci.c
+++ b/drivers/net/wireless/ath/ath12k/pci.c
@@ -1556,7 +1556,7 @@ static int ath12k_pci_probe(struct pci_dev *pdev,
ab_pci->ab = ab;
ab_pci->pdev = pdev;
ab->hif.ops = &ath12k_pci_hif_ops;
- ab->fw_mode = ATH12K_FIRMWARE_MODE_NORMAL;
+ ab->fw_mode = ATH12K_QMI_FIRMWARE_MODE_NORMAL;
pci_set_drvdata(pdev, ab);
spin_lock_init(&ab_pci->window_lock);
diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c
index c466c3ae793a..280e50a1f31d 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.c
+++ b/drivers/net/wireless/ath/ath12k/qmi.c
@@ -3460,7 +3460,7 @@ static int ath12k_qmi_wlanfw_mode_send(struct ath12k_base *ab,
ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS));
if (ret < 0) {
- if (mode == ATH12K_FIRMWARE_MODE_OFF && ret == -ENETRESET) {
+ if (mode == ATH12K_QMI_FIRMWARE_MODE_OFF && ret == -ENETRESET) {
ath12k_warn(ab, "WLFW service is dis-connected\n");
return 0;
}
@@ -3623,7 +3623,7 @@ void ath12k_qmi_firmware_stop(struct ath12k_base *ab)
clear_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, &ab->dev_flags);
- ret = ath12k_qmi_wlanfw_mode_send(ab, ATH12K_FIRMWARE_MODE_OFF);
+ ret = ath12k_qmi_wlanfw_mode_send(ab, ATH12K_QMI_FIRMWARE_MODE_OFF);
if (ret < 0) {
ath12k_warn(ab, "qmi failed to send wlan mode off\n");
return;
diff --git a/drivers/net/wireless/ath/ath12k/qmi.h b/drivers/net/wireless/ath/ath12k/qmi.h
index 27b69847a15e..6da10f3cb597 100644
--- a/drivers/net/wireless/ath/ath12k/qmi.h
+++ b/drivers/net/wireless/ath/ath12k/qmi.h
@@ -603,13 +603,13 @@ enum ath12k_qmi_mem_mode {
enum ath12k_qmi_firmware_mode {
/* the default mode, standard 802.11 functionality */
- ATH12K_FIRMWARE_MODE_NORMAL,
+ ATH12K_QMI_FIRMWARE_MODE_NORMAL,
/* factory tests etc */
- ATH12K_FIRMWARE_MODE_FTM,
+ ATH12K_QMI_FIRMWARE_MODE_FTM,
- /* firmware offline */
- ATH12K_FIRMWARE_MODE_OFF = 4,
+ /* firmware offline; values 2-3 reserved by firmware ABI */
+ ATH12K_QMI_FIRMWARE_MODE_OFF = 4,
};
static inline void ath12k_qmi_set_event_block(struct ath12k_qmi *qmi, bool block)
--
2.43.0
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration
2026-07-25 18:11 [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Jeff Johnson
2026-07-25 18:11 ` [PATCH ath-next 1/2] wifi: ath12k: move firmware_mode enum to qmi.h Jeff Johnson
2026-07-25 18:11 ` [PATCH ath-next 2/2] wifi: ath12k: rename firmware_mode enum members to use QMI namespace Jeff Johnson
@ 2026-07-27 3:42 ` Baochen Qiang
2026-07-27 5:26 ` Rameshkumar Sundaram
2026-07-29 15:46 ` Jeff Johnson
4 siblings, 0 replies; 6+ messages in thread
From: Baochen Qiang @ 2026-07-27 3:42 UTC (permalink / raw)
To: Jeff Johnson, Jeff Johnson; +Cc: linux-wireless, ath12k, linux-kernel
On 7/26/2026 2:11 AM, Jeff Johnson wrote:
> This series inspired by [1] for ath11k, but takes a more comprehensive
> approach.
>
> [1] https://lore.kernel.org/all/TYZPR01MB55561DF4543A0265B47A58CDC9C92@TYZPR01MB5556.apcprd01.prod.exchangelabs.com/
>
> ---
> Jeff Johnson (2):
> wifi: ath12k: move firmware_mode enum to qmi.h
> wifi: ath12k: rename firmware_mode enum members to use QMI namespace
>
> drivers/net/wireless/ath/ath12k/core.c | 5 +++--
> drivers/net/wireless/ath/ath12k/core.h | 10 +---------
> drivers/net/wireless/ath/ath12k/mac.c | 2 +-
> drivers/net/wireless/ath/ath12k/pci.c | 3 ++-
> drivers/net/wireless/ath/ath12k/qmi.c | 8 ++++----
> drivers/net/wireless/ath/ath12k/qmi.h | 14 ++++++++++++--
> 6 files changed, 23 insertions(+), 19 deletions(-)
> ---
> base-commit: 189721a4afa1804315e7dcfca9ca0539c7b1d7af
> change-id: 20260717-consolidate-firmware_mode-93c215fdb29c
>
>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration
2026-07-25 18:11 [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Jeff Johnson
` (2 preceding siblings ...)
2026-07-27 3:42 ` [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Baochen Qiang
@ 2026-07-27 5:26 ` Rameshkumar Sundaram
2026-07-29 15:46 ` Jeff Johnson
4 siblings, 0 replies; 6+ messages in thread
From: Rameshkumar Sundaram @ 2026-07-27 5:26 UTC (permalink / raw)
To: Jeff Johnson, Jeff Johnson; +Cc: linux-wireless, ath12k, linux-kernel
On 7/25/2026 11:41 PM, Jeff Johnson wrote:
> This series inspired by [1] for ath11k, but takes a more comprehensive
> approach.
>
> [1] https://lore.kernel.org/all/TYZPR01MB55561DF4543A0265B47A58CDC9C92@TYZPR01MB5556.apcprd01.prod.exchangelabs.com/
>
> ---
> Jeff Johnson (2):
> wifi: ath12k: move firmware_mode enum to qmi.h
> wifi: ath12k: rename firmware_mode enum members to use QMI namespace
>
> drivers/net/wireless/ath/ath12k/core.c | 5 +++--
> drivers/net/wireless/ath/ath12k/core.h | 10 +---------
> drivers/net/wireless/ath/ath12k/mac.c | 2 +-
> drivers/net/wireless/ath/ath12k/pci.c | 3 ++-
> drivers/net/wireless/ath/ath12k/qmi.c | 8 ++++----
> drivers/net/wireless/ath/ath12k/qmi.h | 14 ++++++++++++--
> 6 files changed, 23 insertions(+), 19 deletions(-)
> ---
> base-commit: 189721a4afa1804315e7dcfca9ca0539c7b1d7af
> change-id: 20260717-consolidate-firmware_mode-93c215fdb29c
>
Reviewed-by: Rameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration
2026-07-25 18:11 [PATCH ath-next 0/2] wifi: ath12k: Cleanup ath12k_firmware_mode enumeration Jeff Johnson
` (3 preceding siblings ...)
2026-07-27 5:26 ` Rameshkumar Sundaram
@ 2026-07-29 15:46 ` Jeff Johnson
4 siblings, 0 replies; 6+ messages in thread
From: Jeff Johnson @ 2026-07-29 15:46 UTC (permalink / raw)
To: Jeff Johnson, Jeff Johnson; +Cc: linux-wireless, ath12k, linux-kernel
On Sat, 25 Jul 2026 11:11:44 -0700, Jeff Johnson wrote:
> This series inspired by [1] for ath11k, but takes a more comprehensive
> approach.
>
> [1] https://lore.kernel.org/all/TYZPR01MB55561DF4543A0265B47A58CDC9C92@TYZPR01MB5556.apcprd01.prod.exchangelabs.com/
>
Applied, thanks!
[1/2] wifi: ath12k: move firmware_mode enum to qmi.h
commit: 0702eddffff1b637a9e90187785a0b44542bb365
[2/2] wifi: ath12k: rename firmware_mode enum members to use QMI namespace
commit: 0090ec7ad252f1a597d782b7bce7eff7bdde00c0
Best regards,
--
Jeff Johnson <jeff.johnson@oss.qualcomm.com>
^ permalink raw reply [flat|nested] 6+ messages in thread