From: Ivan Mikhaylov <ivan@de.ibm.com> To: Michael Ellerman <mpe@ellerman.id.au>, Alistair Popple <alistair@popple.id.au>, Matt Porter <mporter@kernel.crashing.org> Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Joel Stanley <joel@jms.id.au>, Paul Mackerras <paulus@samba.org> Subject: Re: [PATCH 4/4] arch/powerpc/44x/fsp2: wdt tcr update instead of whole rewrite Date: Fri, 19 May 2017 18:47:05 +0300 [thread overview] Message-ID: <20170519154705.10504-1-ivan@de.ibm.com> (raw) In-Reply-To: <87wp9d5ekz.fsf@concordia.ellerman.id.au> Hi Michael, >> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c >> index 2b33cfa..f75e512 100644 >> --- a/arch/powerpc/kernel/time.c >> +++ b/arch/powerpc/kernel/time.c >> @@ -738,12 +738,28 @@ static int __init get_freq(char *name, int cells, unsigned long *val) >> >> static void start_cpu_decrementer(void) >> { >> + unsigned int tcr; >> #if defined(CONFIG_BOOKE) || defined(CONFIG_40x) >> /* Clear any pending timer interrupts */ >> mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS); >> >> +#ifdef CONFIG_FSP2 >> + /* >> + * Prevent a kernel panic caused by unintentionally clearing TCR >> + * watchdog bits. At this point in the kernel boot, the watchdog has >> + * already been enabled by u-boot. The original code's attempt to > > Don't refer to "the original code", as it doesn't exist anymore now that > we've patched it. Just say something like ".. so we must not clear the > watchdog configuration bits". Ok, got it. >That breaks the build for other platforms: > > arch/powerpc/kernel/time.c: In function ‘start_cpu_decrementer’: > arch/powerpc/kernel/time.c:741:15: error: unused variable ‘tcr’ [-Werror=unused-variable] > Oops, didn't notice, my fault. >Or you could possibly just always leave TCR[WP], is there any case where >it would be correct to clear that? > >cheers >From my point of view it's possible. I've checked docu and on idea it should be possible cause WP is only affecting watchdog ping time. Which in case of '00' is very small, around ~5 ms. Ben also in next message said about get rid of ifdef for FSP2. And now patch looks like this, What do you think Michael, Ben? arch/powerpc/kernel/time.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index bc2e08d..2411c49 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -718,11 +718,22 @@ static int __init get_freq(char *name, int cells, unsigned long *val) static void start_cpu_decrementer(void) { #if defined(CONFIG_BOOKE) || defined(CONFIG_40x) + unsigned int tcr; /* Clear any pending timer interrupts */ mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS); - /* Enable decrementer interrupt */ - mtspr(SPRN_TCR, TCR_DIE); + tcr = mfspr(SPRN_TCR); + /* + * At this point in the kernel boot, the watchdog has already + * been enabled by u-boot. If we set it this to '00' it may + * trigger watchdog earlier than needed which will cause + * inattentional kernel panic. In this case we leaving TCR[WP] + * bit setting from uboot/bootstrap. + */ + tcr &= TCR_WP_MASK; /* clear all bits except for TCR[WP] */ + tcr |= TCR_DIE; /* enable decrementer */ + mtspr(SPRN_TCR, tcr); + #endif /* defined(CONFIG_BOOKE) || defined(CONFIG_40x) */ } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Ivan Mikhaylov <ivan@de.ibm.com> To: Michael Ellerman <mpe@ellerman.id.au>, Alistair Popple <alistair@popple.id.au>, Matt Porter <mporter@kernel.crashing.org> Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Joel Stanley <joel@jms.id.au>, Paul Mackerras <paulus@samba.org> Subject: Re: [PATCH 4/4] arch/powerpc/44x/fsp2: wdt tcr update instead of whole rewrite Date: Fri, 19 May 2017 18:47:05 +0300 [thread overview] Message-ID: <20170519154705.10504-1-ivan@de.ibm.com> (raw) In-Reply-To: <87wp9d5ekz.fsf@concordia.ellerman.id.au> Hi Michael, >> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c >> index 2b33cfa..f75e512 100644 >> --- a/arch/powerpc/kernel/time.c >> +++ b/arch/powerpc/kernel/time.c >> @@ -738,12 +738,28 @@ static int =5F=5Finit get=5Ffreq(char *name, int c= ells, unsigned long *val) >> =20 >> static void start=5Fcpu=5Fdecrementer(void) >> { >> + unsigned int tcr; >> #if defined(CONFIG=5FBOOKE) || defined(CONFIG=5F40x) >> /* Clear any pending timer interrupts */ >> mtspr(SPRN=5FTSR, TSR=5FENW | TSR=5FWIS | TSR=5FDIS | TSR=5FFIS); >> =20 >> +#ifdef CONFIG=5FFSP2 >> + /* >> + * Prevent a kernel panic caused by unintentionally clearing TCR >> + * watchdog bits. At this point in the kernel boot, the watchdog has >> + * already been enabled by u-boot. The original code's attempt to > > Don't refer to "the original code", as it doesn't exist anymore now that > we've patched it. Just say something like ".. so we must not clear the > watchdog configuration bits". Ok, got it. >That breaks the build for other platforms: > > arch/powerpc/kernel/time.c: In function =E2=80=98start=5Fcpu=5Fdecremente= r=E2=80=99: > arch/powerpc/kernel/time.c:741:15: error: unused variable =E2=80=98tcr=E2= =80=99 [-Werror=3Dunused-variable] > Oops, didn't notice, my fault.=20 >Or you could possibly just always leave TCR[WP], is there any case where >it would be correct to clear that? > >cheers >From my point of view it's possible. I've checked docu and on idea it should be possible cause WP is only affecting watchdog ping time. Which in case of '00' is very small, around ~5 ms.=20 Ben also in next message said about get rid of ifdef for FSP2. And now patch looks like this, What do you think Michael, Ben? arch/powerpc/kernel/time.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index bc2e08d..2411c49 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -718,11 +718,22 @@ static int =5F=5Finit get=5Ffreq(char *name, int cell= s, unsigned long *val) static void start=5Fcpu=5Fdecrementer(void) { #if defined(CONFIG=5FBOOKE) || defined(CONFIG=5F40x) + unsigned int tcr; /* Clear any pending timer interrupts */ mtspr(SPRN=5FTSR, TSR=5FENW | TSR=5FWIS | TSR=5FDIS | TSR=5FFIS); =20 - /* Enable decrementer interrupt */ - mtspr(SPRN=5FTCR, TCR=5FDIE); + tcr =3D mfspr(SPRN=5FTCR); + /* + * At this point in the kernel boot, the watchdog has already + * been enabled by u-boot. If we set it this to '00' it may + * trigger watchdog earlier than needed which will cause + * inattentional kernel panic. In this case we leaving TCR[WP] + * bit setting from uboot/bootstrap. + */ + tcr &=3D TCR=5FWP=5FMASK; /* clear all bits except for TCR[WP] */ + tcr |=3D TCR=5FDIE; /* enable decrementer */ + mtspr(SPRN=5FTCR, tcr); + #endif /* defined(CONFIG=5FBOOKE) || defined(CONFIG=5F40x) */ } =20 --=20 1.7.1
next prev parent reply other threads:[~2017-05-19 15:47 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-05-15 13:07 [PATCH 4/4] arch/powerpc/44x/fsp2: wdt tcr update instead of whole rewrite Ivan Mikhaylov 2017-05-19 10:24 ` Michael Ellerman 2017-05-19 10:24 ` Michael Ellerman 2017-05-19 15:47 ` Ivan Mikhaylov [this message] 2017-05-19 15:47 ` Ivan Mikhaylov 2017-05-23 4:09 ` Michael Ellerman 2017-05-26 10:37 ` Michael Ellerman 2017-05-30 9:11 ` [4/4] " Michael Ellerman 2017-05-19 10:30 ` [PATCH 4/4] " Benjamin Herrenschmidt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170519154705.10504-1-ivan@de.ibm.com \ --to=ivan@de.ibm.com \ --cc=alistair@popple.id.au \ --cc=benh@kernel.crashing.org \ --cc=joel@jms.id.au \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=mpe@ellerman.id.au \ --cc=mporter@kernel.crashing.org \ --cc=paulus@samba.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.