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

Commit d02dc27d authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu() 



acpi_map_lsapic() will allocate a logical CPU number and map it to
physical CPU id (such as APIC id) for the hot-added CPU, it will also
do some mapping for NUMA node id and etc, acpi_unmap_lsapic() will
do the reverse.

We can see that the name of the function is a little bit confusing and
arch (IA64) dependent so rename them as acpi_(un)map_cpu() to make arch
agnostic and explicit.

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent af8f3f51

arch/ia64/kernel/acpi.c

+4 −5
Original line number Diff line number Diff line
@@ -893,13 +893,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 
}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)

int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu)

{

	return _acpi_map_lsapic(handle, physid, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);

EXPORT_SYMBOL(acpi_map_cpu);



int acpi_unmap_lsapic(int cpu)

int acpi_unmap_cpu(int cpu)

{

	ia64_cpu_to_sapicid[cpu] = -1;

	set_cpu_present(cpu, false);
@@ -910,8 +910,7 @@ int acpi_unmap_lsapic(int cpu) 


	return (0);

}



EXPORT_SYMBOL(acpi_unmap_lsapic);

EXPORT_SYMBOL(acpi_unmap_cpu);

#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



#ifdef CONFIG_ACPI_NUMA

arch/x86/kernel/acpi/boot.c

+4 −5
Original line number Diff line number Diff line
@@ -750,13 +750,13 @@ static int _acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu) 
}



/* wrapper to silence section mismatch warning */

int __ref acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu)

int __ref acpi_map_cpu(acpi_handle handle, int physid, int *pcpu)

{

	return _acpi_map_lsapic(handle, physid, pcpu);

}

EXPORT_SYMBOL(acpi_map_lsapic);

EXPORT_SYMBOL(acpi_map_cpu);



int acpi_unmap_lsapic(int cpu)

int acpi_unmap_cpu(int cpu)

{

#ifdef CONFIG_ACPI_NUMA

	set_apicid_to_node(per_cpu(x86_cpu_to_apicid, cpu), NUMA_NO_NODE);
@@ -768,8 +768,7 @@ int acpi_unmap_lsapic(int cpu) 


	return (0);

}



EXPORT_SYMBOL(acpi_unmap_lsapic);

EXPORT_SYMBOL(acpi_unmap_cpu);

#endif				/* CONFIG_ACPI_HOTPLUG_CPU */



int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)

drivers/acpi/acpi_processor.c

+3 −3
Original line number Diff line number Diff line
@@ -180,13 +180,13 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr) 
	cpu_maps_update_begin();

	cpu_hotplug_begin();



	ret = acpi_map_lsapic(pr->handle, pr->phys_id, &pr->id);

	ret = acpi_map_cpu(pr->handle, pr->phys_id, &pr->id);

	if (ret)

		goto out;



	ret = arch_register_cpu(pr->id);

	if (ret) {

		acpi_unmap_lsapic(pr->id);

		acpi_unmap_cpu(pr->id);

		goto out;

	}
@@ -461,7 +461,7 @@ static void acpi_processor_remove(struct acpi_device *device) 


	/* Remove the CPU. */

	arch_unregister_cpu(pr->id);

	acpi_unmap_lsapic(pr->id);

	acpi_unmap_cpu(pr->id);



	cpu_hotplug_done();

	cpu_maps_update_done();

include/linux/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ void acpi_numa_arch_fixup(void); 


#ifdef CONFIG_ACPI_HOTPLUG_CPU

/* Arch dependent functions for cpu hotplug support */

int acpi_map_lsapic(acpi_handle handle, int physid, int *pcpu);

int acpi_unmap_lsapic(int cpu);

int acpi_map_cpu(acpi_handle handle, int physid, int *pcpu);

int acpi_unmap_cpu(int cpu);

#endif /* CONFIG_ACPI_HOTPLUG_CPU */



int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base);