LoongArch: Let cores_io_master cover the largest NR_CPUS

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>

diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h
index c60796869b2b80377d9d6afca9c8705f8d2433e1..6d5846dd075cbdde654760422fac5d9536605d4a 100644 (file)
--- a/arch/loongarch/include/asm/bootinfo.h
+++ b/arch/loongarch/include/asm/bootinfo.h
@@ -24,13 +24,15 @@ struct loongson_board_info {
        const char *board_vendor;
 };
 
+#define NR_WORDS DIV_ROUND_UP(NR_CPUS, BITS_PER_LONG)
+
 struct loongson_system_configuration {
        int nr_cpus;
        int nr_nodes;
        int boot_cpu_id;
        int cores_per_node;
        int cores_per_package;
-       unsigned long cores_io_master;
+       unsigned long cores_io_master[NR_WORDS];
        unsigned long suspend_addr;
        const char *cpuname;
 };
@@ -42,7 +44,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 8e00a754e548943ae4dba5d330a1354426c713d1..b6b097bbf8668a400105dd408c696e4135c824d8 100644 (file)
--- 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 9e33b5e36122556a71252184b3899e105ee12530..a16e3dbe9f09eb2fbf1b239b982b727330f7c233 100644 (file)
--- 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
 }