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

Commit 7d88ec31 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy Committed by Matt Wagantall
Browse files

soc: qcom: watchdog_v2: Add support to trigger watchdog bite on panic 



In certain cases during a kernel panic,the interrupts on non-panicking
CPUs are disabled. Since CPU context cannot be collected by sending IPI
to those CPUs, we're limited to debug the problem. Forcing a watchdog
bite during kernel panic will ensure us getting the proper CPU context.
Hence adding support for the same.

Change-Id: Id06030d9bc46d94209da7f0ef8c47bfd3477baf6
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
[abhimany: resolve trivial merge conflicts]
Signed-off-by: default avatarAbhimanyu Kapur <abhimany@codeaurora.org>
parent fe79e881

drivers/power/reset/msm-poweroff.c

+9 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include <soc/qcom/scm.h>

#include <soc/qcom/restart.h>

#include <soc/qcom/watchdog.h>



#define EMERGENCY_DLOAD_MAGIC1    0x322A4F99

#define EMERGENCY_DLOAD_MAGIC2    0xC67E4350
@@ -267,6 +268,14 @@ static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd) 


	msm_restart_prepare(cmd);



	/*

	 * Trigger a watchdog bite here and if this fails,

	 * device will take the usual restart path.

	 */



	if (WDOG_BITE_ON_PANIC && in_panic)

		msm_trigger_wdog_bite();



	/* Needed to bypass debug image on some chips */

	if (!is_scm_armv8())

		ret = scm_call_atomic2(SCM_SVC_BOOT,

drivers/soc/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -52,6 +52,14 @@ config MSM_WATCHDOG_V2 
	  deadlocks. It does not run during the bootup process, so it will

	  not catch any early lockups.



config MSM_FORCE_WDOG_BITE_ON_PANIC

	bool "MSM force watchdog bite"

	depends on MSM_WATCHDOG_V2

	help

	  This forces a watchdog bite when the device restarts due to a

	  kernel panic. On certain MSM SoCs, this provides us

	  additional debugging information.



config MSM_CPU_PWR_CTL

	bool "Cpu subsystem power control"

	depends on SMP && (ARM || ARM64)

drivers/soc/qcom/watchdog_v2.c

+20 −12
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/platform_device.h>

#include <soc/qcom/scm.h>

#include <soc/qcom/memory_dump.h>

#include <soc/qcom/watchdog.h>



#define MODULE_NAME "msm_watchdog"

#define WDT0_ACCSCSSNBARK_INT 0
@@ -370,6 +371,24 @@ static int msm_watchdog_remove(struct platform_device *pdev) 
	return 0;

}



void msm_trigger_wdog_bite(void)

{

	if (!wdog_data)

		return;

	pr_info("Causing a watchdog bite!");

	__raw_writel(1, wdog_data->base + WDT0_BITE_TIME);

	mb();

	__raw_writel(1, wdog_data->base + WDT0_RST);

	mb();

	/* Delay to make sure bite occurs */

	mdelay(1);

	pr_err("Wdog - STS: 0x%x, CTL: 0x%x, BARK TIME: 0x%x, BITE TIME: 0x%x",

		__raw_readl(wdog_data->base + WDT0_STS),

		__raw_readl(wdog_data->base + WDT0_EN),

		__raw_readl(wdog_data->base + WDT0_BARK_TIME),

		__raw_readl(wdog_data->base + WDT0_BITE_TIME));

}



static irqreturn_t wdog_bark_handler(int irq, void *dev_id)

{

	struct msm_watchdog_data *wdog_dd = (struct msm_watchdog_data *)dev_id;
@@ -385,18 +404,7 @@ static irqreturn_t wdog_bark_handler(int irq, void *dev_id) 
		wdog_dd->last_pet, nanosec_rem / 1000);

	if (wdog_dd->do_ipi_ping)

		dump_cpu_alive_mask(wdog_dd);

	printk(KERN_INFO "Causing a watchdog bite!");

	__raw_writel(1, wdog_dd->base + WDT0_BITE_TIME);

	mb();

	__raw_writel(1, wdog_dd->base + WDT0_RST);

	mb();

	/* Delay to make sure bite occurs */

	mdelay(1);

	pr_err("Wdog - STS: 0x%x, CTL: 0x%x, BARK TIME: 0x%x, BITE TIME: 0x%x",

		__raw_readl(wdog_dd->base + WDT0_STS),

		__raw_readl(wdog_dd->base + WDT0_EN),

		__raw_readl(wdog_dd->base + WDT0_BARK_TIME),

		__raw_readl(wdog_dd->base + WDT0_BITE_TIME));

	msm_trigger_wdog_bite();

	panic("Failed to cause a watchdog bite! - Falling back to kernel panic!");

	return IRQ_HANDLED;

}

include/soc/qcom/watchdog.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef _ASM_ARCH_MSM_WATCHDOG_H_

#define _ASM_ARCH_MSM_WATCHDOG_H_



#ifdef CONFIG_MSM_FORCE_WDOG_BITE_ON_PANIC

#define WDOG_BITE_ON_PANIC 1

#else

#define WDOG_BITE_ON_PANIC 0

#endif



void msm_trigger_wdog_bite(void);



#endif