Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=utf-8
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\))
Subject: Re: [PATCH] mips: smp-bmips: fix CPU mappings
From:   =?utf-8?Q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= <noltari@gmail.com>
In-Reply-To: <f4b8718c-ee74-2609-40f6-cb8f62247d51@gmail.com>
Date:   Wed, 24 Feb 2021 08:07:57 +0100
Cc:     Jonas Gorski <jonas.gorski@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Marc Zyngier <maz@kernel.org>,
        bcm-kernel-feedback-list@broadcom.com, linux-mips@vger.kernel.org,
        linux-kernel@vger.kernel.org
Content-Transfer-Encoding: quoted-printable
Message-Id: <5B471DA5-E911-4B7F-BD9A-CE2901C427FC@gmail.com>
References: <20210223124817.26486-1-noltari@gmail.com>
 <f4b8718c-ee74-2609-40f6-cb8f62247d51@gmail.com>
To:     Florian Fainelli <f.fainelli@gmail.com>
Precedence: bulk

Hi Florian,

> El 24 feb 2021, a las 4:45, Florian Fainelli <f.fainelli@gmail.com> =
escribi=C3=B3:
>=20
>=20
>=20
> On 2/23/2021 4:48 AM, =C3=81lvaro Fern=C3=A1ndez Rojas wrote:
>> When booting bmips with SMP enabled on a BCM6358 running on CPU #1 =
instead of
>> CPU #0, the current CPU mapping code produces the following:
>> - smp_processor_id(): 0
>> - cpu_logical_map(): 1
>> - cpu_number_map(): 1
>>=20
>> This is because SMP isn't supported on BCM6358 since it has a shared =
TLB, so
>> it is disabled and max_cpus is decreased from 2 to 1.
>>=20
>> Signed-off-by: =C3=81lvaro Fern=C3=A1ndez Rojas <noltari@gmail.com>
>> ---
>> arch/mips/kernel/smp-bmips.c | 27 +++++++++++++++++----------
>> 1 file changed, 17 insertions(+), 10 deletions(-)
>>=20
>> diff --git a/arch/mips/kernel/smp-bmips.c =
b/arch/mips/kernel/smp-bmips.c
>> index 359b176b665f..c4760cb48a67 100644
>> --- a/arch/mips/kernel/smp-bmips.c
>> +++ b/arch/mips/kernel/smp-bmips.c
>> @@ -134,17 +134,24 @@ static void __init bmips_smp_setup(void)
>> 	if (!board_ebase_setup)
>> 		board_ebase_setup =3D &bmips_ebase_setup;
>>=20
>> -	__cpu_number_map[boot_cpu] =3D 0;
>> -	__cpu_logical_map[0] =3D boot_cpu;
>> -
>> -	for (i =3D 0; i < max_cpus; i++) {
>> -		if (i !=3D boot_cpu) {
>> -			__cpu_number_map[i] =3D cpu;
>> -			__cpu_logical_map[cpu] =3D i;
>> -			cpu++;
>> +	if (max_cpus > 1) {
>> +		__cpu_number_map[boot_cpu] =3D 0;
>> +		__cpu_logical_map[0] =3D boot_cpu;
>> +
>> +		for (i =3D 0; i < max_cpus; i++) {
>> +			if (i !=3D boot_cpu) {
>> +				__cpu_number_map[i] =3D cpu;
>> +				__cpu_logical_map[cpu] =3D i;
>> +				cpu++;
>> +			}
>> +			set_cpu_possible(i, 1);
>> +			set_cpu_present(i, 1);
>> 		}
>> -		set_cpu_possible(i, 1);
>> -		set_cpu_present(i, 1);
>> +	} else {
>> +		__cpu_number_map[0] =3D boot_cpu;
>> +		__cpu_logical_map[0] =3D 0;
>> +		set_cpu_possible(0, 1);
>> +		set_cpu_possible(0, 1);
>=20
> Duplicate line, with that fixed:

Nice catch, it should be set_cpu_present().

>=20
> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
> --=20
> Florian