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

Commit 10073a20 authored by Matthew McClintock's avatar Matthew McClintock Committed by Wim Van Sebroeck
Browse files

watchdog: qcom: configure BARK time in addition to BITE time 



For certain parts and some versions of TZ, TZ will reset the chip
when a BARK is triggered even though it was not configured here. So
by default let's configure this BARK time as well.

Signed-off-by: default avatarMatthew McClintock <mmcclint@codeaurora.org>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarThomas Pedersen <twp@codeaurora.org>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent f0d9d0f4

drivers/watchdog/qcom-wdt.c

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ enum wdt_reg { 
	WDT_RST,

	WDT_EN,

	WDT_STS,

	WDT_BARK_TIME,

	WDT_BITE_TIME,

};
@@ -31,6 +32,7 @@ static const u32 reg_offset_data_apcs_tmr[] = { 
	[WDT_RST] = 0x38,

	[WDT_EN] = 0x40,

	[WDT_STS] = 0x44,

	[WDT_BARK_TIME] = 0x4C,

	[WDT_BITE_TIME] = 0x5C,

};
@@ -38,6 +40,7 @@ static const u32 reg_offset_data_kpss[] = { 
	[WDT_RST] = 0x4,

	[WDT_EN] = 0x8,

	[WDT_STS] = 0xC,

	[WDT_BARK_TIME] = 0x10,

	[WDT_BITE_TIME] = 0x14,

};
@@ -66,6 +69,7 @@ static int qcom_wdt_start(struct watchdog_device *wdd) 


	writel(0, wdt_addr(wdt, WDT_EN));

	writel(1, wdt_addr(wdt, WDT_RST));

	writel(wdd->timeout * wdt->rate, wdt_addr(wdt, WDT_BARK_TIME));

	writel(wdd->timeout * wdt->rate, wdt_addr(wdt, WDT_BITE_TIME));

	writel(1, wdt_addr(wdt, WDT_EN));

	return 0;
@@ -108,6 +112,7 @@ static int qcom_wdt_restart(struct watchdog_device *wdd, unsigned long action, 


	writel(0, wdt_addr(wdt, WDT_EN));

	writel(1, wdt_addr(wdt, WDT_RST));

	writel(timeout, wdt_addr(wdt, WDT_BARK_TIME));

	writel(timeout, wdt_addr(wdt, WDT_BITE_TIME));

	writel(1, wdt_addr(wdt, WDT_EN));