Skip to content

L
linux
Commit 09c3f2bd authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner
Browse files
Options

Revert"x86/acpi: Enable MADT APIs to return disabled apicids" 

Revert: 8ad893fa ("x86/acpi: Enable MADT APIs to return disabled apicids")

Remove the leftovers of the boot time 'cpuid <-> nodeid' mapping approach.
Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Tested-by: default avatarXiaolong Ye <xiaolong.ye@intel.com>
Cc: rjw@rjwysocki.net
Cc: linux-acpi@vger.kernel.org
Cc: guzheng1@huawei.com
Cc: izumi.taku@jp.fujitsu.com
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1488528147-2279-3-git-send-email-douly.fnst@cn.fujitsu.comSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c962cff1
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 38 deletions
drivers/acpi/processor_core.c
View file @ 09c3f2bd
...@@ -32,12 +32,12 @@ static struct acpi_table_madt *get_madt_table(void) ...@@ -32,12 +32,12 @@ static struct acpi_table_madt *get_madt_table(void)
} }
static int map_lapic_id(struct acpi_subtable_header *entry, static int map_lapic_id(struct acpi_subtable_header *entry,
u32 acpi_id, phys_cpuid_t *apic_id, bool ignore_disabled) u32 acpi_id, phys_cpuid_t *apic_id)
{ {
struct acpi_madt_local_apic *lapic = struct acpi_madt_local_apic *lapic =
container_of(entry, struct acpi_madt_local_apic, header); container_of(entry, struct acpi_madt_local_apic, header);
if (ignore_disabled && !(lapic->lapic_flags & ACPI_MADT_ENABLED)) if (!(lapic->lapic_flags & ACPI_MADT_ENABLED))
return -ENODEV; return -ENODEV;
if (lapic->processor_id != acpi_id) if (lapic->processor_id != acpi_id)
...@@ -48,13 +48,12 @@ static int map_lapic_id(struct acpi_subtable_header *entry, ...@@ -48,13 +48,12 @@ static int map_lapic_id(struct acpi_subtable_header *entry,
} }
static int map_x2apic_id(struct acpi_subtable_header *entry, static int map_x2apic_id(struct acpi_subtable_header *entry,
int device_declaration, u32 acpi_id, phys_cpuid_t *apic_id, int device_declaration, u32 acpi_id, phys_cpuid_t *apic_id)
bool ignore_disabled)
{ {
struct acpi_madt_local_x2apic *apic = struct acpi_madt_local_x2apic *apic =
container_of(entry, struct acpi_madt_local_x2apic, header); container_of(entry, struct acpi_madt_local_x2apic, header);
if (ignore_disabled && !(apic->lapic_flags & ACPI_MADT_ENABLED)) if (!(apic->lapic_flags & ACPI_MADT_ENABLED))
return -ENODEV; return -ENODEV;
if (device_declaration && (apic->uid == acpi_id)) { if (device_declaration && (apic->uid == acpi_id)) {
...@@ -66,13 +65,12 @@ static int map_x2apic_id(struct acpi_subtable_header *entry, ...@@ -66,13 +65,12 @@ static int map_x2apic_id(struct acpi_subtable_header *entry,
} }
static int map_lsapic_id(struct acpi_subtable_header *entry, static int map_lsapic_id(struct acpi_subtable_header *entry,
int device_declaration, u32 acpi_id, phys_cpuid_t *apic_id, int device_declaration, u32 acpi_id, phys_cpuid_t *apic_id)
bool ignore_disabled)
{ {
struct acpi_madt_local_sapic *lsapic = struct acpi_madt_local_sapic *lsapic =
container_of(entry, struct acpi_madt_local_sapic, header); container_of(entry, struct acpi_madt_local_sapic, header);
if (ignore_disabled && !(lsapic->lapic_flags & ACPI_MADT_ENABLED)) if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))
return -ENODEV; return -ENODEV;
if (device_declaration) { if (device_declaration) {
...@@ -89,13 +87,12 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, ...@@ -89,13 +87,12 @@ static int map_lsapic_id(struct acpi_subtable_header *entry,
* Retrieve the ARM CPU physical identifier (MPIDR) * Retrieve the ARM CPU physical identifier (MPIDR)
*/ */
static int map_gicc_mpidr(struct acpi_subtable_header *entry, static int map_gicc_mpidr(struct acpi_subtable_header *entry,
int device_declaration, u32 acpi_id, phys_cpuid_t *mpidr, int device_declaration, u32 acpi_id, phys_cpuid_t *mpidr)
bool ignore_disabled)
{ {
struct acpi_madt_generic_interrupt *gicc = struct acpi_madt_generic_interrupt *gicc =
container_of(entry, struct acpi_madt_generic_interrupt, header); container_of(entry, struct acpi_madt_generic_interrupt, header);
if (ignore_disabled && !(gicc->flags & ACPI_MADT_ENABLED)) if (!(gicc->flags & ACPI_MADT_ENABLED))
return -ENODEV; return -ENODEV;
/* device_declaration means Device object in DSDT, in the /* device_declaration means Device object in DSDT, in the
...@@ -112,7 +109,7 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry, ...@@ -112,7 +109,7 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry,
} }
static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt,
int type, u32 acpi_id, bool ignore_disabled) int type, u32 acpi_id)
{ {
unsigned long madt_end, entry; unsigned long madt_end, entry;
phys_cpuid_t phys_id = PHYS_CPUID_INVALID; /* CPU hardware ID */ phys_cpuid_t phys_id = PHYS_CPUID_INVALID; /* CPU hardware ID */
...@@ -130,20 +127,16 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, ...@@ -130,20 +127,16 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt,
struct acpi_subtable_header *header = struct acpi_subtable_header *header =
(struct acpi_subtable_header *)entry; (struct acpi_subtable_header *)entry;
if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) { if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) {
if (!map_lapic_id(header, acpi_id, &phys_id, if (!map_lapic_id(header, acpi_id, &phys_id))
ignore_disabled))
break; break;
} else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) { } else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) {
if (!map_x2apic_id(header, type, acpi_id, &phys_id, if (!map_x2apic_id(header, type, acpi_id, &phys_id))
ignore_disabled))
break; break;
} else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) {
if (!map_lsapic_id(header, type, acpi_id, &phys_id, if (!map_lsapic_id(header, type, acpi_id, &phys_id))
ignore_disabled))
break; break;
} else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) {
if (!map_gicc_mpidr(header, type, acpi_id, &phys_id, if (!map_gicc_mpidr(header, type, acpi_id, &phys_id))
ignore_disabled))
break; break;
} }
entry += header->length; entry += header->length;
...@@ -161,15 +154,14 @@ phys_cpuid_t __init acpi_map_madt_entry(u32 acpi_id) ...@@ -161,15 +154,14 @@ phys_cpuid_t __init acpi_map_madt_entry(u32 acpi_id)
if (!madt) if (!madt)
return PHYS_CPUID_INVALID; return PHYS_CPUID_INVALID;
rv = map_madt_entry(madt, 1, acpi_id, true); rv = map_madt_entry(madt, 1, acpi_id);
acpi_put_table((struct acpi_table_header *)madt); acpi_put_table((struct acpi_table_header *)madt);
return rv; return rv;
} }
static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id, static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id)
bool ignore_disabled)
{ {
struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
union acpi_object *obj; union acpi_object *obj;
...@@ -190,38 +182,30 @@ static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id, ...@@ -190,38 +182,30 @@ static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id,
header = (struct acpi_subtable_header *)obj->buffer.pointer; header = (struct acpi_subtable_header *)obj->buffer.pointer;
if (header->type == ACPI_MADT_TYPE_LOCAL_APIC) if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)
map_lapic_id(header, acpi_id, &phys_id, ignore_disabled); map_lapic_id(header, acpi_id, &phys_id);
else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)
map_lsapic_id(header, type, acpi_id, &phys_id, ignore_disabled); map_lsapic_id(header, type, acpi_id, &phys_id);
else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC) else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)
map_x2apic_id(header, type, acpi_id, &phys_id, ignore_disabled); map_x2apic_id(header, type, acpi_id, &phys_id);
else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT)
map_gicc_mpidr(header, type, acpi_id, &phys_id, map_gicc_mpidr(header, type, acpi_id, &phys_id);
ignore_disabled);
exit: exit:
kfree(buffer.pointer); kfree(buffer.pointer);
return phys_id; return phys_id;
} }
static phys_cpuid_t __acpi_get_phys_id(acpi_handle handle, int type, phys_cpuid_t acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id)
u32 acpi_id, bool ignore_disabled)
{ {
phys_cpuid_t phys_id; phys_cpuid_t phys_id;
phys_id = map_mat_entry(handle, type, acpi_id, ignore_disabled); phys_id = map_mat_entry(handle, type, acpi_id);
if (invalid_phys_cpuid(phys_id)) if (invalid_phys_cpuid(phys_id))
phys_id = map_madt_entry(get_madt_table(), type, acpi_id, phys_id = map_madt_entry(get_madt_table(), type, acpi_id);
ignore_disabled);
return phys_id; return phys_id;
} }
phys_cpuid_t acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id)
{
return __acpi_get_phys_id(handle, type, acpi_id, true);
}
int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id) int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id)
{ {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7