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

Commit 0801bbaa authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Move probe32 specific APIC functions 



The apic functions which are used in probe_32.c are implemented as inlines
or in apic.c. There is no reason to have them at random places.

Move them to the actual usage site and make them static.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJuergen Gross <jgross@suse.com>
Tested-by: default avatarYu Chen <yu.c.chen@intel.com>
Acked-by: default avatarJuergen Gross <jgross@suse.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Alok Kataria <akataria@vmware.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Rui Zhang <rui.zhang@intel.com>
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Len Brown <lenb@kernel.org>
Link: https://lkml.kernel.org/r/20170913213153.596768194@linutronix.de
parent 57e0aa44

arch/x86/include/asm/apic.h

+0 −21
Original line number Diff line number Diff line
@@ -524,31 +524,10 @@ extern void default_setup_apic_routing(void); 
extern struct apic apic_noop;



#ifdef CONFIG_X86_32



static inline int noop_x86_32_early_logical_apicid(int cpu)

{

	return BAD_APICID;

}



/*

 * Set up the logical destination ID.

 *

 * Intel recommends to set DFR, LDR and TPR before enabling

 * an APIC.  See e.g. "AP-388 82489DX User's Manual" (Intel

 * document number 292116).  So here it goes...

 */

extern void default_init_apic_ldr(void);



static inline int default_apic_id_registered(void)

{

	return physid_isset(read_apic_id(), phys_cpu_present_map);

}



static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)

{

	return cpuid_apic >> index_msb;

}



#endif



extern int flat_cpu_mask_to_apicid(const struct cpumask *cpumask,

arch/x86/kernel/apic/apic.c

+0 −10
Original line number Diff line number Diff line
@@ -2273,16 +2273,6 @@ int hard_smp_processor_id(void) 
	return read_apic_id();

}



void default_init_apic_ldr(void)

{

	unsigned long val;



	apic_write(APIC_DFR, APIC_DFR_VALUE);

	val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

	val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());

	apic_write(APIC_LDR, val);

}



int default_cpu_mask_to_apicid(const struct cpumask *mask,

			       struct irq_data *irqdata,

			       unsigned int *apicid)

arch/x86/kernel/apic/probe_32.c

+25 −0
Original line number Diff line number Diff line
@@ -66,6 +66,31 @@ static void setup_apic_flat_routing(void) 
#endif

}



static int default_apic_id_registered(void)

{

	return physid_isset(read_apic_id(), phys_cpu_present_map);

}



/*

 * Set up the logical destination ID.  Intel recommends to set DFR, LDR and

 * TPR before enabling an APIC.  See e.g. "AP-388 82489DX User's Manual"

 * (Intel document number 292116).

 */

static void default_init_apic_ldr(void)

{

	unsigned long val;



	apic_write(APIC_DFR, APIC_DFR_VALUE);

	val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;

	val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id());

	apic_write(APIC_LDR, val);

}



static int default_phys_pkg_id(int cpuid_apic, int index_msb)

{

	return cpuid_apic >> index_msb;

}



/* should be called last. */

static int probe_default(void)

{