* [PATCH] ath10k: Set DMA address mask to 35 bit for WCN3990
@ 2018-08-06 14:48 ` Rakesh Pillai
0 siblings, 0 replies; 4+ messages in thread
From: Rakesh Pillai @ 2018-08-06 14:48 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless, Rakesh Pillai
WCN3990 is a 37-bit target but can address memory range
only upto 35 bits. The 36th bit is used to control the
smmu/iommu translation and the 37th bit is used by the
internal bus masters to access the wifi subsystem internal
SRAM. With the DMA mask set to 37i-bit, the host driver
can get 37-bit dma address, which leads to incorrect
address access in the target.
Hence the host driver can used addresses upto 35-bit
for WCN3990. Fix the dma mask for wcn3990 to 35-bit,
instead of 37-bit.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/ce.c | 71 +++++++++++++++++++++++++++-----
drivers/net/wireless/ath/ath10k/ce.h | 14 +++++--
drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +-
drivers/net/wireless/ath/ath10k/hw.c | 10 +++--
drivers/net/wireless/ath/ath10k/hw.h | 6 ++-
drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
6 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 18c709c..240b717 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -228,11 +228,31 @@ ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,
}
static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,
- u32 ce_ctrl_addr,
- unsigned int addr)
+ u32 ce_id,
+ u64 addr)
+{
+ struct ath10k_ce *ce = ath10k_ce_priv(ar);
+ struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+ u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+ u32 addr_lo = lower_32_bits(addr);
+
+ ath10k_ce_write32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->sr_base_addr_lo, addr_lo);
+
+ if (ce_state->ops->ce_set_src_ring_base_addr_hi) {
+ ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr,
+ addr);
+ }
+}
+
+static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr)
{
+ u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+
ath10k_ce_write32(ar, ce_ctrl_addr +
- ar->hw_ce_regs->sr_base_addr, addr);
+ ar->hw_ce_regs->sr_base_addr_hi, addr_hi);
}
static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar,
@@ -313,11 +333,36 @@ static inline u32 ath10k_ce_dest_ring_read_index_get(struct ath10k *ar,
}
static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k *ar,
- u32 ce_ctrl_addr,
- u32 addr)
+ u32 ce_id,
+ u64 addr)
{
+ struct ath10k_ce *ce = ath10k_ce_priv(ar);
+ struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+ u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+ u32 addr_lo = lower_32_bits(addr);
+
+ ath10k_ce_write32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->dr_base_addr_lo, addr_lo);
+
+ if (ce_state->ops->ce_set_dest_ring_base_addr_hi) {
+ ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr,
+ addr);
+ }
+}
+
+static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr)
+{
+ u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+ u32 reg_value;
+
+ reg_value = ath10k_ce_read32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->dr_base_addr_hi);
+ reg_value &= ~CE_DESC_ADDR_HI_MASK;
+ reg_value |= addr_hi;
ath10k_ce_write32(ar, ce_ctrl_addr +
- ar->hw_ce_regs->dr_base_addr, addr);
+ ar->hw_ce_regs->dr_base_addr_hi, reg_value);
}
static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar,
@@ -563,7 +608,7 @@ static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state,
addr = (__le32 *)&sdesc.addr;
- flags |= upper_32_bits(buffer) & CE_DESC_FLAGS_GET_MASK;
+ flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK;
addr[0] = __cpu_to_le32(buffer);
addr[1] = __cpu_to_le32(flags);
if (flags & CE_SEND_FLAG_GATHER)
@@ -731,7 +776,7 @@ static int __ath10k_ce_rx_post_buf_64(struct ath10k_ce_pipe *pipe,
return -ENOSPC;
desc->addr = __cpu_to_le64(paddr);
- desc->addr &= __cpu_to_le64(CE_DESC_37BIT_ADDR_MASK);
+ desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK);
desc->nbytes = 0;
@@ -1336,7 +1381,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar,
ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);
src_ring->write_index &= src_ring->nentries_mask;
- ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,
+ ath10k_ce_src_ring_base_addr_set(ar, ce_id,
src_ring->base_addr_ce_space);
ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, attr->src_sz_max);
@@ -1375,7 +1420,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar,
ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);
dest_ring->write_index &= dest_ring->nentries_mask;
- ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,
+ ath10k_ce_dest_ring_base_addr_set(ar, ce_id,
dest_ring->base_addr_ce_space);
ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);
ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);
@@ -1801,6 +1846,8 @@ static const struct ath10k_ce_ops ce_ops = {
.ce_extract_desc_data = ath10k_ce_extract_desc_data,
.ce_free_pipe = _ath10k_ce_free_pipe,
.ce_send_nolock = _ath10k_ce_send_nolock,
+ .ce_set_src_ring_base_addr_hi = NULL,
+ .ce_set_dest_ring_base_addr_hi = NULL,
};
static const struct ath10k_ce_ops ce_64_ops = {
@@ -1813,6 +1860,8 @@ static const struct ath10k_ce_ops ce_64_ops = {
.ce_extract_desc_data = ath10k_ce_extract_desc_data_64,
.ce_free_pipe = _ath10k_ce_free_pipe_64,
.ce_send_nolock = _ath10k_ce_send_nolock_64,
+ .ce_set_src_ring_base_addr_hi = ath10k_ce_set_src_ring_base_addr_hi,
+ .ce_set_dest_ring_base_addr_hi = ath10k_ce_set_dest_ring_base_addr_hi,
};
static void ath10k_ce_set_ops(struct ath10k *ar,
@@ -1908,7 +1957,7 @@ void ath10k_ce_alloc_rri(struct ath10k *ar)
lower_32_bits(ce->paddr_rri));
ath10k_ce_write32(ar, ar->hw_ce_regs->ce_rri_high,
(upper_32_bits(ce->paddr_rri) &
- CE_DESC_FLAGS_GET_MASK));
+ CE_DESC_ADDR_HI_MASK));
for (i = 0; i < CE_COUNT; i++) {
ctrl1_regs = ar->hw_ce_regs->ctrl1_regs->addr;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index b8fb538..c680f19 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -39,8 +39,8 @@ struct ath10k_ce_pipe;
#define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
#define CE_WCN3990_DESC_FLAGS_GATHER BIT(31)
-#define CE_DESC_FLAGS_GET_MASK GENMASK(4, 0)
-#define CE_DESC_37BIT_ADDR_MASK GENMASK_ULL(37, 0)
+#define CE_DESC_ADDR_MASK GENMASK_ULL(34, 0)
+#define CE_DESC_ADDR_HI_MASK GENMASK(4, 0)
/* Following desc flags are used in QCA99X0 */
#define CE_DESC_FLAGS_HOST_INT_DIS (1 << 2)
@@ -104,7 +104,7 @@ struct ath10k_ce_ring {
/* Host address space */
void *base_addr_owner_space_unaligned;
/* CE address space */
- u32 base_addr_ce_space_unaligned;
+ dma_addr_t base_addr_ce_space_unaligned;
/*
* Actual start of descriptors.
@@ -115,7 +115,7 @@ struct ath10k_ce_ring {
void *base_addr_owner_space;
/* CE address space */
- u32 base_addr_ce_space;
+ dma_addr_t base_addr_ce_space;
char *shadow_base_unaligned;
struct ce_desc *shadow_base;
@@ -331,6 +331,12 @@ struct ath10k_ce_ops {
void *per_transfer_context,
dma_addr_t buffer, u32 nbytes,
u32 transfer_id, u32 flags);
+ void (*ce_set_src_ring_base_addr_hi)(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr);
+ void (*ce_set_dest_ring_base_addr_hi)(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr);
};
static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id)
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index be5b52a..25eed5a 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1359,7 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,
u16 msdu_id, flags1 = 0;
u16 freq = 0;
dma_addr_t frags_paddr = 0;
- u32 txbuf_paddr;
+ dma_addr_t txbuf_paddr;
struct htt_msdu_ext_desc_64 *ext_desc = NULL;
struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index 677535b..343106c 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -317,9 +317,11 @@ static struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {
};
const struct ath10k_hw_ce_regs wcn3990_ce_regs = {
- .sr_base_addr = 0x00000000,
+ .sr_base_addr_lo = 0x00000000,
+ .sr_base_addr_hi = 0x00000004,
.sr_size_addr = 0x00000008,
- .dr_base_addr = 0x0000000c,
+ .dr_base_addr_lo = 0x0000000c,
+ .dr_base_addr_hi = 0x00000010,
.dr_size_addr = 0x00000014,
.misc_ie_addr = 0x00000034,
.sr_wr_index_addr = 0x0000003c,
@@ -463,9 +465,9 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {
};
const struct ath10k_hw_ce_regs qcax_ce_regs = {
- .sr_base_addr = 0x00000000,
+ .sr_base_addr_lo = 0x00000000,
.sr_size_addr = 0x00000004,
- .dr_base_addr = 0x00000008,
+ .dr_base_addr_lo = 0x00000008,
.dr_size_addr = 0x0000000c,
.ce_cmd_addr = 0x00000018,
.misc_ie_addr = 0x00000034,
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 7a8da75..c7162a2 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -343,9 +343,11 @@ struct ath10k_hw_ce_ctrl1_upd {
};
struct ath10k_hw_ce_regs {
- u32 sr_base_addr;
+ u32 sr_base_addr_lo;
+ u32 sr_base_addr_hi;
u32 sr_size_addr;
- u32 dr_base_addr;
+ u32 dr_base_addr_lo;
+ u32 dr_base_addr_hi;
u32 dr_size_addr;
u32 ce_cmd_addr;
u32 misc_ie_addr;
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index e9a6b3d..c7f1960 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -65,7 +65,7 @@ static void ath10k_snoc_htt_htc_rx_cb(struct ath10k_ce_pipe *ce_state);
static const struct ath10k_snoc_drv_priv drv_priv = {
.hw_rev = ATH10K_HW_WCN3990,
- .dma_mask = DMA_BIT_MASK(37),
+ .dma_mask = DMA_BIT_MASK(35),
.msa_size = 0x100000,
};
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] ath10k: Set DMA address mask to 35 bit for WCN3990
@ 2018-08-06 14:48 ` Rakesh Pillai
0 siblings, 0 replies; 4+ messages in thread
From: Rakesh Pillai @ 2018-08-06 14:48 UTC (permalink / raw)
To: ath10k; +Cc: Rakesh Pillai, linux-wireless
WCN3990 is a 37-bit target but can address memory range
only upto 35 bits. The 36th bit is used to control the
smmu/iommu translation and the 37th bit is used by the
internal bus masters to access the wifi subsystem internal
SRAM. With the DMA mask set to 37i-bit, the host driver
can get 37-bit dma address, which leads to incorrect
address access in the target.
Hence the host driver can used addresses upto 35-bit
for WCN3990. Fix the dma mask for wcn3990 to 35-bit,
instead of 37-bit.
Tested HW: WCN3990
Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
---
drivers/net/wireless/ath/ath10k/ce.c | 71 +++++++++++++++++++++++++++-----
drivers/net/wireless/ath/ath10k/ce.h | 14 +++++--
drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +-
drivers/net/wireless/ath/ath10k/hw.c | 10 +++--
drivers/net/wireless/ath/ath10k/hw.h | 6 ++-
drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
6 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index 18c709c..240b717 100644
--- a/drivers/net/wireless/ath/ath10k/ce.c
+++ b/drivers/net/wireless/ath/ath10k/ce.c
@@ -228,11 +228,31 @@ ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,
}
static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,
- u32 ce_ctrl_addr,
- unsigned int addr)
+ u32 ce_id,
+ u64 addr)
+{
+ struct ath10k_ce *ce = ath10k_ce_priv(ar);
+ struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+ u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+ u32 addr_lo = lower_32_bits(addr);
+
+ ath10k_ce_write32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->sr_base_addr_lo, addr_lo);
+
+ if (ce_state->ops->ce_set_src_ring_base_addr_hi) {
+ ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr,
+ addr);
+ }
+}
+
+static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr)
{
+ u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+
ath10k_ce_write32(ar, ce_ctrl_addr +
- ar->hw_ce_regs->sr_base_addr, addr);
+ ar->hw_ce_regs->sr_base_addr_hi, addr_hi);
}
static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar,
@@ -313,11 +333,36 @@ static inline u32 ath10k_ce_dest_ring_read_index_get(struct ath10k *ar,
}
static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k *ar,
- u32 ce_ctrl_addr,
- u32 addr)
+ u32 ce_id,
+ u64 addr)
{
+ struct ath10k_ce *ce = ath10k_ce_priv(ar);
+ struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
+ u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
+ u32 addr_lo = lower_32_bits(addr);
+
+ ath10k_ce_write32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->dr_base_addr_lo, addr_lo);
+
+ if (ce_state->ops->ce_set_dest_ring_base_addr_hi) {
+ ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr,
+ addr);
+ }
+}
+
+static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr)
+{
+ u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
+ u32 reg_value;
+
+ reg_value = ath10k_ce_read32(ar, ce_ctrl_addr +
+ ar->hw_ce_regs->dr_base_addr_hi);
+ reg_value &= ~CE_DESC_ADDR_HI_MASK;
+ reg_value |= addr_hi;
ath10k_ce_write32(ar, ce_ctrl_addr +
- ar->hw_ce_regs->dr_base_addr, addr);
+ ar->hw_ce_regs->dr_base_addr_hi, reg_value);
}
static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar,
@@ -563,7 +608,7 @@ static int _ath10k_ce_send_nolock_64(struct ath10k_ce_pipe *ce_state,
addr = (__le32 *)&sdesc.addr;
- flags |= upper_32_bits(buffer) & CE_DESC_FLAGS_GET_MASK;
+ flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK;
addr[0] = __cpu_to_le32(buffer);
addr[1] = __cpu_to_le32(flags);
if (flags & CE_SEND_FLAG_GATHER)
@@ -731,7 +776,7 @@ static int __ath10k_ce_rx_post_buf_64(struct ath10k_ce_pipe *pipe,
return -ENOSPC;
desc->addr = __cpu_to_le64(paddr);
- desc->addr &= __cpu_to_le64(CE_DESC_37BIT_ADDR_MASK);
+ desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK);
desc->nbytes = 0;
@@ -1336,7 +1381,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar,
ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);
src_ring->write_index &= src_ring->nentries_mask;
- ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,
+ ath10k_ce_src_ring_base_addr_set(ar, ce_id,
src_ring->base_addr_ce_space);
ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, attr->src_sz_max);
@@ -1375,7 +1420,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar,
ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);
dest_ring->write_index &= dest_ring->nentries_mask;
- ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,
+ ath10k_ce_dest_ring_base_addr_set(ar, ce_id,
dest_ring->base_addr_ce_space);
ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);
ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);
@@ -1801,6 +1846,8 @@ static const struct ath10k_ce_ops ce_ops = {
.ce_extract_desc_data = ath10k_ce_extract_desc_data,
.ce_free_pipe = _ath10k_ce_free_pipe,
.ce_send_nolock = _ath10k_ce_send_nolock,
+ .ce_set_src_ring_base_addr_hi = NULL,
+ .ce_set_dest_ring_base_addr_hi = NULL,
};
static const struct ath10k_ce_ops ce_64_ops = {
@@ -1813,6 +1860,8 @@ static const struct ath10k_ce_ops ce_64_ops = {
.ce_extract_desc_data = ath10k_ce_extract_desc_data_64,
.ce_free_pipe = _ath10k_ce_free_pipe_64,
.ce_send_nolock = _ath10k_ce_send_nolock_64,
+ .ce_set_src_ring_base_addr_hi = ath10k_ce_set_src_ring_base_addr_hi,
+ .ce_set_dest_ring_base_addr_hi = ath10k_ce_set_dest_ring_base_addr_hi,
};
static void ath10k_ce_set_ops(struct ath10k *ar,
@@ -1908,7 +1957,7 @@ void ath10k_ce_alloc_rri(struct ath10k *ar)
lower_32_bits(ce->paddr_rri));
ath10k_ce_write32(ar, ar->hw_ce_regs->ce_rri_high,
(upper_32_bits(ce->paddr_rri) &
- CE_DESC_FLAGS_GET_MASK));
+ CE_DESC_ADDR_HI_MASK));
for (i = 0; i < CE_COUNT; i++) {
ctrl1_regs = ar->hw_ce_regs->ctrl1_regs->addr;
diff --git a/drivers/net/wireless/ath/ath10k/ce.h b/drivers/net/wireless/ath/ath10k/ce.h
index b8fb538..c680f19 100644
--- a/drivers/net/wireless/ath/ath10k/ce.h
+++ b/drivers/net/wireless/ath/ath10k/ce.h
@@ -39,8 +39,8 @@ struct ath10k_ce_pipe;
#define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
#define CE_WCN3990_DESC_FLAGS_GATHER BIT(31)
-#define CE_DESC_FLAGS_GET_MASK GENMASK(4, 0)
-#define CE_DESC_37BIT_ADDR_MASK GENMASK_ULL(37, 0)
+#define CE_DESC_ADDR_MASK GENMASK_ULL(34, 0)
+#define CE_DESC_ADDR_HI_MASK GENMASK(4, 0)
/* Following desc flags are used in QCA99X0 */
#define CE_DESC_FLAGS_HOST_INT_DIS (1 << 2)
@@ -104,7 +104,7 @@ struct ath10k_ce_ring {
/* Host address space */
void *base_addr_owner_space_unaligned;
/* CE address space */
- u32 base_addr_ce_space_unaligned;
+ dma_addr_t base_addr_ce_space_unaligned;
/*
* Actual start of descriptors.
@@ -115,7 +115,7 @@ struct ath10k_ce_ring {
void *base_addr_owner_space;
/* CE address space */
- u32 base_addr_ce_space;
+ dma_addr_t base_addr_ce_space;
char *shadow_base_unaligned;
struct ce_desc *shadow_base;
@@ -331,6 +331,12 @@ struct ath10k_ce_ops {
void *per_transfer_context,
dma_addr_t buffer, u32 nbytes,
u32 transfer_id, u32 flags);
+ void (*ce_set_src_ring_base_addr_hi)(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr);
+ void (*ce_set_dest_ring_base_addr_hi)(struct ath10k *ar,
+ u32 ce_ctrl_addr,
+ u64 addr);
};
static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned int ce_id)
diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c b/drivers/net/wireless/ath/ath10k/htt_tx.c
index be5b52a..25eed5a 100644
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1359,7 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt,
u16 msdu_id, flags1 = 0;
u16 freq = 0;
dma_addr_t frags_paddr = 0;
- u32 txbuf_paddr;
+ dma_addr_t txbuf_paddr;
struct htt_msdu_ext_desc_64 *ext_desc = NULL;
struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;
diff --git a/drivers/net/wireless/ath/ath10k/hw.c b/drivers/net/wireless/ath/ath10k/hw.c
index 677535b..343106c 100644
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -317,9 +317,11 @@ static struct ath10k_hw_ce_ctrl1_upd wcn3990_ctrl1_upd = {
};
const struct ath10k_hw_ce_regs wcn3990_ce_regs = {
- .sr_base_addr = 0x00000000,
+ .sr_base_addr_lo = 0x00000000,
+ .sr_base_addr_hi = 0x00000004,
.sr_size_addr = 0x00000008,
- .dr_base_addr = 0x0000000c,
+ .dr_base_addr_lo = 0x0000000c,
+ .dr_base_addr_hi = 0x00000010,
.dr_size_addr = 0x00000014,
.misc_ie_addr = 0x00000034,
.sr_wr_index_addr = 0x0000003c,
@@ -463,9 +465,9 @@ static struct ath10k_hw_ce_dst_src_wm_regs qcax_wm_dst_ring = {
};
const struct ath10k_hw_ce_regs qcax_ce_regs = {
- .sr_base_addr = 0x00000000,
+ .sr_base_addr_lo = 0x00000000,
.sr_size_addr = 0x00000004,
- .dr_base_addr = 0x00000008,
+ .dr_base_addr_lo = 0x00000008,
.dr_size_addr = 0x0000000c,
.ce_cmd_addr = 0x00000018,
.misc_ie_addr = 0x00000034,
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
index 7a8da75..c7162a2 100644
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -343,9 +343,11 @@ struct ath10k_hw_ce_ctrl1_upd {
};
struct ath10k_hw_ce_regs {
- u32 sr_base_addr;
+ u32 sr_base_addr_lo;
+ u32 sr_base_addr_hi;
u32 sr_size_addr;
- u32 dr_base_addr;
+ u32 dr_base_addr_lo;
+ u32 dr_base_addr_hi;
u32 dr_size_addr;
u32 ce_cmd_addr;
u32 misc_ie_addr;
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c
index e9a6b3d..c7f1960 100644
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -65,7 +65,7 @@ static void ath10k_snoc_htt_htc_rx_cb(struct ath10k_ce_pipe *ce_state);
static const struct ath10k_snoc_drv_priv drv_priv = {
.hw_rev = ATH10K_HW_WCN3990,
- .dma_mask = DMA_BIT_MASK(37),
+ .dma_mask = DMA_BIT_MASK(35),
.msa_size = 0x100000,
};
--
2.7.4
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ath10k: Set DMA address mask to 35 bit for WCN3990
2018-08-06 14:48 ` Rakesh Pillai
@ 2018-09-03 16:39 ` Rakesh Pillai
-1 siblings, 0 replies; 4+ messages in thread
From: Rakesh Pillai @ 2018-09-03 16:39 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless
On 2018-08-06 20:18, Rakesh Pillai wrote:
> WCN3990 is a 37-bit target but can address memory range
> only upto 35 bits. The 36th bit is used to control the
> smmu/iommu translation and the 37th bit is used by the
> internal bus masters to access the wifi subsystem internal
> SRAM. With the DMA mask set to 37i-bit, the host driver
> can get 37-bit dma address, which leads to incorrect
> address access in the target.
>
> Hence the host driver can used addresses upto 35-bit
> for WCN3990. Fix the dma mask for wcn3990 to 35-bit,
> instead of 37-bit.
>
> Tested HW: WCN3990
> Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
>
> Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
> ---
> drivers/net/wireless/ath/ath10k/ce.c | 71
> +++++++++++++++++++++++++++-----
> drivers/net/wireless/ath/ath10k/ce.h | 14 +++++--
> drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +-
> drivers/net/wireless/ath/ath10k/hw.c | 10 +++--
> drivers/net/wireless/ath/ath10k/hw.h | 6 ++-
> drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
> 6 files changed, 82 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/ce.c
> b/drivers/net/wireless/ath/ath10k/ce.c
> index 18c709c..240b717 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.c
> +++ b/drivers/net/wireless/ath/ath10k/ce.c
> @@ -228,11 +228,31 @@
> ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,
> }
>
> static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,
> - u32 ce_ctrl_addr,
> - unsigned int addr)
> + u32 ce_id,
> + u64 addr)
> +{
> + struct ath10k_ce *ce = ath10k_ce_priv(ar);
> + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
> + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
> + u32 addr_lo = lower_32_bits(addr);
> +
> + ath10k_ce_write32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->sr_base_addr_lo, addr_lo);
> +
> + if (ce_state->ops->ce_set_src_ring_base_addr_hi) {
> + ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr,
> + addr);
> + }
> +}
> +
> +static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr)
> {
> + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
> +
> ath10k_ce_write32(ar, ce_ctrl_addr +
> - ar->hw_ce_regs->sr_base_addr, addr);
> + ar->hw_ce_regs->sr_base_addr_hi, addr_hi);
> }
>
> static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar,
> @@ -313,11 +333,36 @@ static inline u32
> ath10k_ce_dest_ring_read_index_get(struct ath10k *ar,
> }
>
> static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k
> *ar,
> - u32 ce_ctrl_addr,
> - u32 addr)
> + u32 ce_id,
> + u64 addr)
> {
> + struct ath10k_ce *ce = ath10k_ce_priv(ar);
> + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
> + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
> + u32 addr_lo = lower_32_bits(addr);
> +
> + ath10k_ce_write32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->dr_base_addr_lo, addr_lo);
> +
> + if (ce_state->ops->ce_set_dest_ring_base_addr_hi) {
> + ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr,
> + addr);
> + }
> +}
> +
> +static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr)
> +{
> + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
> + u32 reg_value;
> +
> + reg_value = ath10k_ce_read32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->dr_base_addr_hi);
> + reg_value &= ~CE_DESC_ADDR_HI_MASK;
> + reg_value |= addr_hi;
> ath10k_ce_write32(ar, ce_ctrl_addr +
> - ar->hw_ce_regs->dr_base_addr, addr);
> + ar->hw_ce_regs->dr_base_addr_hi, reg_value);
> }
>
> static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar,
> @@ -563,7 +608,7 @@ static int _ath10k_ce_send_nolock_64(struct
> ath10k_ce_pipe *ce_state,
>
> addr = (__le32 *)&sdesc.addr;
>
> - flags |= upper_32_bits(buffer) & CE_DESC_FLAGS_GET_MASK;
> + flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK;
> addr[0] = __cpu_to_le32(buffer);
> addr[1] = __cpu_to_le32(flags);
> if (flags & CE_SEND_FLAG_GATHER)
> @@ -731,7 +776,7 @@ static int __ath10k_ce_rx_post_buf_64(struct
> ath10k_ce_pipe *pipe,
> return -ENOSPC;
>
> desc->addr = __cpu_to_le64(paddr);
> - desc->addr &= __cpu_to_le64(CE_DESC_37BIT_ADDR_MASK);
> + desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK);
>
> desc->nbytes = 0;
>
> @@ -1336,7 +1381,7 @@ static int ath10k_ce_init_src_ring(struct ath10k
> *ar,
> ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);
> src_ring->write_index &= src_ring->nentries_mask;
>
> - ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,
> + ath10k_ce_src_ring_base_addr_set(ar, ce_id,
> src_ring->base_addr_ce_space);
> ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
> ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, attr->src_sz_max);
> @@ -1375,7 +1420,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k
> *ar,
> ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);
> dest_ring->write_index &= dest_ring->nentries_mask;
>
> - ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,
> + ath10k_ce_dest_ring_base_addr_set(ar, ce_id,
> dest_ring->base_addr_ce_space);
> ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);
> ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);
> @@ -1801,6 +1846,8 @@ static const struct ath10k_ce_ops ce_ops = {
> .ce_extract_desc_data = ath10k_ce_extract_desc_data,
> .ce_free_pipe = _ath10k_ce_free_pipe,
> .ce_send_nolock = _ath10k_ce_send_nolock,
> + .ce_set_src_ring_base_addr_hi = NULL,
> + .ce_set_dest_ring_base_addr_hi = NULL,
> };
>
> static const struct ath10k_ce_ops ce_64_ops = {
> @@ -1813,6 +1860,8 @@ static const struct ath10k_ce_ops ce_64_ops = {
> .ce_extract_desc_data = ath10k_ce_extract_desc_data_64,
> .ce_free_pipe = _ath10k_ce_free_pipe_64,
> .ce_send_nolock = _ath10k_ce_send_nolock_64,
> + .ce_set_src_ring_base_addr_hi = ath10k_ce_set_src_ring_base_addr_hi,
> + .ce_set_dest_ring_base_addr_hi =
> ath10k_ce_set_dest_ring_base_addr_hi,
> };
>
> static void ath10k_ce_set_ops(struct ath10k *ar,
> @@ -1908,7 +1957,7 @@ void ath10k_ce_alloc_rri(struct ath10k *ar)
> lower_32_bits(ce->paddr_rri));
> ath10k_ce_write32(ar, ar->hw_ce_regs->ce_rri_high,
> (upper_32_bits(ce->paddr_rri) &
> - CE_DESC_FLAGS_GET_MASK));
> + CE_DESC_ADDR_HI_MASK));
>
> for (i = 0; i < CE_COUNT; i++) {
> ctrl1_regs = ar->hw_ce_regs->ctrl1_regs->addr;
> diff --git a/drivers/net/wireless/ath/ath10k/ce.h
> b/drivers/net/wireless/ath/ath10k/ce.h
> index b8fb538..c680f19 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.h
> +++ b/drivers/net/wireless/ath/ath10k/ce.h
> @@ -39,8 +39,8 @@ struct ath10k_ce_pipe;
> #define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
> #define CE_WCN3990_DESC_FLAGS_GATHER BIT(31)
>
> -#define CE_DESC_FLAGS_GET_MASK GENMASK(4, 0)
> -#define CE_DESC_37BIT_ADDR_MASK GENMASK_ULL(37, 0)
> +#define CE_DESC_ADDR_MASK GENMASK_ULL(34, 0)
> +#define CE_DESC_ADDR_HI_MASK GENMASK(4, 0)
>
> /* Following desc flags are used in QCA99X0 */
> #define CE_DESC_FLAGS_HOST_INT_DIS (1 << 2)
> @@ -104,7 +104,7 @@ struct ath10k_ce_ring {
> /* Host address space */
> void *base_addr_owner_space_unaligned;
> /* CE address space */
> - u32 base_addr_ce_space_unaligned;
> + dma_addr_t base_addr_ce_space_unaligned;
>
> /*
> * Actual start of descriptors.
> @@ -115,7 +115,7 @@ struct ath10k_ce_ring {
> void *base_addr_owner_space;
>
> /* CE address space */
> - u32 base_addr_ce_space;
> + dma_addr_t base_addr_ce_space;
>
> char *shadow_base_unaligned;
> struct ce_desc *shadow_base;
> @@ -331,6 +331,12 @@ struct ath10k_ce_ops {
> void *per_transfer_context,
> dma_addr_t buffer, u32 nbytes,
> u32 transfer_id, u32 flags);
> + void (*ce_set_src_ring_base_addr_hi)(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr);
> + void (*ce_set_dest_ring_base_addr_hi)(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr);
> };
>
> static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned
> int ce_id)
> diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c
> b/drivers/net/wireless/ath/ath10k/htt_tx.c
> index be5b52a..25eed5a 100644
> --- a/drivers/net/wireless/ath/ath10k/htt_tx.c
> +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
> @@ -1359,7 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt
> *htt,
> u16 msdu_id, flags1 = 0;
> u16 freq = 0;
> dma_addr_t frags_paddr = 0;
> - u32 txbuf_paddr;
> + dma_addr_t txbuf_paddr;
> struct htt_msdu_ext_desc_64 *ext_desc = NULL;
> struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;
>
> diff --git a/drivers/net/wireless/ath/ath10k/hw.c
> b/drivers/net/wireless/ath/ath10k/hw.c
> index 677535b..343106c 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.c
> +++ b/drivers/net/wireless/ath/ath10k/hw.c
> @@ -317,9 +317,11 @@ static struct ath10k_hw_ce_ctrl1_upd
> wcn3990_ctrl1_upd = {
> };
>
> const struct ath10k_hw_ce_regs wcn3990_ce_regs = {
> - .sr_base_addr = 0x00000000,
> + .sr_base_addr_lo = 0x00000000,
> + .sr_base_addr_hi = 0x00000004,
> .sr_size_addr = 0x00000008,
> - .dr_base_addr = 0x0000000c,
> + .dr_base_addr_lo = 0x0000000c,
> + .dr_base_addr_hi = 0x00000010,
> .dr_size_addr = 0x00000014,
> .misc_ie_addr = 0x00000034,
> .sr_wr_index_addr = 0x0000003c,
> @@ -463,9 +465,9 @@ static struct ath10k_hw_ce_dst_src_wm_regs
> qcax_wm_dst_ring = {
> };
>
> const struct ath10k_hw_ce_regs qcax_ce_regs = {
> - .sr_base_addr = 0x00000000,
> + .sr_base_addr_lo = 0x00000000,
> .sr_size_addr = 0x00000004,
> - .dr_base_addr = 0x00000008,
> + .dr_base_addr_lo = 0x00000008,
> .dr_size_addr = 0x0000000c,
> .ce_cmd_addr = 0x00000018,
> .misc_ie_addr = 0x00000034,
> diff --git a/drivers/net/wireless/ath/ath10k/hw.h
> b/drivers/net/wireless/ath/ath10k/hw.h
> index 7a8da75..c7162a2 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.h
> +++ b/drivers/net/wireless/ath/ath10k/hw.h
Hi,
I have sent v2 for this patchset with correction in arguments for
ath10k_ce_src_ring_base_addr_set and ath10k_ce_dest_ring_base_addr_set.
Thanks,
Rakesh Pillai.
> @@ -343,9 +343,11 @@ struct ath10k_hw_ce_ctrl1_upd {
> };
>
> struct ath10k_hw_ce_regs {
> - u32 sr_base_addr;
> + u32 sr_base_addr_lo;
> + u32 sr_base_addr_hi;
> u32 sr_size_addr;
> - u32 dr_base_addr;
> + u32 dr_base_addr_lo;
> + u32 dr_base_addr_hi;
> u32 dr_size_addr;
> u32 ce_cmd_addr;
> u32 misc_ie_addr;
> diff --git a/drivers/net/wireless/ath/ath10k/snoc.c
> b/drivers/net/wireless/ath/ath10k/snoc.c
> index e9a6b3d..c7f1960 100644
> --- a/drivers/net/wireless/ath/ath10k/snoc.c
> +++ b/drivers/net/wireless/ath/ath10k/snoc.c
> @@ -65,7 +65,7 @@ static void ath10k_snoc_htt_htc_rx_cb(struct
> ath10k_ce_pipe *ce_state);
>
> static const struct ath10k_snoc_drv_priv drv_priv = {
> .hw_rev = ATH10K_HW_WCN3990,
> - .dma_mask = DMA_BIT_MASK(37),
> + .dma_mask = DMA_BIT_MASK(35),
> .msa_size = 0x100000,
> };
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ath10k: Set DMA address mask to 35 bit for WCN3990
@ 2018-09-03 16:39 ` Rakesh Pillai
0 siblings, 0 replies; 4+ messages in thread
From: Rakesh Pillai @ 2018-09-03 16:39 UTC (permalink / raw)
To: ath10k; +Cc: linux-wireless
On 2018-08-06 20:18, Rakesh Pillai wrote:
> WCN3990 is a 37-bit target but can address memory range
> only upto 35 bits. The 36th bit is used to control the
> smmu/iommu translation and the 37th bit is used by the
> internal bus masters to access the wifi subsystem internal
> SRAM. With the DMA mask set to 37i-bit, the host driver
> can get 37-bit dma address, which leads to incorrect
> address access in the target.
>
> Hence the host driver can used addresses upto 35-bit
> for WCN3990. Fix the dma mask for wcn3990 to 35-bit,
> instead of 37-bit.
>
> Tested HW: WCN3990
> Tested FW: WLAN.HL.2.0-01188-QCAHLSWMTPLZ-1
>
> Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
> ---
> drivers/net/wireless/ath/ath10k/ce.c | 71
> +++++++++++++++++++++++++++-----
> drivers/net/wireless/ath/ath10k/ce.h | 14 +++++--
> drivers/net/wireless/ath/ath10k/htt_tx.c | 2 +-
> drivers/net/wireless/ath/ath10k/hw.c | 10 +++--
> drivers/net/wireless/ath/ath10k/hw.h | 6 ++-
> drivers/net/wireless/ath/ath10k/snoc.c | 2 +-
> 6 files changed, 82 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath10k/ce.c
> b/drivers/net/wireless/ath/ath10k/ce.c
> index 18c709c..240b717 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.c
> +++ b/drivers/net/wireless/ath/ath10k/ce.c
> @@ -228,11 +228,31 @@
> ath10k_ce_shadow_dest_ring_write_index_set(struct ath10k *ar,
> }
>
> static inline void ath10k_ce_src_ring_base_addr_set(struct ath10k *ar,
> - u32 ce_ctrl_addr,
> - unsigned int addr)
> + u32 ce_id,
> + u64 addr)
> +{
> + struct ath10k_ce *ce = ath10k_ce_priv(ar);
> + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
> + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
> + u32 addr_lo = lower_32_bits(addr);
> +
> + ath10k_ce_write32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->sr_base_addr_lo, addr_lo);
> +
> + if (ce_state->ops->ce_set_src_ring_base_addr_hi) {
> + ce_state->ops->ce_set_src_ring_base_addr_hi(ar, ce_ctrl_addr,
> + addr);
> + }
> +}
> +
> +static void ath10k_ce_set_src_ring_base_addr_hi(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr)
> {
> + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
> +
> ath10k_ce_write32(ar, ce_ctrl_addr +
> - ar->hw_ce_regs->sr_base_addr, addr);
> + ar->hw_ce_regs->sr_base_addr_hi, addr_hi);
> }
>
> static inline void ath10k_ce_src_ring_size_set(struct ath10k *ar,
> @@ -313,11 +333,36 @@ static inline u32
> ath10k_ce_dest_ring_read_index_get(struct ath10k *ar,
> }
>
> static inline void ath10k_ce_dest_ring_base_addr_set(struct ath10k
> *ar,
> - u32 ce_ctrl_addr,
> - u32 addr)
> + u32 ce_id,
> + u64 addr)
> {
> + struct ath10k_ce *ce = ath10k_ce_priv(ar);
> + struct ath10k_ce_pipe *ce_state = &ce->ce_states[ce_id];
> + u32 ce_ctrl_addr = ath10k_ce_base_address(ar, ce_id);
> + u32 addr_lo = lower_32_bits(addr);
> +
> + ath10k_ce_write32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->dr_base_addr_lo, addr_lo);
> +
> + if (ce_state->ops->ce_set_dest_ring_base_addr_hi) {
> + ce_state->ops->ce_set_dest_ring_base_addr_hi(ar, ce_ctrl_addr,
> + addr);
> + }
> +}
> +
> +static void ath10k_ce_set_dest_ring_base_addr_hi(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr)
> +{
> + u32 addr_hi = upper_32_bits(addr) & CE_DESC_ADDR_HI_MASK;
> + u32 reg_value;
> +
> + reg_value = ath10k_ce_read32(ar, ce_ctrl_addr +
> + ar->hw_ce_regs->dr_base_addr_hi);
> + reg_value &= ~CE_DESC_ADDR_HI_MASK;
> + reg_value |= addr_hi;
> ath10k_ce_write32(ar, ce_ctrl_addr +
> - ar->hw_ce_regs->dr_base_addr, addr);
> + ar->hw_ce_regs->dr_base_addr_hi, reg_value);
> }
>
> static inline void ath10k_ce_dest_ring_size_set(struct ath10k *ar,
> @@ -563,7 +608,7 @@ static int _ath10k_ce_send_nolock_64(struct
> ath10k_ce_pipe *ce_state,
>
> addr = (__le32 *)&sdesc.addr;
>
> - flags |= upper_32_bits(buffer) & CE_DESC_FLAGS_GET_MASK;
> + flags |= upper_32_bits(buffer) & CE_DESC_ADDR_HI_MASK;
> addr[0] = __cpu_to_le32(buffer);
> addr[1] = __cpu_to_le32(flags);
> if (flags & CE_SEND_FLAG_GATHER)
> @@ -731,7 +776,7 @@ static int __ath10k_ce_rx_post_buf_64(struct
> ath10k_ce_pipe *pipe,
> return -ENOSPC;
>
> desc->addr = __cpu_to_le64(paddr);
> - desc->addr &= __cpu_to_le64(CE_DESC_37BIT_ADDR_MASK);
> + desc->addr &= __cpu_to_le64(CE_DESC_ADDR_MASK);
>
> desc->nbytes = 0;
>
> @@ -1336,7 +1381,7 @@ static int ath10k_ce_init_src_ring(struct ath10k
> *ar,
> ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);
> src_ring->write_index &= src_ring->nentries_mask;
>
> - ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,
> + ath10k_ce_src_ring_base_addr_set(ar, ce_id,
> src_ring->base_addr_ce_space);
> ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
> ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, attr->src_sz_max);
> @@ -1375,7 +1420,7 @@ static int ath10k_ce_init_dest_ring(struct ath10k
> *ar,
> ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);
> dest_ring->write_index &= dest_ring->nentries_mask;
>
> - ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,
> + ath10k_ce_dest_ring_base_addr_set(ar, ce_id,
> dest_ring->base_addr_ce_space);
> ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);
> ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);
> @@ -1801,6 +1846,8 @@ static const struct ath10k_ce_ops ce_ops = {
> .ce_extract_desc_data = ath10k_ce_extract_desc_data,
> .ce_free_pipe = _ath10k_ce_free_pipe,
> .ce_send_nolock = _ath10k_ce_send_nolock,
> + .ce_set_src_ring_base_addr_hi = NULL,
> + .ce_set_dest_ring_base_addr_hi = NULL,
> };
>
> static const struct ath10k_ce_ops ce_64_ops = {
> @@ -1813,6 +1860,8 @@ static const struct ath10k_ce_ops ce_64_ops = {
> .ce_extract_desc_data = ath10k_ce_extract_desc_data_64,
> .ce_free_pipe = _ath10k_ce_free_pipe_64,
> .ce_send_nolock = _ath10k_ce_send_nolock_64,
> + .ce_set_src_ring_base_addr_hi = ath10k_ce_set_src_ring_base_addr_hi,
> + .ce_set_dest_ring_base_addr_hi =
> ath10k_ce_set_dest_ring_base_addr_hi,
> };
>
> static void ath10k_ce_set_ops(struct ath10k *ar,
> @@ -1908,7 +1957,7 @@ void ath10k_ce_alloc_rri(struct ath10k *ar)
> lower_32_bits(ce->paddr_rri));
> ath10k_ce_write32(ar, ar->hw_ce_regs->ce_rri_high,
> (upper_32_bits(ce->paddr_rri) &
> - CE_DESC_FLAGS_GET_MASK));
> + CE_DESC_ADDR_HI_MASK));
>
> for (i = 0; i < CE_COUNT; i++) {
> ctrl1_regs = ar->hw_ce_regs->ctrl1_regs->addr;
> diff --git a/drivers/net/wireless/ath/ath10k/ce.h
> b/drivers/net/wireless/ath/ath10k/ce.h
> index b8fb538..c680f19 100644
> --- a/drivers/net/wireless/ath/ath10k/ce.h
> +++ b/drivers/net/wireless/ath/ath10k/ce.h
> @@ -39,8 +39,8 @@ struct ath10k_ce_pipe;
> #define CE_DESC_FLAGS_BYTE_SWAP (1 << 1)
> #define CE_WCN3990_DESC_FLAGS_GATHER BIT(31)
>
> -#define CE_DESC_FLAGS_GET_MASK GENMASK(4, 0)
> -#define CE_DESC_37BIT_ADDR_MASK GENMASK_ULL(37, 0)
> +#define CE_DESC_ADDR_MASK GENMASK_ULL(34, 0)
> +#define CE_DESC_ADDR_HI_MASK GENMASK(4, 0)
>
> /* Following desc flags are used in QCA99X0 */
> #define CE_DESC_FLAGS_HOST_INT_DIS (1 << 2)
> @@ -104,7 +104,7 @@ struct ath10k_ce_ring {
> /* Host address space */
> void *base_addr_owner_space_unaligned;
> /* CE address space */
> - u32 base_addr_ce_space_unaligned;
> + dma_addr_t base_addr_ce_space_unaligned;
>
> /*
> * Actual start of descriptors.
> @@ -115,7 +115,7 @@ struct ath10k_ce_ring {
> void *base_addr_owner_space;
>
> /* CE address space */
> - u32 base_addr_ce_space;
> + dma_addr_t base_addr_ce_space;
>
> char *shadow_base_unaligned;
> struct ce_desc *shadow_base;
> @@ -331,6 +331,12 @@ struct ath10k_ce_ops {
> void *per_transfer_context,
> dma_addr_t buffer, u32 nbytes,
> u32 transfer_id, u32 flags);
> + void (*ce_set_src_ring_base_addr_hi)(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr);
> + void (*ce_set_dest_ring_base_addr_hi)(struct ath10k *ar,
> + u32 ce_ctrl_addr,
> + u64 addr);
> };
>
> static inline u32 ath10k_ce_base_address(struct ath10k *ar, unsigned
> int ce_id)
> diff --git a/drivers/net/wireless/ath/ath10k/htt_tx.c
> b/drivers/net/wireless/ath/ath10k/htt_tx.c
> index be5b52a..25eed5a 100644
> --- a/drivers/net/wireless/ath/ath10k/htt_tx.c
> +++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
> @@ -1359,7 +1359,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt
> *htt,
> u16 msdu_id, flags1 = 0;
> u16 freq = 0;
> dma_addr_t frags_paddr = 0;
> - u32 txbuf_paddr;
> + dma_addr_t txbuf_paddr;
> struct htt_msdu_ext_desc_64 *ext_desc = NULL;
> struct htt_msdu_ext_desc_64 *ext_desc_t = NULL;
>
> diff --git a/drivers/net/wireless/ath/ath10k/hw.c
> b/drivers/net/wireless/ath/ath10k/hw.c
> index 677535b..343106c 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.c
> +++ b/drivers/net/wireless/ath/ath10k/hw.c
> @@ -317,9 +317,11 @@ static struct ath10k_hw_ce_ctrl1_upd
> wcn3990_ctrl1_upd = {
> };
>
> const struct ath10k_hw_ce_regs wcn3990_ce_regs = {
> - .sr_base_addr = 0x00000000,
> + .sr_base_addr_lo = 0x00000000,
> + .sr_base_addr_hi = 0x00000004,
> .sr_size_addr = 0x00000008,
> - .dr_base_addr = 0x0000000c,
> + .dr_base_addr_lo = 0x0000000c,
> + .dr_base_addr_hi = 0x00000010,
> .dr_size_addr = 0x00000014,
> .misc_ie_addr = 0x00000034,
> .sr_wr_index_addr = 0x0000003c,
> @@ -463,9 +465,9 @@ static struct ath10k_hw_ce_dst_src_wm_regs
> qcax_wm_dst_ring = {
> };
>
> const struct ath10k_hw_ce_regs qcax_ce_regs = {
> - .sr_base_addr = 0x00000000,
> + .sr_base_addr_lo = 0x00000000,
> .sr_size_addr = 0x00000004,
> - .dr_base_addr = 0x00000008,
> + .dr_base_addr_lo = 0x00000008,
> .dr_size_addr = 0x0000000c,
> .ce_cmd_addr = 0x00000018,
> .misc_ie_addr = 0x00000034,
> diff --git a/drivers/net/wireless/ath/ath10k/hw.h
> b/drivers/net/wireless/ath/ath10k/hw.h
> index 7a8da75..c7162a2 100644
> --- a/drivers/net/wireless/ath/ath10k/hw.h
> +++ b/drivers/net/wireless/ath/ath10k/hw.h
Hi,
I have sent v2 for this patchset with correction in arguments for
ath10k_ce_src_ring_base_addr_set and ath10k_ce_dest_ring_base_addr_set.
Thanks,
Rakesh Pillai.
> @@ -343,9 +343,11 @@ struct ath10k_hw_ce_ctrl1_upd {
> };
>
> struct ath10k_hw_ce_regs {
> - u32 sr_base_addr;
> + u32 sr_base_addr_lo;
> + u32 sr_base_addr_hi;
> u32 sr_size_addr;
> - u32 dr_base_addr;
> + u32 dr_base_addr_lo;
> + u32 dr_base_addr_hi;
> u32 dr_size_addr;
> u32 ce_cmd_addr;
> u32 misc_ie_addr;
> diff --git a/drivers/net/wireless/ath/ath10k/snoc.c
> b/drivers/net/wireless/ath/ath10k/snoc.c
> index e9a6b3d..c7f1960 100644
> --- a/drivers/net/wireless/ath/ath10k/snoc.c
> +++ b/drivers/net/wireless/ath/ath10k/snoc.c
> @@ -65,7 +65,7 @@ static void ath10k_snoc_htt_htc_rx_cb(struct
> ath10k_ce_pipe *ce_state);
>
> static const struct ath10k_snoc_drv_priv drv_priv = {
> .hw_rev = ATH10K_HW_WCN3990,
> - .dma_mask = DMA_BIT_MASK(37),
> + .dma_mask = DMA_BIT_MASK(35),
> .msa_size = 0x100000,
> };
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-03 21:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-06 14:48 [PATCH] ath10k: Set DMA address mask to 35 bit for WCN3990 Rakesh Pillai
2018-08-06 14:48 ` Rakesh Pillai
2018-09-03 16:39 ` Rakesh Pillai
2018-09-03 16:39 ` Rakesh Pillai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.