x86/mrst for 2.6.36
Hi Linus,
The following changes since commit cdd854bc42b5e6c79bbbc40c6600d995ffe6e747:
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (2010-08-05 09:03:46 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-mrst-for-linus
H. Peter Anvin (2):
x86, mrst: make mrst_identify_cpu() an inline returning enum x86, mrst: make mrst_timer_options an enum
Jacob Pan (3):
x86: detect scattered cpuid features earlier x86, mrst: add cpu type detection x86, mrst: add more timer config options
arch/x86/include/asm/apb_timer.h | 1 - arch/x86/include/asm/mrst.h | 26 +++++++++ arch/x86/kernel/apb_timer.c | 37 +++---------- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/mrst.c | 105 +++++++++++++++++++++++++++++-------- 5 files changed, 117 insertions(+), 54 deletions(-)
arch/x86/include/asm/apb_timer.h +0 -1
@@ -55,7 +55,6 @@ extern unsigned long apbt_quick_calibrate(void);extern int arch_setup_apbt_irqs (int irq,int trigger,int mask,int cpu);extern void apbt_setup_secondary_clock (void );extern unsigned int boot_cpu_id; -extern int disable_apbt_percpu;extern struct sfi_timer_table_entry *sfi_get_mtmr (int hint);extern void sfi_free_mtmr (struct sfi_timer_table_entry *mtmr);
arch/x86/include/asm/mrst.h +26 -0
@@ -13,6 +13,32 @@extern int pci_mrst_init (void );int __init sfi_parse_mrtc (struct sfi_table_header *table); +/* +* Medfield is the follow-up of Moorestown, it combines two chip solution into +* one. Other than that it also added always-on and constant tsc and lapic +* timers. Medfield is the platform name, and the chip name is called Penwell +* we treat Medfield/Penwell as a variant of Moorestown. Penwell can be +* identified via MSRs. +*/ +enum mrst_cpu_type { +MRST_CPU_CHIP_LINCROFT =1 , +MRST_CPU_CHIP_PENWELL , +}; + +extern enum mrst_cpu_type __mrst_cpu_chip; +static enum mrst_cpu_type mrst_identify_cpu (void ) +{ +return __mrst_cpu_chip; +} + +enum mrst_timer_options { +MRST_TIMER_DEFAULT , +MRST_TIMER_APBT_ONLY , +MRST_TIMER_LAPIC_APBT , +}; + +extern enum mrst_timer_options mrst_timer_options; +#define SFI_MTMR_MAX_NUM 8#define SFI_MRTC_MAX 8
arch/x86/kernel/apb_timer.c +8 -29
@@ -43,10 +43,11 @@#include <asm/fixmap.h> #include <asm/apb_timer.h> +#include <asm/mrst.h> #define APBT_MASK CLOCKSOURCE_MASK(32)#define APBT_SHIFT 22 -#define APBT_CLOCKEVENT_RATING 150 +#define APBT_CLOCKEVENT_RATING 110#define APBT_CLOCKSOURCE_RATING 250#define APBT_MIN_DELTA_USEC 200
@@ -83,8 +84,6 @@ struct apbt_dev {char name[10 ]; }; -int disable_apbt_percpu__cpuinitdata ; - static DEFINE_PER_CPU(struct apbt_dev, cpu_apbt_dev);#ifdef CONFIG_SMP
@@ -195,29 +194,6 @@ static struct clock_event_device apbt_clockevent = { };/* -* if user does not want to use per CPU apb timer, just give it a lower rating -* than local apic timer and skip the late per cpu timer init. -*/ -static inline int __init setup_x86_mrst_timer (char *arg) -{ -if (!arg) -return -EINVAL ; - -if (strcmp ("apbt_only" , arg) ==0 ) - disable_apbt_percpu =0 ; -else if (strcmp ("lapic_and_apbt" , arg) ==0 ) - disable_apbt_percpu =1 ; -else { -pr_warning ("X86 MRST timer option %s not recognised" -" use x86_mrst_timer=apbt_only or lapic_and_apbt\n" , - arg); -return -EINVAL ; - } -return 0 ; -} -__setup ("x86_mrst_timer=" , setup_x86_mrst_timer); - -/* * start count down from 0xffff_ffff. this is done by toggling the enable bit * then load initial load count to ~0. */
@@ -335,7 +311,7 @@ static int __init apbt_clockevent_register(void) adev->num =smp_processor_id ();memcpy (&adev->evt, &apbt_clockevent,sizeof (struct clock_event_device )); -if (disable_apbt_percpu) { +if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT ) { apbt_clockevent.rating =APBT_CLOCKEVENT_RATING -100 ; global_clock_event = &adev->evt; printk(KERN_DEBUG "%s clockevent registered as global\n",
@@ -429,7 +405,8 @@ static int apbt_cpuhp_notify(struct notifier_block *n,static __init int apbt_late_init (void ) { -if (disable_apbt_percpu || !apb_timer_block_enabled) +if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT || + !apb_timer_block_enabled)return 0 ;/* This notifier should be called after workqueue is ready */ hotcpu_notifier (apbt_cpuhp_notify,-20 );
@@ -450,6 +427,8 @@ static void apbt_set_mode(enum clock_event_mode mode,int timer_num;struct apbt_dev *adev =EVT_TO_APBT_DEV (evt); +BUG_ON (!apbt_virt_address); + timer_num = adev->num;pr_debug ("%s CPU %d timer %d mode=%d\n" , __func__,first_cpu (*evt->cpumask), timer_num, mode);
@@ -676,7 +655,7 @@ void __init apbt_time_init(void) }#ifdef CONFIG_SMP /* kernel cmdline disable apb timer, so we will use lapic timers */ -if (disable_apbt_percpu) { +if (mrst_timer_options ==MRST_TIMER_LAPIC_APBT ) {printk (KERN_INFO "apbt: disabled per cpu timer\n" );return ; }
arch/x86/kernel/cpu/common.c +1 -1
@@ -576,6 +576,7 @@ static void __cpuinit get_cpu_cap(struct cpuinfo_x86 *c)if (c->extended_cpuid_level >=0x80000007 ) c->x86_power =cpuid_edx (0x80000007 ); +init_scattered_cpuid_features (c); }static void __cpuinit identify_cpu_without_cpuid (struct cpuinfo_x86 *c)
@@ -731,7 +732,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)get_model_name (c);/* Default name */ -init_scattered_cpuid_features (c);detect_nopl (c); }
arch/x86/kernel/mrst.c +82 -23
144 lines not on this page · raw message