Commit 9a2a637a authored Aug 08, 2023 by Thomas Gleixner Committed by Dave Hansen Aug 09, 2023

x86/apic: Nuke apic::apicid_to_cpu_present()



This is only used on 32bit and is a wrapper around
physid_set_mask_of_physid() in all 32bit APIC drivers.

Remove the callback and use physid_set_mask_of_physid() in the code
directly,

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Sohil Mehta <sohil.mehta@intel.com>
Tested-by: Juergen Gross <jgross@suse.com> # Xen PV (dom0 and unpriv. guest)

parent 2f6df03f

arch/x86/include/asm/apic.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -304,7 +304,6 @@ struct apic {
		void (ioapic_phys_id_map)(physid_mask_t phys_map, physid_mask_t *retmap);
		void (*setup_apic_routing)(void);
		int (*cpu_present_to_apicid)(int mps_cpu);
		void (apicid_to_cpu_present)(int phys_apicid, physid_mask_t retmap);
		int (*phys_pkg_id)(int cpuid_apic, int index_msb);

		u32 (*get_apic_id)(unsigned long x);

arch/x86/kernel/apic/apic_flat_64.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ static struct apic apic_flat __ro_after_init = {
		.ioapic_phys_id_map = NULL,
		.setup_apic_routing = NULL,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = NULL,
		.phys_pkg_id = flat_phys_pkg_id,

		.get_apic_id = flat_get_apic_id,
		@@ -181,7 +180,6 @@ static struct apic apic_physflat __ro_after_init = {
		.ioapic_phys_id_map = NULL,
		.setup_apic_routing = NULL,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = NULL,
		.phys_pkg_id = flat_phys_pkg_id,

		.get_apic_id = flat_get_apic_id,

arch/x86/kernel/apic/apic_noop.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,6 @@ struct apic apic_noop __ro_after_init = {
		.ioapic_phys_id_map = default_ioapic_phys_id_map,
		.setup_apic_routing = NULL,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = physid_set_mask_of_physid,

		.phys_pkg_id = noop_phys_pkg_id,

arch/x86/kernel/apic/apic_numachip.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -255,7 +255,6 @@ static const struct apic apic_numachip1 __refconst = {
		.ioapic_phys_id_map = NULL,
		.setup_apic_routing = NULL,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = NULL,
		.phys_pkg_id = numachip_phys_pkg_id,

		.get_apic_id = numachip1_get_apic_id,
		@@ -299,7 +298,6 @@ static const struct apic apic_numachip2 __refconst = {
		.ioapic_phys_id_map = NULL,
		.setup_apic_routing = NULL,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = NULL,
		.phys_pkg_id = numachip_phys_pkg_id,

		.get_apic_id = numachip2_get_apic_id,

arch/x86/kernel/apic/bigsmp_32.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,6 @@ static struct apic apic_bigsmp __ro_after_init = {
		.ioapic_phys_id_map = bigsmp_ioapic_phys_id_map,
		.setup_apic_routing = bigsmp_setup_apic_routing,
		.cpu_present_to_apicid = default_cpu_present_to_apicid,
		.apicid_to_cpu_present = physid_set_mask_of_physid,
		.phys_pkg_id = bigsmp_phys_pkg_id,

		.get_apic_id = bigsmp_get_apic_id,