summaryrefslogtreecommitdiffstats
path: root/arch/loongarch/include
diff options
context:
space:
mode:
authorHuacai Chen <chenhuacai@loongson.cn>2024-01-17 12:43:08 +0800
committerHuacai Chen <chenhuacai@loongson.cn>2024-01-17 12:43:08 +0800
commitce68ff3528e6eff4a1a4770600ec6c66779ba7b9 (patch)
tree68e2a79568120fc88a3b99f4a1ce827002eb6599 /arch/loongarch/include
parentd23b77953f5a4fbf94c05157b186aac2a247ae32 (diff)
downloadlinux-stable-ce68ff3528e6eff4a1a4770600ec6c66779ba7b9.tar.gz
linux-stable-ce68ff3528e6eff4a1a4770600ec6c66779ba7b9.tar.bz2
linux-stable-ce68ff3528e6eff4a1a4770600ec6c66779ba7b9.zip
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>
Diffstat (limited to 'arch/loongarch/include')
-rw-r--r--arch/loongarch/include/asm/bootinfo.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/loongarch/include/asm/bootinfo.h b/arch/loongarch/include/asm/bootinfo.h
index c60796869b2b..6d5846dd075c 100644
--- 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 */