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

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

Merge "wcnss: Correct the logging sequence of certain registers"

parents 80bf1d67 e4d2198c

drivers/net/wireless/wcnss/wcnss_wlan.c

+8 −8
Original line number Diff line number Diff line
@@ -582,6 +582,14 @@ void wcnss_pronto_log_debug_regs(void) 
	reg = readl_relaxed(reg_addr);

	pr_err("PRONTO_SAW2_SPM_STS %08x\n", reg);



	reg_addr = penv->pronto_pll_base + PRONTO_PLL_STATUS_OFFSET;

	reg = readl_relaxed(reg_addr);

	pr_err("PRONTO_PLL_STATUS %08x\n", reg);



	reg_addr = penv->msm_wcnss_base + PRONTO_PMU_CPU_AHB_CMD_RCGR_OFFSET;

	reg4 = readl_relaxed(reg_addr);

	pr_err("PMU_CPU_CMD_RCGR %08x\n", reg4);



	reg_addr = penv->msm_wcnss_base + PRONTO_PMU_COM_GDSCR_OFFSET;

	reg = readl_relaxed(reg_addr);

	pr_err("PRONTO_PMU_COM_GDSCR %08x\n", reg);
@@ -628,10 +636,6 @@ void wcnss_pronto_log_debug_regs(void) 
	reg = readl_relaxed(reg_addr);

	pr_err("CCU_CCPU_LAST_ADDR2 %08x\n", reg);



	reg_addr = penv->pronto_pll_base + PRONTO_PLL_STATUS_OFFSET;

	reg = readl_relaxed(reg_addr);

	pr_err("PRONTO_PLL_STATUS %08x\n", reg);



	tst_addr = penv->pronto_a2xb_base + A2XB_TSTBUS_OFFSET;

	tst_ctrl_addr = penv->pronto_a2xb_base + A2XB_TSTBUS_CTRL_OFFSET;
@@ -699,10 +703,6 @@ void wcnss_pronto_log_debug_regs(void) 
	reg3 = readl_relaxed(reg_addr);

	pr_err("PMU_WLAN_AHB_CBCR %08x\n", reg3);



	reg_addr = penv->msm_wcnss_base + PRONTO_PMU_CPU_AHB_CMD_RCGR_OFFSET;

	reg4 = readl_relaxed(reg_addr);

	pr_err("PMU_CPU_CMD_RCGR %08x\n", reg4);



	if ((reg & PRONTO_PMU_WLAN_BCR_BLK_ARES) ||

		(reg2 & PRONTO_PMU_WLAN_GDSCR_SW_COLLAPSE) ||

		(!(reg4 & PRONTO_PMU_CPU_AHB_CMD_RCGR_ROOT_EN)) ||