From: James Hogan <james.hogan@mips.com>
To: Jaedon Shin <jaedon.shin@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Kevin Cernekee <cernekee@gmail.com>, <linux-mips@linux-mips.org>
Subject: Re: [PATCH] MIPS: BMIPS: Fix missing cbr address
Date: Tue, 7 Nov 2017 21:39:15 +0000 [thread overview]
Message-ID: <20171107213915.GK15260@jhogan-linux> (raw)
In-Reply-To: <20170616110301.38103-1-jaedon.shin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
On Fri, Jun 16, 2017 at 08:03:01PM +0900, Jaedon Shin wrote:
> Fixes NULL pointer access in BMIPS3300 RAC flush.
>
> Fixes: 738a3f79027b ("MIPS: BMIPS: Add early CPU initialization code")
> Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
Thanks. Applied for 4.14.
Cheers
James
> ---
> arch/mips/kernel/smp-bmips.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
> index 1b070a76fcdd..5e0d87f4958f 100644
> --- a/arch/mips/kernel/smp-bmips.c
> +++ b/arch/mips/kernel/smp-bmips.c
> @@ -589,11 +589,11 @@ void __init bmips_cpu_setup(void)
>
> /* Flush and enable RAC */
> cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
> - __raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG);
> + __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);
> __raw_readl(cbr + BMIPS_RAC_CONFIG);
>
> cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
> - __raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG);
> + __raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG);
> __raw_readl(cbr + BMIPS_RAC_CONFIG);
>
> cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);
> --
> 2.13.1
>
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: James Hogan <james.hogan@mips.com>
To: Jaedon Shin <jaedon.shin@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Kevin Cernekee <cernekee@gmail.com>,
linux-mips@linux-mips.org
Subject: Re: [PATCH] MIPS: BMIPS: Fix missing cbr address
Date: Tue, 7 Nov 2017 21:39:15 +0000 [thread overview]
Message-ID: <20171107213915.GK15260@jhogan-linux> (raw)
Message-ID: <20171107213915.1PNfd2I836z2uF8ew_AHcM_bVFzg7wTD3ivPHpMq-gE@z> (raw)
In-Reply-To: <20170616110301.38103-1-jaedon.shin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
On Fri, Jun 16, 2017 at 08:03:01PM +0900, Jaedon Shin wrote:
> Fixes NULL pointer access in BMIPS3300 RAC flush.
>
> Fixes: 738a3f79027b ("MIPS: BMIPS: Add early CPU initialization code")
> Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com>
Thanks. Applied for 4.14.
Cheers
James
> ---
> arch/mips/kernel/smp-bmips.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c
> index 1b070a76fcdd..5e0d87f4958f 100644
> --- a/arch/mips/kernel/smp-bmips.c
> +++ b/arch/mips/kernel/smp-bmips.c
> @@ -589,11 +589,11 @@ void __init bmips_cpu_setup(void)
>
> /* Flush and enable RAC */
> cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
> - __raw_writel(cfg | 0x100, BMIPS_RAC_CONFIG);
> + __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);
> __raw_readl(cbr + BMIPS_RAC_CONFIG);
>
> cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG);
> - __raw_writel(cfg | 0xf, BMIPS_RAC_CONFIG);
> + __raw_writel(cfg | 0xf, cbr + BMIPS_RAC_CONFIG);
> __raw_readl(cbr + BMIPS_RAC_CONFIG);
>
> cfg = __raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);
> --
> 2.13.1
>
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2017-11-07 21:40 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 11:03 [PATCH] MIPS: BMIPS: Fix missing cbr address Jaedon Shin
2017-06-16 17:40 ` Florian Fainelli
2017-11-07 21:39 ` James Hogan [this message]
2017-11-07 21:39 ` 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=20171107213915.GK15260@jhogan-linux \
--to=james.hogan@mips.com \
--cc=cernekee@gmail.com \
--cc=f.fainelli@gmail.com \
--cc=jaedon.shin@gmail.com \
--cc=linux-mips@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