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

Commit 736decac authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Move percpu clockevents setup to x86_init_ops 



paravirt overrides the setup of the default apic timers as per cpu
timers. Moorestown needs to override that as well.

Move it to x86_init_ops setup and create a separate x86_cpuinit struct
which holds the function for the secondary evtl. hotplugabble CPUs.

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

arch/x86/include/asm/apic.h

+2 −3
Original line number Diff line number Diff line
@@ -70,9 +70,6 @@ static inline void default_inquire_remote_apic(int apicid) 
 */

#ifdef CONFIG_PARAVIRT

#include <asm/paravirt.h>

#else

#define setup_boot_clock setup_boot_APIC_clock

#define setup_secondary_clock setup_secondary_APIC_clock

#endif



#ifdef CONFIG_X86_64
@@ -245,6 +242,8 @@ static inline void lapic_shutdown(void) { } 
static inline void init_apic_mappings(void) { }

static inline void disable_local_APIC(void) { }

static inline void apic_disable(void) { }

# define setup_boot_APIC_clock x86_init_noop

# define setup_secondary_APIC_clock x86_init_noop

#endif /* !CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_64

arch/x86/include/asm/paravirt.h

+0 −12
Original line number Diff line number Diff line
@@ -333,18 +333,6 @@ static inline void slow_down_io(void) 
#endif

}



#ifdef CONFIG_X86_LOCAL_APIC

static inline void setup_boot_clock(void)

{

	PVOP_VCALL0(pv_apic_ops.setup_boot_clock);

}



static inline void setup_secondary_clock(void)

{

	PVOP_VCALL0(pv_apic_ops.setup_secondary_clock);

}

#endif



#ifdef CONFIG_SMP

static inline void startup_ipi_hook(int phys_apicid, unsigned long start_eip,

				    unsigned long start_esp)

arch/x86/include/asm/paravirt_types.h

+0 −3
Original line number Diff line number Diff line
@@ -218,9 +218,6 @@ struct pv_irq_ops { 


struct pv_apic_ops {

#ifdef CONFIG_X86_LOCAL_APIC

	void (*setup_boot_clock)(void);

	void (*setup_secondary_clock)(void);



	void (*startup_ipi_hook)(int phys_apicid,

				 unsigned long start_eip,

				 unsigned long start_esp);

arch/x86/include/asm/x86_init.h

+19 −0
Original line number Diff line number Diff line
@@ -78,6 +78,15 @@ struct x86_init_paging { 
	void (*pagetable_setup_done)(pgd_t *base);

};



/**

 * struct x86_init_timers - platform specific timer setup

 * @setup_perpcu_clockev:	set up the per cpu clock event device for the

 *				boot cpu

 */

struct x86_init_timers {

	void (*setup_percpu_clockev)(void);

};



/**

 * struct x86_init_ops - functions for platform specific setup

 *
@@ -88,9 +97,19 @@ struct x86_init_ops { 
	struct x86_init_irqs		irqs;

	struct x86_init_oem		oem;

	struct x86_init_paging		paging;

	struct x86_init_timers		timers;

};



/**

 * struct x86_cpuinit_ops - platform specific cpu hotplug setups

 * @setup_percpu_clockev:	set up the per cpu clock event device

 */

struct x86_cpuinit_ops {

	void (*setup_percpu_clockev)(void);

};



extern struct x86_init_ops x86_init;

extern struct x86_cpuinit_ops x86_cpuinit;



extern void x86_init_noop(void);

extern void x86_init_uint_noop(unsigned int unused);

arch/x86/kernel/apic/apic.c

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/mm.h>



#include <asm/perf_counter.h>

#include <asm/x86_init.h>

#include <asm/pgalloc.h>

#include <asm/atomic.h>

#include <asm/mpspec.h>
@@ -1701,7 +1702,7 @@ int __init APIC_init_uniprocessor(void) 
	localise_nmi_watchdog();

#endif



	setup_boot_clock();

	x86_init.timers.setup_percpu_clockev();

#ifdef CONFIG_X86_64

	check_nmi_watchdog();

#endif