[PATCH ath-next v2 08/17] wifi: ath12k: Add hif operation support for QCN6432
Aaradhana Sahu
aaradhana.sahu at oss.qualcomm.com
Thu Oct 15 20:21:45 PDT 2026
From: Sowmiya Sree Elavalagan <quic_ssreeela at quicinc.com>
Add hif operations (ath12k_hif_ops) for the QCN6432 Wi-Fi driver.
Reuse existing hif operations such as power_up and power_down from
IPQ5332, as they are identical on QCN6432. Similarly, reuse operations
like irq_enable, irq_disable, get_user_msi_vector, and
map_service_to_pipe from QCN9274, since their behavior matches on
QCN6432.
Implement QCN6432-specific operations such as start, stop,
cmem_read32, cmem_write32, read32, write32, get_msi_address, and
config_static_window in a new pcic.c file.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01243-QCAHKSWPL_SILICONZ-1
Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.6-01322-QCAHKSWPL_SILICONZ-1
Tested-on: QCN6432 hw1.0 AHB WLAN.WBE.1.6-01322-QCAHKSWPL_SILICONZ-1
Signed-off-by: Sowmiya Sree Elavalagan <quic_ssreeela at quicinc.com>
Co-developed-by: Aaradhana Sahu <aaradhana.sahu at oss.qualcomm.com>
Signed-off-by: Aaradhana Sahu <aaradhana.sahu at oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/Makefile | 2 +-
drivers/net/wireless/ath/ath12k/ahb.c | 23 ++++
drivers/net/wireless/ath/ath12k/ahb.h | 9 ++
drivers/net/wireless/ath/ath12k/core.c | 3 +
drivers/net/wireless/ath/ath12k/core.h | 2 +
drivers/net/wireless/ath/ath12k/hif.h | 30 ++++++
drivers/net/wireless/ath/ath12k/pcic.c | 156 ++++++++++++++++++++++++++++
drivers/net/wireless/ath/ath12k/pcic.h | 22 ++++
drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 7 ++
9 files changed, 253 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath12k/Makefile b/drivers/net/wireless/ath/ath12k/Makefile
index 3b39b2c33307..861ec85eebed 100644
--- a/drivers/net/wireless/ath/ath12k/Makefile
+++ b/drivers/net/wireless/ath/ath12k/Makefile
@@ -22,7 +22,7 @@ ath12k-y += core.o \
fw.o \
p2p.o
-ath12k-$(CONFIG_ATH12K_AHB) += ahb.o
+ath12k-$(CONFIG_ATH12K_AHB) += ahb.o pcic.o
obj-$(CONFIG_ATH12K) += wifi7/
diff --git a/drivers/net/wireless/ath/ath12k/ahb.c b/drivers/net/wireless/ath/ath12k/ahb.c
index 2c55aae06dd0..bcb49ff07aa8 100644
--- a/drivers/net/wireless/ath/ath12k/ahb.c
+++ b/drivers/net/wireless/ath/ath12k/ahb.c
@@ -16,6 +16,8 @@
#include "ahb.h"
#include "debug.h"
#include "hif.h"
+#include "pci.h"
+#include "pcic.h"
#define ATH12K_IRQ_CE0_OFFSET 4
#define ATH12K_UPD_IRQ_WRD_LEN 18
@@ -790,6 +792,26 @@ const struct ath12k_hif_ops ath12k_ahb_hif_ops = {
};
EXPORT_SYMBOL(ath12k_ahb_hif_ops);
+const struct ath12k_hif_ops ath12k_ahb_hif_ops_qcn6432 = {
+ .start = ath12k_pcic_start,
+ .stop = ath12k_pcic_stop,
+ .cmem_read32 = ath12k_pcic_cmem_read32,
+ .cmem_write32 = ath12k_pcic_cmem_write32,
+ .power_down = ath12k_ahb_power_down,
+ .power_up = ath12k_ahb_power_up,
+ .read32 = ath12k_pcic_read32,
+ .write32 = ath12k_pcic_write32,
+ .irq_enable = ath12k_pci_ext_irq_enable,
+ .irq_disable = ath12k_pci_ext_irq_disable,
+ .get_msi_address = ath12k_pcic_get_msi_address,
+ .get_user_msi_vector = ath12k_pci_get_user_msi_assignment,
+ .map_service_to_pipe = ath12k_pci_map_service_to_pipe,
+ .ce_irq_enable = ath12k_pci_ce_irqs_enable,
+ .ce_irq_disable = ath12k_pci_ce_irq_disable_sync,
+ .config_static_window = ath12k_pcic_config_static_window,
+};
+EXPORT_SYMBOL(ath12k_ahb_hif_ops_qcn6432);
+
static irqreturn_t ath12k_userpd_irq_handler(int irq, void *data)
{
struct ath12k_base *ab = data;
@@ -1324,6 +1346,7 @@ static int ath12k_ahb_probe(struct platform_device *pdev)
ath12k_dbg(ab, ATH12K_DBG_AHB, "AHB device family id: %d\n", device_id);
ab_ahb->device_family_ops = &ath12k_ahb_family_drivers[device_id]->ops;
+ ab_ahb->reg_base = ath12k_ahb_family_drivers[device_id]->reg_base;
/* Call device specific probe. This is the callback that can
* be used to override any ops in future
diff --git a/drivers/net/wireless/ath/ath12k/ahb.h b/drivers/net/wireless/ath/ath12k/ahb.h
index ecc4054f8742..373dc3b92728 100644
--- a/drivers/net/wireless/ath/ath12k/ahb.h
+++ b/drivers/net/wireless/ath/ath12k/ahb.h
@@ -11,6 +11,11 @@
#include <linux/platform_device.h>
#include "core.h"
+struct ath12k_ahb_reg_base {
+ u32 umac_base;
+ u32 ce_reg_base;
+};
+
#define ATH12K_AHB_RECOVERY_TIMEOUT (3 * HZ)
#define ATH12K_AHB_SMP2P_SMEM_MSG GENMASK(15, 0)
@@ -65,6 +70,7 @@ enum ath12k_ahb_userpd_irq {
struct ath12k_base;
extern const struct ath12k_hif_ops ath12k_ahb_hif_ops;
+extern const struct ath12k_hif_ops ath12k_ahb_hif_ops_qcn6432;
struct ath12k_ahb_device_family_ops {
int (*probe)(struct platform_device *pdev);
@@ -103,12 +109,15 @@ struct ath12k_ahb {
bool scm_auth_enabled;
struct ath12k_ahb_rproc_info *rproc_info;
bool supports_multipd;
+ u32 static_window_reg;
+ const struct ath12k_ahb_reg_base *reg_base;
};
struct ath12k_ahb_driver {
const char *name;
const struct of_device_id *id_table;
struct ath12k_ahb_device_family_ops ops;
+ const struct ath12k_ahb_reg_base *reg_base;
struct platform_driver driver;
};
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c
index 25987bc58556..d2ce01e0d7ac 100644
--- a/drivers/net/wireless/ath/ath12k/core.c
+++ b/drivers/net/wireless/ath/ath12k/core.c
@@ -1350,6 +1350,9 @@ int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab)
struct ath12k_hw_group *ag = ath12k_ab_to_ag(ab);
int ret, i;
+ if (ab->hw_params->hybrid_bus_type)
+ ath12k_hif_config_static_window(ab);
+
ret = ath12k_core_start_firmware(ab, ab->fw_mode);
if (ret) {
ath12k_err(ab, "failed to start firmware: %d\n", ret);
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index eaea601ab32d..293c7561b27a 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -1161,6 +1161,8 @@ struct ath12k_base {
struct {
const struct ath12k_msi_config *config;
u32 ep_base_data;
+ u32 addr_lo;
+ u32 addr_hi;
} msi;
/* must be last */
diff --git a/drivers/net/wireless/ath/ath12k/hif.h b/drivers/net/wireless/ath/ath12k/hif.h
index aecdb0c5f285..faeabd2c3d2a 100644
--- a/drivers/net/wireless/ath/ath12k/hif.h
+++ b/drivers/net/wireless/ath/ath12k/hif.h
@@ -12,6 +12,8 @@
struct ath12k_hif_ops {
u32 (*read32)(struct ath12k_base *ab, u32 address);
void (*write32)(struct ath12k_base *ab, u32 address, u32 data);
+ int (*cmem_read32)(struct ath12k_base *ab, u32 address, u32 *value);
+ int (*cmem_write32)(struct ath12k_base *ab, u32 address, u32 data);
void (*irq_enable)(struct ath12k_base *ab);
void (*irq_disable)(struct ath12k_base *ab);
int (*start)(struct ath12k_base *ab);
@@ -31,6 +33,7 @@ struct ath12k_hif_ops {
void (*ce_irq_disable)(struct ath12k_base *ab);
void (*get_ce_msi_idx)(struct ath12k_base *ab, u32 ce_id, u32 *msi_idx);
void (*coredump_download)(struct ath12k_base *ab);
+ void (*config_static_window)(struct ath12k_base *ab);
};
static inline int ath12k_hif_map_service_to_pipe(struct ath12k_base *ab, u16 service_id,
@@ -126,6 +129,24 @@ static inline u32 ath12k_hif_read32(struct ath12k_base *ab, u32 address)
return ab->hif.ops->read32(ab, address);
}
+static inline int ath12k_hif_cmem_read32(struct ath12k_base *ab, u32 address,
+ u32 *value)
+{
+ if (!ab->hif.ops->cmem_read32)
+ return -EOPNOTSUPP;
+
+ return ab->hif.ops->cmem_read32(ab, address, value);
+}
+
+static inline int ath12k_hif_cmem_write32(struct ath12k_base *ab, u32 address,
+ u32 data)
+{
+ if (!ab->hif.ops->cmem_write32)
+ return -EOPNOTSUPP;
+
+ return ab->hif.ops->cmem_write32(ab, address, data);
+}
+
static inline void ath12k_hif_write32(struct ath12k_base *ab, u32 address,
u32 data)
{
@@ -153,4 +174,13 @@ static inline void ath12k_hif_coredump_download(struct ath12k_base *ab)
if (ab->hif.ops->coredump_download)
ab->hif.ops->coredump_download(ab);
}
+
+static inline void ath12k_hif_config_static_window(struct ath12k_base *ab)
+{
+ if (!ab->hif.ops->config_static_window)
+ return;
+
+ ab->hif.ops->config_static_window(ab);
+}
+
#endif /* ATH12K_HIF_H */
diff --git a/drivers/net/wireless/ath/ath12k/pcic.c b/drivers/net/wireless/ath/ath12k/pcic.c
new file mode 100644
index 000000000000..e3c8476af459
--- /dev/null
+++ b/drivers/net/wireless/ath/ath12k/pcic.c
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: BSD-3-Clause-Clear
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+#include <linux/module.h>
+#include "ahb.h"
+#include "core.h"
+#include "debug.h"
+#include "hif.h"
+#include "hw.h"
+#include "pci.h"
+#include "pcic.h"
+
+void ath12k_pcic_config_static_window(struct ath12k_base *ab)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ u32 umac_window = u32_get_bits(ab_ahb->reg_base->umac_base, WINDOW_VALUE_MASK);
+ u32 ce_window = u32_get_bits(ab_ahb->reg_base->ce_reg_base, WINDOW_VALUE_MASK);
+ u32 window;
+
+ window = (umac_window << 12) | (ce_window << 6);
+ writel_relaxed(WINDOW_ENABLE_BIT | window, ab->mem + WINDOW_REG_ADDRESS);
+ ab_ahb->static_window_reg = readl_relaxed(ab->mem + WINDOW_REG_ADDRESS);
+}
+
+static int ath12k_pcic_select_static_window(struct ath12k_base *ab, u32 addr)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+
+ u32 window_bits, new_window, reg_value;
+ const int max_retries = 10;
+ int i;
+
+ window_bits = u32_get_bits(addr, WINDOW_VALUE_MASK);
+
+ /* Update window bits [5:0], preserving other bits */
+ new_window = u32_replace_bits(ab_ahb->static_window_reg, window_bits, 0x3f);
+
+ if (new_window == ab_ahb->static_window_reg)
+ return 0;
+
+ reg_value = WINDOW_ENABLE_BIT | new_window;
+ writel_relaxed(reg_value, ab->mem + WINDOW_REG_ADDRESS);
+
+ /* Wait for the write to take effect */
+ for (i = 0; i < max_retries; i++) {
+ if (readl_relaxed(ab->mem + WINDOW_REG_ADDRESS) == reg_value) {
+ ab_ahb->static_window_reg = reg_value;
+ return 0;
+ }
+
+ usleep_range(1000, 2000);
+ }
+
+ ath12k_warn(ab, "failed to set static window for cmem init\n");
+ return -ETIMEDOUT;
+}
+
+int ath12k_pcic_cmem_read32(struct ath12k_base *ab, u32 addr, u32 *value)
+{
+ int ret;
+
+ if (!value)
+ return -EINVAL;
+
+ if (addr < WINDOW_START) {
+ *value = readl_relaxed(ab->mem + addr);
+ return 0;
+ }
+
+ ret = ath12k_pcic_select_static_window(ab, addr);
+ if (ret)
+ return ret;
+
+ *value = readl_relaxed(ab->mem + WINDOW_START + (addr & WINDOW_RANGE_MASK));
+ return 0;
+}
+
+int ath12k_pcic_cmem_write32(struct ath12k_base *ab, u32 addr, u32 value)
+{
+ int ret;
+
+ if (addr < WINDOW_START) {
+ writel_relaxed(value, ab->mem + addr);
+ return 0;
+ }
+
+ ret = ath12k_pcic_select_static_window(ab, addr);
+ if (ret)
+ return ret;
+
+ writel_relaxed(value, ab->mem + WINDOW_START + (addr & WINDOW_RANGE_MASK));
+ return 0;
+}
+
+static u32 ath12k_pcic_get_window_start(struct ath12k_base *ab, u32 offset)
+{
+ struct ath12k_ahb *ab_ahb = ath12k_ab_to_ahb(ab);
+ u32 window_start;
+
+ /* If offset lies within DP register range, use 3rd window */
+ if ((offset ^ ab_ahb->reg_base->umac_base) <= WINDOW_RANGE_MASK)
+ window_start = 3 * WINDOW_START;
+ /* If offset lies within CE register range, use 2nd window */
+ else if ((offset ^ ab_ahb->reg_base->ce_reg_base) <= WINDOW_RANGE_MASK)
+ window_start = 2 * WINDOW_START;
+ else
+ window_start = WINDOW_START;
+
+ return window_start;
+}
+
+void ath12k_pcic_get_msi_address(struct ath12k_base *ab, u32 *msi_addr_lo,
+ u32 *msi_addr_hi)
+{
+ *msi_addr_lo = ab->msi.addr_lo;
+ *msi_addr_hi = ab->msi.addr_hi;
+}
+
+void ath12k_pcic_stop(struct ath12k_base *ab)
+{
+ ath12k_pci_ce_irq_disable_sync(ab);
+ timer_delete_sync(&ab->rx_replenish_retry);
+ ath12k_ce_cleanup_pipes(ab);
+}
+
+int ath12k_pcic_start(struct ath12k_base *ab)
+{
+ ath12k_pci_ce_irqs_enable(ab);
+ ath12k_ce_rx_post_buf(ab);
+ return 0;
+}
+
+u32 ath12k_pcic_read32(struct ath12k_base *ab, u32 offset)
+{
+ u32 window_start;
+
+ if (offset < WINDOW_START)
+ return readl_relaxed(ab->mem + offset);
+
+ window_start = ath12k_pcic_get_window_start(ab, offset);
+ return readl_relaxed(ab->mem + window_start + (offset & WINDOW_RANGE_MASK));
+}
+
+void ath12k_pcic_write32(struct ath12k_base *ab, u32 offset, u32 value)
+{
+ u32 window_start;
+
+ if (offset < WINDOW_START) {
+ writel_relaxed(value, ab->mem + offset);
+ return;
+ }
+
+ window_start = ath12k_pcic_get_window_start(ab, offset);
+ writel_relaxed(value, ab->mem + window_start + (offset & WINDOW_RANGE_MASK));
+}
diff --git a/drivers/net/wireless/ath/ath12k/pcic.h b/drivers/net/wireless/ath/ath12k/pcic.h
new file mode 100644
index 000000000000..f77091927039
--- /dev/null
+++ b/drivers/net/wireless/ath/ath12k/pcic.h
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: BSD-3-Clause-Clear */
+/*
+ * Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+ */
+#ifndef _ATH12K_PCIC_H
+#define _ATH12K_PCIC_H
+
+#include <linux/types.h>
+
+struct ath12k_base;
+
+int ath12k_pcic_start(struct ath12k_base *ab);
+void ath12k_pcic_stop(struct ath12k_base *ab);
+void ath12k_pcic_write32(struct ath12k_base *ab, u32 offset, u32 value);
+u32 ath12k_pcic_read32(struct ath12k_base *ab, u32 offset);
+void ath12k_pcic_get_msi_address(struct ath12k_base *ab, u32 *msi_addr_lo,
+ u32 *msi_addr_hi);
+int ath12k_pcic_cmem_write32(struct ath12k_base *ab, u32 addr,
+ u32 value);
+int ath12k_pcic_cmem_read32(struct ath12k_base *ab, u32 addr, u32 *value);
+void ath12k_pcic_config_static_window(struct ath12k_base *ab);
+#endif /* _ATH12K_PCIC_H */
diff --git a/drivers/net/wireless/ath/ath12k/wifi7/ahb.c b/drivers/net/wireless/ath/ath12k/wifi7/ahb.c
index 70372db6abae..bff48b2fe124 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/ahb.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/ahb.c
@@ -14,6 +14,7 @@
#include "hw.h"
#include "dp.h"
#include "core.h"
+#include "hal.h"
static const struct ath12k_ahb_desc ath12k_wifi7_ahb_desc[] = {
[ATH12K_HW_IPQ5332_HW10] = {
@@ -72,9 +73,15 @@ static int ath12k_wifi7_ahb_probe(struct platform_device *pdev)
return 0;
}
+static const struct ath12k_ahb_reg_base ath12k_wifi7_ahb_reg_base = {
+ .umac_base = HAL_SEQ_WCSS_UMAC_OFFSET,
+ .ce_reg_base = HAL_CE_WFSS_CE_REG_BASE,
+};
+
static struct ath12k_ahb_driver ath12k_wifi7_ahb_driver = {
.name = "ath12k_wifi7_ahb",
.id_table = ath12k_wifi7_ahb_of_match,
+ .reg_base = &ath12k_wifi7_ahb_reg_base,
.ops.probe = ath12k_wifi7_ahb_probe,
.ops.arch_init = ath12k_wifi7_arch_init,
.ops.arch_deinit = ath12k_wifi7_arch_deinit,
--
2.34.1
More information about the ath12k
mailing list