ath10k: Set DMA address mask to 35 bit for WCN3990

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

Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/ce.c b/drivers/net/wireless/ath/ath10k/ce.c
index f6d3ecbdd3a32c42a6715247e0aee28ee018d1b4..a3d0d68a7b531dd40f0cd460d58724f50b5d660c 100644 (file)
--- 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;
 
@@ -1346,7 +1391,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);
@@ -1385,7 +1430,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);
@@ -1661,7 +1706,7 @@ static void ath10k_ce_deinit_src_ring(struct ath10k *ar, unsigned int ce_id)
 {
        u32 ctrl_addr = ath10k_ce_base_address(ar, ce_id);
 
-       ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr, 0);
+       ath10k_ce_src_ring_base_addr_set(ar, ce_id, 0);
        ath10k_ce_src_ring_size_set(ar, ctrl_addr, 0);
        ath10k_ce_src_ring_dmax_set(ar, ctrl_addr, 0);
        ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, 0);
@@ -1671,7 +1716,7 @@ static void ath10k_ce_deinit_dest_ring(struct ath10k *ar, unsigned int ce_id)
 {
        u32 ctrl_addr = ath10k_ce_base_address(ar, ce_id);
 
-       ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr, 0);
+       ath10k_ce_dest_ring_base_addr_set(ar, ce_id, 0);
        ath10k_ce_dest_ring_size_set(ar, ctrl_addr, 0);
        ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, 0);
 }
@@ -1803,6 +1848,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 = {
@@ -1815,6 +1862,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,
@@ -1910,7 +1959,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 ead9987c3259fc3683513aae4eaa8228f6f47cc1..c44a52e8a6af36c11c605b52f76cc6f64ea0aeab 100644 (file)
--- 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;
@@ -334,6 +334,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 ad05ab714c9b3160f3c42d59ac776c6b0de4066d..f811f96c88821e3f3e2ddaa46be3a504aec194d8 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
+++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
@@ -1498,7 +1498,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 61ecf931ba4de303f0a80c5c52efcf0c2880830f..48886b6b9056623651208250d5894c4dcdaf6a98 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/hw.c
+++ b/drivers/net/wireless/ath/ath10k/hw.c
@@ -318,9 +318,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,
@@ -464,9 +466,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 e50a8dc5b0933fc3e405217887df17d4aa5bf351..f03114740040ad1ba14cdddeada9dd9e3884f38b 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/hw.h
+++ b/drivers/net/wireless/ath/ath10k/hw.h
@@ -353,9 +353,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 54efe6be8f1d059e21981c0801e44e7ee200b95c..0032bc5dd9345a2632e70dda273bc02824559a0c 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/snoc.c
+++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -66,7 +66,7 @@ static void ath10k_snoc_pktlog_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,
 };