Messages in this thread | | | From | Huacai Chen <> | Date | Mon, 25 Dec 2023 17:19:16 +0800 | Subject | Re: [PATCH] LoongArch: Let cores_io_master cover the largest NR_CPUS |
| |
On Mon, Dec 25, 2023 at 5:13 PM maobibo <maobibo@loongson.cn> wrote: > > > > On 2023/12/25 下午3:00, Huacai Chen wrote: > > Now loongson_system_configuration::cores_io_master only covers 64 cpus, > > if NR_CPUS > 64 there will be memory corruption. So let cores_io_master > > cover the largest NR_CPUS (256). > > > > Signed-off-by: Huacai Chen <chenhuacai@loongson.cn> > > --- > > arch/loongarch/include/asm/bootinfo.h | 4 ++-- > > arch/loongarch/kernel/acpi.c | 2 +- > > arch/loongarch/kernel/smp.c | 2 +- > > 3 files changed, 4 insertions(+), 4 deletions(-) > > > > diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h > > index c60796869b2b..32fd0319594a 100644 > > --- a/arch/loongarch/include/asm/bootinfo.h > > +++ b/arch/loongarch/include/asm/bootinfo.h > > @@ -30,7 +30,7 @@ struct loongson_system_configuration { > > int boot_cpu_id; > > int cores_per_node; > > int cores_per_package; > > - unsigned long cores_io_master; > > + unsigned long cores_io_master[4]; > Can the hardcoded 4 be defined something like this? > DIV_ROUND_UP(CONFIG_NR_CPUS, sizeof(long)) Can this be used to define arrays?
Huacai
> > the others LGTM. > > Regards > Bibo Mao > > unsigned long suspend_addr; > > const char *cpuname; > > }; > > @@ -42,7 +42,7 @@ extern struct loongson_system_configuration loongson_sysconf; > > > > static inline bool io_master(int cpu) > > { > > - return test_bit(cpu, &loongson_sysconf.cores_io_master); > > + return test_bit(cpu, loongson_sysconf.cores_io_master); > > } > > > > #endif /* _ASM_BOOTINFO_H */ > > diff --git a/arch/loongarch/kernel/acpi.c b/arch/loongarch/kernel/acpi.c > > index 8e00a754e548..b6b097bbf866 100644 > > --- a/arch/loongarch/kernel/acpi.c > > +++ b/arch/loongarch/kernel/acpi.c > > @@ -119,7 +119,7 @@ acpi_parse_eio_master(union acpi_subtable_headers *header, const unsigned long e > > return -EINVAL; > > > > core = eiointc->node * CORES_PER_EIO_NODE; > > - set_bit(core, &(loongson_sysconf.cores_io_master)); > > + set_bit(core, loongson_sysconf.cores_io_master); > > > > return 0; > > } > > diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c > > index 9e33b5e36122..a16e3dbe9f09 100644 > > --- a/arch/loongarch/kernel/smp.c > > +++ b/arch/loongarch/kernel/smp.c > > @@ -208,7 +208,7 @@ static void __init fdt_smp_setup(void) > > } > > > > loongson_sysconf.nr_cpus = num_processors; > > - set_bit(0, &(loongson_sysconf.cores_io_master)); > > + set_bit(0, loongson_sysconf.cores_io_master); > > #endif > > } > > > > >
| |