Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1520744 > unrolled thread

[PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch

Started byChristian Lamparter <chunkeey@googlemail.com>
First post2016-11-14 02:20 +0100
Last post2016-11-14 02:50 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch Christian Lamparter <chunkeey@googlemail.com> - 2016-11-14 02:20 +0100
    Re: [PATCH] watchdog: qcom: fix kernel panic due to external abort on  non-linefetch Guenter Roeck <linux@roeck-us.net> - 2016-11-14 02:50 +0100

#1520744 — [PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch

FromChristian Lamparter <chunkeey@googlemail.com>
Date2016-11-14 02:20 +0100
Subject[PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch
Message-ID<sDe6d-8fv-3@gated-at.bofh.it>
This patch fixes a off-by-one in the "watchdog: qcom: add option for
standalone watchdog not in timer block" patch that causes the
following panic on boot:

> Unhandled fault: external abort on non-linefetch (0x1008) at 0xc8874002
> pgd = c0204000
> [c8874002] *pgd=87806811, *pte=0b017653, *ppte=0b017453
> Internal error: : 1008 [#1] SMP ARM
> CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.8.6 #0
> Hardware name: Generic DT based system
> PC is at 0xc02222f4
> LR is at 0x1
> pc : [<c02222f4>]    lr : [<00000001>]    psr: 00000113
> sp : c782fc98  ip : 00000003  fp : 00000000
> r10: 00000004  r9 : c782e000  r8 : c04ab98c
> r7 : 00000001  r6 : c8874002  r5 : c782fe00  r4 : 00000002
> r3 : 00000000  r2 : c782fe00  r1 : 00100000  r0 : c8874002
> Flags: nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment none
> Control: 10c5387d  Table: 8020406a  DAC: 00000051
> Process swapper/0 (pid: 1, stack limit = 0xc782e210)
> Stack: (0xc782fc98 to 0xc7830000)
> [...]

The WDT_STS (status) needs to be translated via wdt_addr as well.

fixes: f0d9d0f4b44a ("watchdog: qcom: add option for standalone watchdog not in timer block")
Cc: stable@vger.kernel.org # 4.8
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---
 drivers/watchdog/qcom-wdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c
index 5796b5d..4f47b5e 100644
--- a/drivers/watchdog/qcom-wdt.c
+++ b/drivers/watchdog/qcom-wdt.c
@@ -209,7 +209,7 @@ static int qcom_wdt_probe(struct platform_device *pdev)
 	wdt->wdd.parent = &pdev->dev;
 	wdt->layout = regs;
 
-	if (readl(wdt->base + WDT_STS) & 1)
+	if (readl(wdt_addr(wdt, WDT_STS)) & 1)
 		wdt->wdd.bootstatus = WDIOF_CARDRESET;
 
 	/*
-- 
2.10.2

[toc] | [next] | [standalone]


#1520749 — Re: [PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch

FromGuenter Roeck <linux@roeck-us.net>
Date2016-11-14 02:50 +0100
SubjectRe: [PATCH] watchdog: qcom: fix kernel panic due to external abort on non-linefetch
Message-ID<sDezf-8q6-5@gated-at.bofh.it>
In reply to#1520744
On 11/13/2016 05:11 PM, Christian Lamparter wrote:
> This patch fixes a off-by-one in the "watchdog: qcom: add option for
> standalone watchdog not in timer block" patch that causes the
> following panic on boot:
>
>> Unhandled fault: external abort on non-linefetch (0x1008) at 0xc8874002
>> pgd = c0204000
>> [c8874002] *pgd=87806811, *pte=0b017653, *ppte=0b017453
>> Internal error: : 1008 [#1] SMP ARM
>> CPU: 2 PID: 1 Comm: swapper/0 Not tainted 4.8.6 #0
>> Hardware name: Generic DT based system
>> PC is at 0xc02222f4
>> LR is at 0x1
>> pc : [<c02222f4>]    lr : [<00000001>]    psr: 00000113
>> sp : c782fc98  ip : 00000003  fp : 00000000
>> r10: 00000004  r9 : c782e000  r8 : c04ab98c
>> r7 : 00000001  r6 : c8874002  r5 : c782fe00  r4 : 00000002
>> r3 : 00000000  r2 : c782fe00  r1 : 00100000  r0 : c8874002
>> Flags: nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment none
>> Control: 10c5387d  Table: 8020406a  DAC: 00000051
>> Process swapper/0 (pid: 1, stack limit = 0xc782e210)
>> Stack: (0xc782fc98 to 0xc7830000)
>> [...]
>
> The WDT_STS (status) needs to be translated via wdt_addr as well.
>
> fixes: f0d9d0f4b44a ("watchdog: qcom: add option for standalone watchdog not in timer block")
> Cc: stable@vger.kernel.org # 4.8
> Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

Reviewed-by: Guenter Roeck <linux@roeck-us.net>

> ---
>  drivers/watchdog/qcom-wdt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/qcom-wdt.c b/drivers/watchdog/qcom-wdt.c
> index 5796b5d..4f47b5e 100644
> --- a/drivers/watchdog/qcom-wdt.c
> +++ b/drivers/watchdog/qcom-wdt.c
> @@ -209,7 +209,7 @@ static int qcom_wdt_probe(struct platform_device *pdev)
>  	wdt->wdd.parent = &pdev->dev;
>  	wdt->layout = regs;
>
> -	if (readl(wdt->base + WDT_STS) & 1)
> +	if (readl(wdt_addr(wdt, WDT_STS)) & 1)
>  		wdt->wdd.bootstatus = WDIOF_CARDRESET;
>
>  	/*
>

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web