From: Balamurugan S <quic_bselvara@xxxxxxxxxxx>
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 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@xxxxxxxxxxx>
Co-developed-by: P Praneesh <quic_ppranees@xxxxxxxxxxx>
Signed-off-by: P Praneesh <quic_ppranees@xxxxxxxxxxx>
Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@xxxxxxxxxxx>
---
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 | 19 +++++++++++++++++++
drivers/net/wireless/ath/ath12k/hw.h | 2 ++
5 files changed, 40 insertions(+)
diff --git a/drivers/net/wireless/ath/ath12k/ce.h b/drivers/net/wireless/ath/ath12k/ce.h
index 46fd1f49ec4a..9dd71056e1c5 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 0493c0c522e3..46c33a6a553f 100644
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -791,6 +791,10 @@ struct ath12k_base {
void __iomem *mem_cmem;
+ 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 2184da129966..90756af4c4c2 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
@@ -376,6 +377,9 @@ struct ath12k_base;
#define HAL_IPQ5332_CMEM_SIZE 0x40000
#define HAL_IPQ5332_CMEM_BASE 0x100000
+#define HAL_IPQ5332_CE_WFSS_REG_BASE 0x740000
+#define HAL_IPQ5332_CE_SIZE 0x200000
+
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 6be0d15d87ae..83dc98891166 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -1228,6 +1228,17 @@ static const struct cmem_remap ath12k_cmem_remap_ipq5332 = {
.size = HAL_IPQ5332_CMEM_SIZE,
};
+static const struct ce_ie_addr ath12k_ce_ie_addr_ipq5332 = {
+ .ie1_reg_addr = CE_HOST_IE_ADDRESS,
+ .ie2_reg_addr = CE_HOST_IE_2_ADDRESS,
+ .ie3_reg_addr = CE_HOST_IE_3_ADDRESS,
+};
+
+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",
@@ -1306,6 +1317,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "wcn7850 hw2.0",
@@ -1388,6 +1401,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "qcn9274 hw2.0",
@@ -1466,6 +1481,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = true,
.cmem_remap = NULL,
+ .ce_ie_addr = NULL,
+ .ce_remap = NULL,
},
{
.name = "ipq5332 hw1.0",
@@ -1540,6 +1557,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
.m3_fw_support = false,
.cmem_remap = &ath12k_cmem_remap_ipq5332,
+ .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 e30bec688b74..580c7be109e0 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -223,6 +223,8 @@ struct ath12k_hw_params {
bool m3_fw_support;
const struct cmem_remap *cmem_remap;
+ const struct ce_ie_addr *ce_ie_addr;
+ const struct ce_remap *ce_remap;
};
struct ath12k_hw_ops {
--
2.34.1
