[PATCH] riscv: Report error when repeatedly recording CPU hardware ID

[qiaozhe]

On 2024/8/23 18:08, Anup Patel wrote:
> On Fri, Aug 23, 2024 at 2:44 PM Zhe Qiao <qiaozhe at iscas.ac.cn> wrote:
>> In the of_parse_and_init_cpus() function, when the __cpuid_to_hartid_map[]
>> array records the CPU hardware ID, if the same CPU hardware attribute has
>> been recorded, an error report is issued, thereby ensuring the uniqueness
>> of the CPU hardware ID recorded in the __cpuid_to_hartid_map[] array.
>>
>> Signed-off-by: Zhe Qiao <qiaozhe at iscas.ac.cn>
>> ---
>>  arch/riscv/kernel/smpboot.c | 16 ++++++++++++++++
>>  1 file changed, 16 insertions(+)
>>
>> diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
>> index 0f8f1c95ac38..698f9fe791f7 100644
>> --- a/arch/riscv/kernel/smpboot.c
>> +++ b/arch/riscv/kernel/smpboot.c
>> @@ -118,6 +118,16 @@ static void __init acpi_parse_and_init_cpus(void)
>>  #define acpi_parse_and_init_cpus(...)  do { } while (0)
>>  #endif
>>
>> +static bool __init is_mpidr_duplicate(unsigned int cpuid, u64 hart)
> There is no such thing as mpidr in the RISC-V world.
>
> s/mpidr/hartid/


I'm very sorry, I didn't notice that using mpidr on function names is incorrect

in the RISC-V architecture. This is because I referred to the processing methods

on the ARM64 architecture, so I did not modify the function name naming.

Thanks for your reminder.

>> +{
>> +       unsigned int i;
>> +
>> +       for (i = 1; (i < cpuid) && (i < NR_CPUS); i++)
>> +               if (cpuid_to_hartid_map(i) == hart)
>> +                       return true;
>> +       return false;
>> +}
>> +
>>  static void __init of_parse_and_init_cpus(void)
>>  {
>>         struct device_node *dn;
>> @@ -131,6 +141,12 @@ static void __init of_parse_and_init_cpus(void)
>>                 if (rc < 0)
>>                         continue;
>>
>> +               if (is_mpidr_duplicate(cpuid, hart)) {
>> +                       pr_err("%pOF: duplicate cpu reg properties in the DT\n",
>> +                               dn);
>> +                       continue;
>> +               }
>> +
>>                 if (hart == cpuid_to_hartid_map(0)) {
>>                         BUG_ON(found_boot_cpu);
>>                         found_boot_cpu = 1;
>> --
>> 2.43.0
>>
>>
>> _______________________________________________
>> linux-riscv mailing list
>> linux-riscv at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-riscv
> Regards,
> Anup


Thanks
Zhe