[PATCH v3 06/13] wifi: ath12k: Add hw_params to remap CE register space for IPQ5332

Raj Kumar Bhagat
2024-12-09T16:57:33Z

From: Balamurugan S <quic_bselvara@quicinc.com>

For IPQ5332 CE register space is moved out of WCSS region and the
space is not contiguous. Hence, add hardware params (ce_ie_addr &
ce_remap) for IPQ5332. These parameters would be used by Ath12k
AHB driver (in subsequent patches) to remap the CE registers to a
new space for accessing them.

Tested-on: IPQ5332 hw1.0 AHB WLAN.WBE.1.3.1-00130-QCAHKSWPL_SILICONZ-1
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00210-QCAHKSWPL_SILICONZ-1

Signed-off-by: Balamurugan S <quic_bselvara@quicinc.com>
Co-developed-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: P Praneesh <quic_ppranees@quicinc.com>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com>
---
drivers/net/wireless/ath/ath12k/ce.h | 11 +++++++++
drivers/net/wireless/ath/ath12k/core.h | 4 ++++
drivers/net/wireless/ath/ath12k/hal.h | 4 ++++
drivers/net/wireless/ath/ath12k/hw.c | 31 ++++++++++++++++++++++----
drivers/net/wireless/ath/ath12k/hw.h | 2 ++
5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 6b1a356f43be..75c9f8f1f7c6 100644
--- a/drivers/net/wireless/ath/ath12k/ce.h
+++ b/drivers/net/wireless/ath/ath12k/ce.h
@@ -76,6 +76,17 @@ struct ce_pipe_config {
__le32 reserved;
};

+struct ce_ie_addr {
+ u32 ie1_reg_addr;
+ u32 ie2_reg_addr;
+ u32 ie3_reg_addr;
+};
+
+struct ce_remap {
+ u32 base;
+ u32 size;
+};
+
struct ce_attr {
/* CE_ATTR_* values */
unsigned int flags;
diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index 1737fb8f765d..e45ff85b675d 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -872,6 +872,10 @@ struct ath12k_base {
void __iomem *mem;
unsigned long mem_len;

+ void __iomem *mem_ce;
+ u32 ce_remap_base_addr;
+ bool ce_remap;
+
struct {
enum ath12k_bus bus;
const struct ath12k_hif_ops *ops;
diff --git a/drivers/net/wireless/ath/ath12k/hal.h b/drivers/net/wireless/ath/ath12k/hal.h
index 69579f118b81..70dbd460dae3 100644
--- a/drivers/net/wireless/ath/ath12k/hal.h
+++ b/drivers/net/wireless/ath/ath12k/hal.h
@@ -11,6 +11,7 @@
#include "rx_desc.h"

struct ath12k_base;
+#define HAL_CE_REMAP_REG_BASE (ab->ce_remap_base_addr)

#define HAL_LINK_DESC_SIZE (32 << 2)
#define HAL_LINK_DESC_ALIGN 128
@@ -372,6 +373,9 @@ struct ath12k_base;
* ath12k_hal_rx_desc_get_err().
*/

+#define HAL_IPQ5332_CE_WFSS_REG_BASE 0x740000
+#define HAL_IPQ5332_CE_SIZE 0x100000
+
enum hal_srng_ring_id {
HAL_SRNG_RING_ID_REO2SW0 = 0,
HAL_SRNG_RING_ID_REO2SW1,
diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index f7035669bc6f..494963b19fe9 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1106,10 +1106,14 @@ static const struct ath12k_hw_regs ipq5332_regs = {
.hal_ppe_rel_ring_base = 0x0000046c,

/* CE address */
- .hal_umac_ce0_src_reg_base = 0x00740000,
- .hal_umac_ce0_dest_reg_base = 0x00741000,
- .hal_umac_ce1_src_reg_base = 0x00742000,
- .hal_umac_ce1_dest_reg_base = 0x00743000,
+ .hal_umac_ce0_src_reg_base = 0x00740000 -
+ HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .hal_umac_ce0_dest_reg_base = 0x00741000 -
+ HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .hal_umac_ce1_src_reg_base = 0x00742000 -
+ HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .hal_umac_ce1_dest_reg_base = 0x00743000 -
+ HAL_IPQ5332_CE_WFSS_REG_BASE,
};

static const struct ath12k_hw_regs wcn7850_regs = {
@@ -1223,6 +1227,17 @@ static const struct ath12k_hw_hal_params ath12k_hw_hal_params_ipq5332 = {
HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN,
};

+static const struct ce_ie_addr ath12k_ce_ie_addr_ipq5332 = {
+ .ie1_reg_addr = CE_HOST_IE_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .ie2_reg_addr = CE_HOST_IE_2_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .ie3_reg_addr = CE_HOST_IE_3_ADDRESS - HAL_IPQ5332_CE_WFSS_REG_BASE,
+};
+
+static const struct ce_remap ath12k_ce_remap_ipq5332 = {
+ .base = HAL_IPQ5332_CE_WFSS_REG_BASE,
+ .size = HAL_IPQ5332_CE_SIZE,
+};
+
static const struct ath12k_hw_params ath12k_hw_params[] = {
{
.name = "qcn9274 hw1.0",
@@ -1301,6 +1316,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,

.needs_m3_fw = true,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "wcn7850 hw2.0",
@@ -1383,6 +1400,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = true,

.needs_m3_fw = true,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "qcn9274 hw2.0",
@@ -1461,6 +1480,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,

.needs_m3_fw = true,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "ipq5332 hw1.0",
@@ -1534,6 +1555,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.supports_aspm = false,

.needs_m3_fw = false,
+ .ce_ie_addr = &ath12k_ce_ie_addr_ipq5332,
+ .ce_remap = &ath12k_ce_remap_ipq5332,
},
};

diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index 241aa83ddbdd..ee37e50476a4 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -222,6 +222,8 @@ struct ath12k_hw_params {
u32 iova_mask;

bool needs_m3_fw;
+ const struct ce_ie_addr *ce_ie_addr;
+ const struct ce_remap *ce_remap;
};

struct ath12k_hw_ops {
--
2.34.1