linux-mips
[Top] [All Lists]

Re: [PATCH V2 1/2] MIPS: BCM63XX: Add SMP support to prom.c

To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Subject: Re: [PATCH V2 1/2] MIPS: BCM63XX: Add SMP support to prom.c
From: Jonas Gorski <jogo@openwrt.org>
Date: Tue, 18 Jun 2013 14:03:11 +0200
Cc: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>, John Crispin <blogic@openwrt.org>, Maxime Bizon <mbizon@freebox.fr>, Florian Fainelli <florian@openwrt.org>, Kevin Cernekee <cernekee@gmail.com>
In-reply-to: <51C048FB.5050803@cogentembedded.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1371548072-6247-1-git-send-email-jogo@openwrt.org> <1371548072-6247-2-git-send-email-jogo@openwrt.org> <51C048FB.5050803@cogentembedded.com>
Sender: linux-mips-bounce@linux-mips.org
Hi Sergei,

On Tue, Jun 18, 2013 at 1:48 PM, Sergei Shtylyov
<sergei.shtylyov@cogentembedded.com> wrote:
> Hello.
>
>
> On 18-06-2013 13:34, Jonas Gorski wrote:
>
>> From: Kevin Cernekee <cernekee@gmail.com>
>
>
>> This involves two changes to the BSP code:
>
>
>> 1) register_smp_ops() for BMIPS SMP
>
>
>> 2) The CPU1 boot vector on some of the BCM63xx platforms conflicts with
>> the special interrupt vector (IV).  Move it to 0x8000_0380 at boot time,
>> to resolve the conflict.
>
>
>> Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
>> [jogo@openwrt.org: moved SMP ops registration into ifdef guard,
>>   changed ifdef guards to if (IS_ENABLED())]
>> Signed-off-by: Jonas Gorski <jogo@openwrt.org>
>> ---
>> V1 -> V2:
>>   * changed ifdef guards to if (IS_ENABLED())
>
>
>>   arch/mips/bcm63xx/prom.c |   41
>> +++++++++++++++++++++++++++++++++++++++++
>>   1 file changed, 41 insertions(+)
>
>
>> diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
>> index fd69808..33ddc78 100644
>> --- a/arch/mips/bcm63xx/prom.c
>> +++ b/arch/mips/bcm63xx/prom.c
>
> [...]
>
>> @@ -52,6 +56,43 @@ void __init prom_init(void)
>>
>>         /* do low level board init */
>>         board_prom_init();
>> +
>> +       if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
>> +               /* set up SMP */
>> +               register_smp_ops(&bmips_smp_ops);
>> +
>> +               /*
>> +                * BCM6328 might not have its second CPU enabled, while
>> BCM6358
>> +                * needs special handling for its shared TLB, so disable
>> SMP
>> +                * for now.
>> +                */
>> +               if (BCMCPU_IS_6328()) {
>> +                       bmips_smp_enabled = 0;
>> +               } else if (BCMCPU_IS_6358()) {
>> +                       bmips_smp_enabled = 0;
>> +               }
>
>
>     Doesn't scripts/checkpatch.pl complain here? You should not use {} on
> the single statement branches.

I left the braces intentionally there because Patch 2 adds code to the
first branch, so I would have to add them in the next patch anyway.
This way the changes of Patch 2 stays smaller and easier to review
(and are limited to actual code changes).


Jonas

<Prev in Thread] Current Thread [Next in Thread>