From: James Hogan <james.hogan@imgtec.com>
To: Joshua Kinard <kumba@gentoo.org>
Cc: Ralf Baechle <ralf@linux-mips.org>,
"Maciej W. Rozycki" <macro@linux-mips.org>,
Linux/MIPS <linux-mips@linux-mips.org>
Subject: Re: [PATCH] MIPS: Replace printk calls in cpu-bugs64.c with pr_info/pr_cont
Date: Thu, 2 Feb 2017 10:00:41 +0000 [thread overview]
Message-ID: <20170202100041.GA13058@jhogan-linux.le.imgtec.org> (raw)
In-Reply-To: <29b7fc69-97f4-6a3a-0e65-2678f9c30cef@gentoo.org>
Hi Joshua,
On Thu, Feb 02, 2017 at 03:56:26AM -0500, Joshua Kinard wrote:
> From: Joshua Kinard <kumba@gentoo.org>
>
> In arch/mips/kernel/cpu-bugs64.c, replace initial printk's in three
> bug-checking functions with pr_info and replace several continuation
> printk's with pr_info/pr_cont calls to avoid kernel log output like
> this:
>
> [ 0.899065] Checking for the daddi bug...
> [ 0.899098] no.
>
> This makes the output appear correctly:
>
> [ 0.898643] Checking for the daddi bug... no.
>
> Signed-off-by: Joshua Kinard <kumba@gentoo.org>
A variation of this patch is already applied, but without the change of
printk -> pr_info:
https://patchwork.linux-mips.org/patch/14916/
https://git.linux-mips.org/cgit/ralf/upstream-sfr.git/commit/?id=35e7f7885e1b1b272a73c0de3227fc9a3e95a7e3
Cheers
James
> ---
> arch/mips/kernel/cpu-bugs64.c | 30 +++++++++++++++---------------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
> index a378e44688f5..d4483551a926 100644
> --- a/arch/mips/kernel/cpu-bugs64.c
> +++ b/arch/mips/kernel/cpu-bugs64.c
> @@ -122,7 +122,7 @@ static inline void check_mult_sh(void)
> long v1[8], v2[8], w[8];
> int bug, fix, i;
>
> - printk("Checking for the multiply/shift bug... ");
> + pr_info("Checking for the multiply/shift bug... ");
>
> /*
> * Testing discovered false negatives for certain code offsets
> @@ -148,11 +148,11 @@ static inline void check_mult_sh(void)
> bug = 1;
>
> if (bug == 0) {
> - printk("no.\n");
> + pr_cont("no.\n");
> return;
> }
>
> - printk("yes, workaround... ");
> + pr_cont("yes, workaround... ");
>
> fix = 1;
> for (i = 0; i < 8; i++)
> @@ -160,11 +160,11 @@ static inline void check_mult_sh(void)
> fix = 0;
>
> if (fix == 1) {
> - printk("yes.\n");
> + pr_cont("yes.\n");
> return;
> }
>
> - printk("no.\n");
> + pr_cont("no.\n");
> panic(bug64hit, !R4000_WAR ? r4kwar : nowar);
> }
>
> @@ -187,7 +187,7 @@ static inline void check_daddi(void)
> void *handler;
> long v, tmp;
>
> - printk("Checking for the daddi bug... ");
> + pr_info("Checking for the daddi bug... ");
>
> local_irq_save(flags);
> handler = set_except_vector(EXCCODE_OV, handle_daddi_ov);
> @@ -218,11 +218,11 @@ static inline void check_daddi(void)
> local_irq_restore(flags);
>
> if (daddi_ov) {
> - printk("no.\n");
> + pr_cont("no.\n");
> return;
> }
>
> - printk("yes, workaround... ");
> + pr_cont("yes, workaround... ");
>
> local_irq_save(flags);
> handler = set_except_vector(EXCCODE_OV, handle_daddi_ov);
> @@ -236,11 +236,11 @@ static inline void check_daddi(void)
> local_irq_restore(flags);
>
> if (daddi_ov) {
> - printk("yes.\n");
> + pr_cont("yes.\n");
> return;
> }
>
> - printk("no.\n");
> + pr_cont("no.\n");
> panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
> }
>
> @@ -250,7 +250,7 @@ static inline void check_daddiu(void)
> {
> long v, w, tmp;
>
> - printk("Checking for the daddiu bug... ");
> + pr_info("Checking for the daddiu bug... ");
>
> /*
> * The following code leads to a wrong result of daddiu when
> @@ -288,11 +288,11 @@ static inline void check_daddiu(void)
> daddiu_bug = v != w;
>
> if (!daddiu_bug) {
> - printk("no.\n");
> + pr_cont("no.\n");
> return;
> }
>
> - printk("yes, workaround... ");
> + pr_cont("yes, workaround... ");
>
> asm volatile(
> "addiu %2, $0, %3\n\t"
> @@ -304,11 +304,11 @@ static inline void check_daddiu(void)
> : "I" (0xffffffffffffdb9aUL), "I" (0x1234));
>
> if (v == w) {
> - printk("yes.\n");
> + pr_cont("yes.\n");
> return;
> }
>
> - printk("no.\n");
> + pr_cont("no.\n");
> panic(bug64hit, !DADDI_WAR ? daddiwar : nowar);
> }
>
>
>
next prev parent reply other threads:[~2017-02-02 10:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-02 8:56 [PATCH] MIPS: Replace printk calls in cpu-bugs64.c with pr_info/pr_cont Joshua Kinard
2017-02-02 10:00 ` James Hogan [this message]
2017-02-02 10:41 ` Joshua Kinard
2017-02-02 10:48 ` James Hogan
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=20170202100041.GA13058@jhogan-linux.le.imgtec.org \
--to=james.hogan@imgtec.com \
--cc=kumba@gentoo.org \
--cc=linux-mips@linux-mips.org \
--cc=macro@linux-mips.org \
--cc=ralf@linux-mips.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox