Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f2f1db8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wcnss: Enable/disable WCNSS register dump on WCNSS bite"

parents d0ec53ce 127699a2

arch/arm/mach-msm/pil-pronto.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static irqreturn_t wcnss_wdog_bite_irq_hdlr(int irq, void *dev_id) 
		pr_err("Ignoring wcnss bite irq, restart in progress\n");

		return IRQ_HANDLED;

	}

	wcnss_pronto_log_debug_regs();

	wcnss_log_debug_regs_on_bite();



	drv->restart_inprogress = true;

	restart_wcnss(drv);

drivers/net/wireless/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -310,6 +310,16 @@ config WCNSS_MEM_PRE_ALLOC 
	---help---

	  Pre-allocate memory for the WLAN driver module



config WCNSS_REGISTER_DUMP_ON_BITE

	bool "Enable/disable WCNSS register dump when there is a WCNSS bite"

	depends on WCNSS_CORE_PRONTO

	help

	 When Apps recieves a WDOG bite from WCNSS, collecting a register dump

	 of WCNSS is helpful to root cause the failure. WCNSS may not be

	 properly clocked in some WCNSS bite cases, and that may cause unclocked

	 register access failures. So this feature is to enable/disable the

	 register dump on WCNSS WDOG bite.



config CLD_LL_CORE

	tristate "Qualcomm CORE driver for QCA6714"

	select WIRELESS_EXT

drivers/net/wireless/wcnss/wcnss_wlan.c

+8 −0
Original line number Diff line number Diff line
@@ -639,6 +639,14 @@ void wcnss_pronto_log_debug_regs(void) 
}

EXPORT_SYMBOL(wcnss_pronto_log_debug_regs);



#ifdef CONFIG_WCNSS_REGISTER_DUMP_ON_BITE

void wcnss_log_debug_regs_on_bite(void)

{

	if (wcnss_hardware_type() == WCNSS_PRONTO_HW)

		wcnss_pronto_log_debug_regs();

}

#endif



/* interface to reset wcnss by sending the reset interrupt */

void wcnss_reset_intr(void)

{

include/linux/wcnss_wlan.h

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ void wcnss_riva_dump_pmic_regs(void); 
int wcnss_xo_auto_detect_enabled(void);

u32 wcnss_get_wlan_rx_buff_count(void);

int wcnss_wlan_iris_xo_mode(void);

#ifdef CONFIG_WCNSS_REGISTER_DUMP_ON_BITE

void wcnss_log_debug_regs_on_bite(void);

#else

static inline void wcnss_log_debug_regs_on_bite(void)

{

}

#endif



#define wcnss_wlan_get_drvdata(dev) dev_get_drvdata(dev)

#define wcnss_wlan_set_drvdata(dev, data) dev_set_drvdata((dev), (data))