Switch APIC (+nmi, +oprofile) to driver model
Hi!
Here's next attempt at moving APIC (+nmi, +oprofile) to the driver model. If it looks good I'l submit it to Linus.
Pavel
arch/i386/kernel/apic.c +61 -99
@@ -10,6 +10,7 @@* for testing these extensively. * Maciej W. Rozycki : Various updates and fixes. * Mikael Pettersson : Power Management for UP-APIC. +* Pavel Machek : Converted to driver model. */ #include <linux/config.h>
@@ -23,6 +24,10 @@#include <linux/interrupt.h> #include <linux/mc146818rtc.h> #include <linux/kernel_stat.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/device.h> +#include <linux/pm.h> #include <asm/atomic.h> #include <asm/smp.h>
@@ -54,6 +59,8 @@int prof_old_multiplier[NR_CPUS ] = {1 , };int prof_counter[NR_CPUS ] = {1 , }; +unsigned long apic_phys; +int get_maxlvt (void ) {unsigned int v, ver, maxlvt;
@@ -292,6 +299,27 @@apic_write_around (APIC_LVT1 , value); } +static struct { +/* 'active' is true if the local APIC was enabled by us and +not the BIOS; this signifies that we are also responsible +for disabling it before entering apm/acpi suspend */ +int active; +/* r/w apic fields */ +unsigned int apic_id; +unsigned int apic_taskpri; +unsigned int apic_ldr; +unsigned int apic_dfr; +unsigned int apic_spiv; +unsigned int apic_lvtt; +unsigned int apic_lvtpc; +unsigned int apic_lvt0; +unsigned int apic_lvt1; +unsigned int apic_lvterr; +unsigned int apic_tmict; +unsigned int apic_tdcr; +unsigned int apic_thmr; +} apic_pm_state; +void __init setup_local_APIC (void ) {unsigned long value, ver, maxlvt;
@@ -435,44 +463,19 @@if (nmi_watchdog ==NMI_LOCAL_APIC )setup_apic_nmi_watchdog (); + + apic_pm_state.active =1 ; }#ifdef CONFIG_PM - -#include <linux/slab.h> -#include <linux/pm.h> - -static struct { -/* 'active' is true if the local APIC was enabled by us and -not the BIOS; this signifies that we are also responsible -for disabling it before entering apm/acpi suspend */ -int active; -/* 'perfctr_pmdev' is here because the current (2.4.1) PM -callback system doesn't handle hierarchical dependencies */ -struct pm_dev *perfctr_pmdev; -/* r/w apic fields */ -unsigned int apic_id; -unsigned int apic_taskpri; -unsigned int apic_ldr; -unsigned int apic_dfr; -unsigned int apic_spiv; -unsigned int apic_lvtt; -unsigned int apic_lvtpc; -unsigned int apic_lvt0; -unsigned int apic_lvt1; -unsigned int apic_lvterr; -unsigned int apic_tmict; -unsigned int apic_tdcr; -unsigned int apic_thmr; -} apic_pm_state; - -static void apic_pm_suspend (void *data) +static int apic_suspend (struct device *dev,u32 state,u32 level) {unsigned int l, h;unsigned long flags; -if (apic_pm_state.perfctr_pmdev) -pm_send (apic_pm_state.perfctr_pmdev,PM_SUSPEND , data); +if (level !=SUSPEND_DISABLE ) +return 0 ; + apic_pm_state.apic_id =apic_read (APIC_ID ); apic_pm_state.apic_taskpri =apic_read (APIC_TASKPRI ); apic_pm_state.apic_ldr =apic_read (APIC_LDR );
@@ -493,13 +496,19 @@ l &= ~MSR_IA32_APICBASE_ENABLE ;wrmsr (MSR_IA32_APICBASE , l, h);local_irq_restore (flags); +return 0 ; } -static void apic_pm_resume (void *data) +static int apic_resume (struct device *dev,u32 level) {unsigned int l, h;unsigned long flags; +if (level !=RESUME_POWER_ON ) +return 0 ; + +set_fixmap_nocache (FIX_APIC_BASE , apic_phys);/* FIXME: this is needed for S3 resume, but why? */ +local_irq_save (flags);rdmsr (MSR_IA32_APICBASE , l, h); l &= ~MSR_IA32_APICBASE_BASE ;
@@ -524,74 +533,34 @@apic_write (APIC_ESR ,0 );apic_read (APIC_ESR );local_irq_restore (flags); -if (apic_pm_state.perfctr_pmdev) -pm_send (apic_pm_state.perfctr_pmdev,PM_RESUME , data); -} - -static int apic_pm_callback (struct pm_dev *dev,pm_request_t rqst,void *data) -{ -switch (rqst) { -case PM_SUSPEND : -apic_pm_suspend (data); -break ; -case PM_RESUME : -apic_pm_resume (data); -break ; - } return 0; } -/* perfctr driver should call this instead of pm_register() */ -struct pm_dev *apic_pm_register (pm_dev_t type, -unsigned long id, -pm_callback callback) -{ -struct pm_dev *dev; - -if (!apic_pm_state.active) -return pm_register (type, id, callback); -if (apic_pm_state.perfctr_pmdev) -return NULL ;/* we're busy */ - dev =kmalloc (sizeof (struct pm_dev ),GFP_KERNEL ); -if (dev) { -memset (dev,0 ,sizeof (*dev)); - dev->type = type; - dev->id = id; - dev->callback = callback; - apic_pm_state.perfctr_pmdev = dev; - } -return dev; -} - -/* perfctr driver should call this instead of pm_unregister() */ -void apic_pm_unregister (struct pm_dev *dev) -{ -if (!apic_pm_state.active) { -pm_unregister (dev); - }else if (dev == apic_pm_state.perfctr_pmdev) { - apic_pm_state.perfctr_pmdev =NULL ; -kfree (dev); - } -} +static struct device_driver apic_driver = { + .name ="apic" , + .bus = &system_bus_type, + .resume = apic_resume, + .suspend = apic_suspend, +}; + +struct sys_device device_apic = { + .name ="apic" , + .id =0 , + .dev = { + .name ="APIC" , + .driver = &apic_driver, + }, +}; -static void __init apic_pm_init1 (void ) -{ -/* can't pm_register() at this early stage in the boot process -(causes an immediate reboot), so just set the flag */ - apic_pm_state.active =1 ; -} - -static void __init apic_pm_init2 (void ) +static int __init init_apic_devicefs (void ) { +driver_register (&apic_driver);if (apic_pm_state.active) -pm_register (PM_SYS_DEV ,0 , apic_pm_callback); +return sys_device_register (&device_apic); +return 0 ; } -#else /* CONFIG_PM */ - -static inline void apic_pm_init1 (void ) { } -static inline void apic_pm_init2 (void ) { } - +device_initcall (init_apic_devicefs);#endif /* CONFIG_PM */ /*
@@ -658,9 +627,6 @@ nmi_watchdog =NMI_LOCAL_APIC ;printk ("Found and enabled local APIC!\n" ); - -apic_pm_init1 (); -return 0 ; no_apic:
@@ -670,8 +636,6 @@void __init init_apic_mappings (void ) { -unsigned long apic_phys; -/* * If no local APIC can be found then set up a fake all * zeroes page to simulate the local APIC and another
@@ -1141,8 +1105,6 @@ phys_cpu_present_map =1 ;apic_write_around (APIC_ID , boot_cpu_physical_apicid); -apic_pm_init2 (); -setup_local_APIC ();if (nmi_watchdog ==NMI_LOCAL_APIC )
arch/i386/kernel/apm.c +9 -0
@@ -1263,6 +1263,11 @@ }printk (KERN_CRIT "apm: suspend was vetoed, but suspending anyway.\n" ); } + +device_suspend (3 ,SUSPEND_NOTIFY ); +device_suspend (3 ,SUSPEND_SAVE_STATE ); +device_suspend (3 ,SUSPEND_DISABLE ); +/* serialize with the timer interrupt */ write_lock_irq (&xtime_lock);
@@ -1283,6 +1288,8 @@if (err !=APM_SUCCESS )apm_error ("suspend" , err); err = (err ==APM_SUCCESS ) ?0 : -EIO ; +device_resume (RESUME_RESTORE_STATE ); +device_resume (RESUME_ENABLE );pm_send_all (PM_RESUME , (void *)0 );queue_event (APM_NORMAL_RESUME ,NULL ); out:
@@ -1396,6 +1403,8 @@write_lock_irq (&xtime_lock);set_time ();write_unlock_irq (&xtime_lock); +device_resume (RESUME_RESTORE_STATE ); +device_resume (RESUME_ENABLE );pm_send_all (PM_RESUME , (void *)0 );queue_event (event,NULL ); }
arch/i386/kernel/i386_ksyms.c +0 -4
@@ -161,10 +161,6 @@EXPORT_SYMBOL (flush_tlb_page);#endif -#if defined(CONFIG_X86_LOCAL_APIC ) && defined(CONFIG_PM ) -EXPORT_SYMBOL_GPL (set_nmi_pm_callback); -EXPORT_SYMBOL_GPL (unset_nmi_pm_callback); -#endif #ifdef CONFIG_X86_IO_APIC EXPORT_SYMBOL (IO_APIC_get_PCI_irq_vector);#endif
arch/i386/kernel/nmi.c +46 -39
149 lines not on this page · raw message
arch/i386/oprofile/nmi_int.c +59 -28
131 lines not on this page · raw message
include/asm-i386/apic.h +1 -0
@@ -95,6 +95,7 @@#define NMI_IO_APIC 1#define NMI_LOCAL_APIC 2#define NMI_INVALID 3 +#define NMI_LOCAL_APIC_SUSPENDED_BY_OPROFILE 4#endif /* CONFIG_X86_LOCAL_APIC */
Signature · 2 lines
Worst form of spam? Adding advertisment signatures ala sourceforge.net. What goes next? Inserting advertisment *into* email?
arch/i386/oprofile/nmi_int.c line 181
Quoted 2 lines · Pavel Machek
arch/i386/oprofile/nmi_int.c +2
-0+if (nmi_watchdog ==NMI_LOCAL_APIC_SUSPENDED_BY_OPROFILE ) { + nmi_watchdog =NMI_LOCAL_APIC_SUSPENDED_BY_OPROFILE ;
This is obviously wrong...
arch/i386/oprofile/nmi_int.c line 183
Quoted 11 lines · Pavel Machek
static void
nmi_shutdown(void)
{arch/i386/oprofile/nmi_int.c +5
-1-unset_nmi_pm_callback (oprofile_pmdev); + nmi_enabled =0 ;unset_nmi_callback ();smp_call_function (nmi_cpu_shutdown,NULL ,0 ,1 );nmi_cpu_shutdown (0 ); +if (nmi_watchdog ==NMI_LOCAL_APIC_SUSPENDED_BY_OPROFILE ) { + nmi_watchdog =NMI_LOCAL_APIC_SUSPENDED_BY_OPROFILE ; +setup_apic_nmi_watchdog (); + }
It looks to me like you'll end up enabilng the watchdog even if user didn't enable the watchdog at boot up. Also, setup_apic_nmi_watchdog() and the disable function need to exported to modules.
john