Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ad893fa authored by Gu Zheng's avatar Gu Zheng Committed by Thomas Gleixner
Browse files

x86/acpi: Enable MADT APIs to return disabled apicids 



The whole patch-set aims at making cpuid <-> nodeid mapping persistent. So that,
when node online/offline happens, cache based on cpuid <-> nodeid mapping such as
wq_numa_possible_cpumask will not cause any problem.
It contains 4 steps:
1. Enable apic registeration flow to handle both enabled and disabled cpus.
2. Introduce a new array storing all possible cpuid <-> apicid mapping.
3. Enable _MAT and MADT relative apis to return non-present or disabled cpus' apicid.
4. Establish all possible cpuid <-> nodeid mapping.

This patch finishes step 3.

There are four mappings in the kernel:
1. nodeid (logical node id)   <->   pxm        (persistent)
2. apicid (physical cpu id)   <->   nodeid     (persistent)
3. cpuid (logical cpu id)     <->   apicid     (not persistent, now persistent by step 2)
4. cpuid (logical cpu id)     <->   nodeid     (not persistent)

So, in order to setup persistent cpuid <-> nodeid mapping for all possible CPUs,
we should:
1. Setup cpuid <-> apicid mapping for all possible CPUs, which has been done in step 1, 2.
2. Setup cpuid <-> nodeid mapping for all possible CPUs. But before that, we should
   obtain all apicids from MADT.

All processors' apicids can be obtained by _MAT method or from MADT in ACPI.
The current code ignores disabled processors and returns -ENODEV.

After this patch, a new parameter will be added to MADT APIs so that caller
is able to control if disabled processors are ignored.

Signed-off-by: default avatarGu Zheng <guz.fnst@cn.fujitsu.com>
Signed-off-by: default avatarTang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: mika.j.penttila@gmail.com
Cc: len.brown@intel.com
Cc: rafael@kernel.org
Cc: rjw@rjwysocki.net
Cc: yasu.isimatu@gmail.com
Cc: linux-mm@kvack.org
Cc: linux-acpi@vger.kernel.org
Cc: isimatu.yasuaki@jp.fujitsu.com
Cc: gongzhaogang@inspur.com
Cc: tj@kernel.org
Cc: izumi.taku@jp.fujitsu.com
Cc: cl@linux.com
Cc: chen.tang@easystack.cn
Cc: akpm@linux-foundation.org
Cc: kamezawa.hiroyu@jp.fujitsu.com
Cc: lenb@kernel.org
Link: http://lkml.kernel.org/r/1472114120-3281-5-git-send-email-douly.fnst@cn.fujitsu.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8f54969d

drivers/acpi/acpi_processor.c

+4 −1
Original line number Diff line number Diff line
@@ -300,8 +300,11 @@ static int acpi_processor_get_info(struct acpi_device *device) 
	 *  Extra Processor objects may be enumerated on MP systems with

	 *  less than the max # of CPUs. They should be ignored _iff

	 *  they are physically not present.

	 *

	 *  NOTE: Even if the processor has a cpuid, it may not be present

	 *  because cpuid <-> apicid mapping is persistent now.

	 */

	if (invalid_logical_cpuid(pr->id)) {

	if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) {

		int ret = acpi_processor_hotadd_init(pr);

		if (ret)

			return ret;

drivers/acpi/processor_core.c

+38 −22
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ static struct acpi_table_madt *get_madt_table(void) 
}



static int map_lapic_id(struct acpi_subtable_header *entry,

		 u32 acpi_id, phys_cpuid_t *apic_id)

		 u32 acpi_id, phys_cpuid_t *apic_id, bool ignore_disabled)

{

	struct acpi_madt_local_apic *lapic =

		container_of(entry, struct acpi_madt_local_apic, header);



	if (!(lapic->lapic_flags & ACPI_MADT_ENABLED))

	if (ignore_disabled && !(lapic->lapic_flags & ACPI_MADT_ENABLED))

		return -ENODEV;



	if (lapic->processor_id != acpi_id)
@@ -48,12 +48,13 @@ static int map_lapic_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 =

		container_of(entry, struct acpi_madt_local_x2apic, header);



	if (!(apic->lapic_flags & ACPI_MADT_ENABLED))

	if (ignore_disabled && !(apic->lapic_flags & ACPI_MADT_ENABLED))

		return -ENODEV;



	if (device_declaration && (apic->uid == acpi_id)) {
@@ -65,12 +66,13 @@ static int map_x2apic_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 =

		container_of(entry, struct acpi_madt_local_sapic, header);



	if (!(lsapic->lapic_flags & ACPI_MADT_ENABLED))

	if (ignore_disabled && !(lsapic->lapic_flags & ACPI_MADT_ENABLED))

		return -ENODEV;



	if (device_declaration) {
@@ -87,12 +89,13 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, 
 * Retrieve the ARM CPU physical identifier (MPIDR)

 */

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 =

	    container_of(entry, struct acpi_madt_generic_interrupt, header);



	if (!(gicc->flags & ACPI_MADT_ENABLED))

	if (ignore_disabled && !(gicc->flags & ACPI_MADT_ENABLED))

		return -ENODEV;



	/* device_declaration means Device object in DSDT, in the
@@ -109,7 +112,7 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry, 
}



static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt,

				   int type, u32 acpi_id)

				   int type, u32 acpi_id, bool ignore_disabled)

{

	unsigned long madt_end, entry;

	phys_cpuid_t phys_id = PHYS_CPUID_INVALID;	/* CPU hardware ID */
@@ -127,16 +130,20 @@ static phys_cpuid_t map_madt_entry(struct acpi_table_madt *madt, 
		struct acpi_subtable_header *header =

			(struct acpi_subtable_header *)entry;

		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;

		} 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;

		} 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;

		} 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;

		}

		entry += header->length;
@@ -156,14 +163,15 @@ phys_cpuid_t __init acpi_map_madt_entry(u32 acpi_id) 
	if (!madt)

		return PHYS_CPUID_INVALID;



	rv = map_madt_entry(madt, 1, acpi_id);

	rv = map_madt_entry(madt, 1, acpi_id, true);



	early_acpi_os_unmap_memory(madt, tbl_size);



	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 };

	union acpi_object *obj;
@@ -184,30 +192,38 @@ static phys_cpuid_t map_mat_entry(acpi_handle handle, int type, u32 acpi_id) 


	header = (struct acpi_subtable_header *)obj->buffer.pointer;

	if (header->type == ACPI_MADT_TYPE_LOCAL_APIC)

		map_lapic_id(header, acpi_id, &phys_id);

		map_lapic_id(header, acpi_id, &phys_id, ignore_disabled);

	else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC)

		map_lsapic_id(header, type, acpi_id, &phys_id);

		map_lsapic_id(header, type, acpi_id, &phys_id, ignore_disabled);

	else if (header->type == ACPI_MADT_TYPE_LOCAL_X2APIC)

		map_x2apic_id(header, type, acpi_id, &phys_id);

		map_x2apic_id(header, type, acpi_id, &phys_id, ignore_disabled);

	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:

	kfree(buffer.pointer);

	return phys_id;

}



phys_cpuid_t acpi_get_phys_id(acpi_handle handle, int type, u32 acpi_id)

static phys_cpuid_t __acpi_get_phys_id(acpi_handle handle, int type,

				       u32 acpi_id, bool ignore_disabled)

{

	phys_cpuid_t phys_id;



	phys_id = map_mat_entry(handle, type, acpi_id);

	phys_id = map_mat_entry(handle, type, acpi_id, ignore_disabled);

	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;

}



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)

{

#ifdef CONFIG_SMP