Commit e9e7ff16 authored by Huacai Chen's avatar Huacai Chen

LoongArch: Parse MADT to get multi-processor information

Parse MADT to get multi-processor information, in order to fix the boot
problem and cpu-hotplug problem for SMP platform.
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent ab2579d7
...@@ -28,10 +28,10 @@ struct loongson_board_info { ...@@ -28,10 +28,10 @@ struct loongson_board_info {
struct loongson_system_configuration { struct loongson_system_configuration {
int nr_cpus; int nr_cpus;
int nr_nodes; int nr_nodes;
int nr_io_pics;
int boot_cpu_id; int boot_cpu_id;
int cores_per_node; int cores_per_node;
int cores_per_package; int cores_per_package;
unsigned long cores_io_master;
const char *cpuname; const char *cpuname;
}; };
......
...@@ -82,8 +82,6 @@ extern struct acpi_vector_group msi_group[MAX_IO_PICS]; ...@@ -82,8 +82,6 @@ extern struct acpi_vector_group msi_group[MAX_IO_PICS];
#define GSI_MAX_PCH_IRQ (LOONGSON_PCH_IRQ_BASE + 256 - 1) #define GSI_MAX_PCH_IRQ (LOONGSON_PCH_IRQ_BASE + 256 - 1)
extern int find_pch_pic(u32 gsi); extern int find_pch_pic(u32 gsi);
extern int eiointc_get_node(int id);
struct acpi_madt_lio_pic; struct acpi_madt_lio_pic;
struct acpi_madt_eio_pic; struct acpi_madt_eio_pic;
struct acpi_madt_ht_pic; struct acpi_madt_ht_pic;
......
...@@ -104,6 +104,39 @@ static int set_processor_mask(u32 id, u32 flags) ...@@ -104,6 +104,39 @@ static int set_processor_mask(u32 id, u32 flags)
} }
#endif #endif
static int __init
acpi_parse_processor(union acpi_subtable_headers *header, const unsigned long end)
{
struct acpi_madt_core_pic *processor = NULL;
processor = (struct acpi_madt_core_pic *)header;
if (BAD_MADT_ENTRY(processor, end))
return -EINVAL;
acpi_table_print_madt_entry(&header->common);
#ifdef CONFIG_SMP
set_processor_mask(processor->core_id, processor->flags);
#endif
return 0;
}
static int __init
acpi_parse_eio_master(union acpi_subtable_headers *header, const unsigned long end)
{
static int core = 0;
struct acpi_madt_eio_pic *eiointc = NULL;
eiointc = (struct acpi_madt_eio_pic *)header;
if (BAD_MADT_ENTRY(eiointc, end))
return -EINVAL;
core = eiointc->node * CORES_PER_EIO_NODE;
set_bit(core, &(loongson_sysconf.cores_io_master));
return 0;
}
static void __init acpi_process_madt(void) static void __init acpi_process_madt(void)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -114,6 +147,11 @@ static void __init acpi_process_madt(void) ...@@ -114,6 +147,11 @@ static void __init acpi_process_madt(void)
__cpu_logical_map[i] = -1; __cpu_logical_map[i] = -1;
} }
#endif #endif
acpi_table_parse_madt(ACPI_MADT_TYPE_CORE_PIC,
acpi_parse_processor, MAX_CORE_PIC);
acpi_table_parse_madt(ACPI_MADT_TYPE_EIO_PIC,
acpi_parse_eio_master, MAX_IO_PICS);
loongson_sysconf.nr_cpus = num_processors; loongson_sysconf.nr_cpus = num_processors;
} }
......
...@@ -242,10 +242,7 @@ void loongson3_smp_finish(void) ...@@ -242,10 +242,7 @@ void loongson3_smp_finish(void)
static bool io_master(int cpu) static bool io_master(int cpu)
{ {
if (cpu == 0) return test_bit(cpu, &loongson_sysconf.cores_io_master);
return true;
return false;
} }
int loongson3_cpu_disable(void) int loongson3_cpu_disable(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment