diff options
| author | Sunkad, Anand Ningappa <asunka@codeaurora.org> | 2016-02-12 12:59:12 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:22:06 -0700 |
| commit | 2aed535390cf82a5897fed50e465a9458300ffdf (patch) | |
| tree | c65a25f6f0f428d6c5eb5a15e6c9ace9f27ff7b8 | |
| parent | d40de35913359d1c189ff5408e346f8d2cddc149 (diff) | |
wcnss: Access A2xb split timeout limit register
Dump A2xb split timeout limit register, while dumping pronto
register dumps during pronto subsystem restart. To check a2xb
split time out value configured.
CRs-fixed: 975027
Change-Id: I1480d23b14f26dad59a552293e38bad9916ef0e4
Signed-off-by: Sunkad, Anand Ningappa <asunka@codeaurora.org>
| -rw-r--r-- | Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msm_defconfig | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/wcnss/wcnss_wlan.c | 12 |
4 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt index 6a775c3c280a..061c1d16ad24 100644 --- a/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt +++ b/Documentation/devicetree/bindings/wcnss/wcnss-wlan.txt @@ -57,6 +57,8 @@ support for pronto hardware. 6 - GPIO strength value - qcom,has-vsys-adc-channel: boolean flag to determine which ADC HW channel need to use for VBATT feature. +- qcom,has-a2xb-split-reg: boolean flag to determine A2xb split timeout limit +register is available or not. Example: diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig index 0c32329e23b0..37d512c954ee 100644 --- a/arch/arm64/configs/msm-perf_defconfig +++ b/arch/arm64/configs/msm-perf_defconfig @@ -246,6 +246,7 @@ CONFIG_PPPOLAC=y CONFIG_PPPOPNS=y CONFIG_USB_USBNET=y CONFIG_WCNSS_MEM_PRE_ALLOC=y +CONFIG_CNSS_CRYPTO=y CONFIG_ATH_CARDS=y CONFIG_WIL6210=m CONFIG_CNSS_PCI=y diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index 0c980c2b3bb3..f28272f07d0c 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -249,6 +249,7 @@ CONFIG_PPPOLAC=y CONFIG_PPPOPNS=y CONFIG_USB_USBNET=y CONFIG_WCNSS_MEM_PRE_ALLOC=y +CONFIG_CNSS_CRYPTO=y CONFIG_ATH_CARDS=y CONFIG_WIL6210=m CONFIG_CNSS_PCI=y diff --git a/drivers/net/wireless/wcnss/wcnss_wlan.c b/drivers/net/wireless/wcnss/wcnss_wlan.c index 17f310b41fc9..712f22d4a748 100644 --- a/drivers/net/wireless/wcnss/wcnss_wlan.c +++ b/drivers/net/wireless/wcnss/wcnss_wlan.c @@ -88,6 +88,7 @@ static DEFINE_SPINLOCK(reg_spinlock); #define CCU_RIVA_LAST_ADDR2_OFFSET 0x10c #define PRONTO_PMU_SPARE_OFFSET 0x1088 +#define PMU_A2XB_CFG_HSPLIT_RESP_LIMIT_OFFSET 0x117C #define PRONTO_PMU_COM_GDSCR_OFFSET 0x0024 #define PRONTO_PMU_COM_GDSCR_SW_COLLAPSE BIT(0) @@ -352,6 +353,7 @@ static struct { int smd_channel_ready; u32 wlan_rx_buff_count; int is_vsys_adc_channel; + int is_a2xb_split_reg; smd_channel_t *smd_ch; unsigned char wcnss_version[WCNSS_VERSION_LEN]; unsigned char fw_major; @@ -629,6 +631,13 @@ void wcnss_pronto_log_debug_regs(void) reg = readl_relaxed(reg_addr); pr_err("PRONTO_SAW2_SPM_CTL %08x\n", reg); + if (penv->is_a2xb_split_reg) { + reg_addr = penv->msm_wcnss_base + + PMU_A2XB_CFG_HSPLIT_RESP_LIMIT_OFFSET; + reg = readl_relaxed(reg_addr); + pr_err("PMU_A2XB_CFG_HSPLIT_RESP_LIMIT %08x\n", reg); + } + reg_addr = penv->pronto_saw2_base + PRONTO_SAW2_SAW2_VERSION; reg = readl_relaxed(reg_addr); pr_err("PRONTO_SAW2_SAW2_VERSION %08x\n", reg); @@ -2710,6 +2719,9 @@ wcnss_trigger_config(struct platform_device *pdev) penv->is_vsys_adc_channel = of_property_read_bool(pdev->dev.of_node, "qcom,has-vsys-adc-channel"); + penv->is_a2xb_split_reg = of_property_read_bool(pdev->dev.of_node, + "qcom,has-a2xb-split-reg"); + if (of_property_read_u32(pdev->dev.of_node, "qcom,wlan-rx-buff-count", &penv->wlan_rx_buff_count)) { penv->wlan_rx_buff_count = WCNSS_DEF_WLAN_RX_BUFF_COUNT; |