X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fparisc%2Fkernel%2Fsmp.c;h=d6ac1c60a4713bf2f0266f99ca84c416016558e7;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=c5185a93b870840dd4cab51b6d67ffc22e2eaa82;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index c5185a93b..d6ac1c60a 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c @@ -3,7 +3,7 @@ ** ** Copyright (C) 1999 Walt Drummond ** Copyright (C) 1999 David Mosberger-Tang -** Copyright (C) 2001 Grant Grundler +** Copyright (C) 2001,2004 Grant Grundler ** ** Lots of stuff stolen from arch/alpha/kernel/smp.c ** ...and then parisc stole from arch/ia64/kernel/smp.c. Thanks David! :^) @@ -18,7 +18,7 @@ */ #undef ENTRY_SYS_CPUS /* syscall support for iCOD-like functionality */ -#include +#include #include #include @@ -33,13 +33,13 @@ #include #include #include +#include #include #include -#include #include #include -#include /* for flush_tlb_all() proto/macro */ +#include #include #include /* for CPU_IRQ_REGION and friends */ @@ -54,26 +54,29 @@ #define kDEBUG 0 -spinlock_t pa_dbit_lock = SPIN_LOCK_UNLOCKED; - -spinlock_t smp_lock = SPIN_LOCK_UNLOCKED; +DEFINE_SPINLOCK(smp_lock); volatile struct task_struct *smp_init_current_idle_task; -static volatile int smp_commenced = 0; /* Set when the idlers are all forked */ -static volatile int cpu_now_booting = 0; /* track which CPU is booting */ -cpumask_t cpu_online_map = CPU_MASK_NONE; /* Bitmap of online CPUs */ -#define IS_LOGGED_IN(cpunum) (cpu_isset(cpunum, cpu_online_map)) +static volatile int cpu_now_booting __read_mostly = 0; /* track which CPU is booting */ -EXPORT_SYMBOL(cpu_online_map); +static int parisc_max_cpus __read_mostly = 1; -int smp_num_cpus = 1; -int smp_threads_ready = 0; -unsigned long cache_decay_ticks; -static int max_cpus = -1; /* Command line */ -cpumask_t cpu_present_mask; +/* online cpus are ones that we've managed to bring up completely + * possible cpus are all valid cpu + * present cpus are all detected cpu + * + * On startup we bring up the "possible" cpus. Since we discover + * CPUs later, we add them as hotplug, so the possible cpu mask is + * empty in the beginning. + */ + +cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE; /* Bitmap of online CPUs */ +cpumask_t cpu_possible_map __read_mostly = CPU_MASK_ALL; /* Bitmap of Present CPUs */ + +EXPORT_SYMBOL(cpu_online_map); +EXPORT_SYMBOL(cpu_possible_map); -EXPORT_SYMBOL(cpu_present_mask); struct smp_call_struct { void (*func) (void *info); @@ -114,7 +117,7 @@ ipi_init(int cpuid) #error verify IRQ_OFFSET(IPI_IRQ) is ipi_interrupt() in new IRQ region - if(IS_LOGGED_IN(cpuid) ) + if(cpu_online(cpuid) ) { switch_to_idle_task(current); } @@ -178,12 +181,19 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs) while (ops) { unsigned long which = ffz(~ops); + ops &= ~(1 << which); + switch (which) { + case IPI_NOP: +#if (kDEBUG>=100) + printk(KERN_DEBUG "CPU%d IPI_NOP\n",this_cpu); +#endif /* kDEBUG */ + break; + case IPI_RESCHEDULE: #if (kDEBUG>=100) printk(KERN_DEBUG "CPU%d IPI_RESCHEDULE\n",this_cpu); #endif /* kDEBUG */ - ops &= ~(1 << IPI_RESCHEDULE); /* * Reschedule callback. Everything to be * done is done by the interrupt return path. @@ -194,7 +204,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs) #if (kDEBUG>=100) printk(KERN_DEBUG "CPU%d IPI_CALL_FUNC\n",this_cpu); #endif /* kDEBUG */ - ops &= ~(1 << IPI_CALL_FUNC); { volatile struct smp_call_struct *data; void (*func)(void *info); @@ -228,7 +237,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs) #if (kDEBUG>=100) printk(KERN_DEBUG "CPU%d IPI_CPU_START\n",this_cpu); #endif /* kDEBUG */ - ops &= ~(1 << IPI_CPU_START); #ifdef ENTRY_SYS_CPUS p->state = STATE_RUNNING; #endif @@ -238,7 +246,6 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs) #if (kDEBUG>=100) printk(KERN_DEBUG "CPU%d IPI_CPU_STOP\n",this_cpu); #endif /* kDEBUG */ - ops &= ~(1 << IPI_CPU_STOP); #ifdef ENTRY_SYS_CPUS #else halt_processor(); @@ -249,13 +256,11 @@ ipi_interrupt(int irq, void *dev_id, struct pt_regs *regs) #if (kDEBUG>=100) printk(KERN_DEBUG "CPU%d is alive!\n",this_cpu); #endif /* kDEBUG */ - ops &= ~(1 << IPI_CPU_TEST); break; default: printk(KERN_CRIT "Unknown IPI num on CPU%d: %lu\n", this_cpu, which); - ops &= ~(1 << which); return IRQ_NONE; } /* Switch */ } /* while (ops) */ @@ -272,7 +277,7 @@ ipi_send(int cpu, enum ipi_message_type op) spin_lock_irqsave(&(p->lock),flags); p->pending_ipi |= 1 << op; - __raw_writel(IRQ_OFFSET(IPI_IRQ), cpu_data[cpu].hpa); + gsc_writel(IPI_IRQ - CPU_IRQ_BASE, cpu_data[cpu].hpa); spin_unlock_irqrestore(&(p->lock),flags); } @@ -293,12 +298,13 @@ send_IPI_allbutself(enum ipi_message_type op) { int i; - for (i = 0; i < smp_num_cpus; i++) { + for_each_online_cpu(i) { if (i != smp_processor_id()) send_IPI_single(i, op); } } + inline void smp_send_stop(void) { send_IPI_allbutself(IPI_CPU_STOP); } @@ -308,6 +314,12 @@ smp_send_start(void) { send_IPI_allbutself(IPI_CPU_START); } void smp_send_reschedule(int cpu) { send_IPI_single(cpu, IPI_RESCHEDULE); } +void +smp_send_all_nop(void) +{ + send_IPI_allbutself(IPI_NOP); +} + /** * Run a function on all other CPUs. @@ -326,13 +338,24 @@ smp_call_function (void (*func) (void *info), void *info, int retry, int wait) { struct smp_call_struct data; unsigned long timeout; - static spinlock_t lock = SPIN_LOCK_UNLOCKED; + static DEFINE_SPINLOCK(lock); + int retries = 0; + + if (num_online_cpus() < 2) + return 0; + + /* Can deadlock when called with interrupts disabled */ + WARN_ON(irqs_disabled()); + + /* can also deadlock if IPIs are disabled */ + WARN_ON((get_eiem() & (1UL<<(CPU_IRQ_MAX - IPI_IRQ))) == 0); + data.func = func; data.info = info; data.wait = wait; - atomic_set(&data.unstarted_count, smp_num_cpus - 1); - atomic_set(&data.unfinished_count, smp_num_cpus - 1); + atomic_set(&data.unstarted_count, num_online_cpus() - 1); + atomic_set(&data.unfinished_count, num_online_cpus() - 1); if (retry) { spin_lock (&lock); @@ -353,21 +376,22 @@ smp_call_function (void (*func) (void *info), void *info, int retry, int wait) /* Send a message to all other CPUs and wait for them to respond */ send_IPI_allbutself(IPI_CALL_FUNC); + retry: /* Wait for response */ timeout = jiffies + HZ; while ( (atomic_read (&data.unstarted_count) > 0) && time_before (jiffies, timeout) ) barrier (); + if (atomic_read (&data.unstarted_count) > 0) { + printk(KERN_CRIT "SMP CALL FUNCTION TIMED OUT! (cpu=%d), try %d\n", + smp_processor_id(), ++retries); + goto retry; + } /* We either got one or timed out. Release the lock */ mb(); smp_call_function_data = NULL; - if (atomic_read (&data.unstarted_count) > 0) { - printk(KERN_CRIT "SMP CALL FUNCTION TIMED OUT! (cpu=%d)\n", - smp_processor_id()); - return -ETIMEDOUT; - } while (wait && atomic_read (&data.unfinished_count) > 0) barrier (); @@ -377,46 +401,15 @@ smp_call_function (void (*func) (void *info), void *info, int retry, int wait) EXPORT_SYMBOL(smp_call_function); - - -/* - * Setup routine for controlling SMP activation - * - * Command-line option of "nosmp" or "maxcpus=0" will disable SMP - * activation entirely (the MPS table probe still happens, though). - * - * Command-line option of "maxcpus=", where is an integer - * greater than 0, limits the maximum number of CPUs activated in - * SMP mode to . - */ - -static int __init nosmp(char *str) -{ - max_cpus = 0; - return 1; -} - -__setup("nosmp", nosmp); - -static int __init maxcpus(char *str) -{ - get_option(&str, &max_cpus); - return 1; -} - -__setup("maxcpus=", maxcpus); - /* * Flush all other CPU's tlb and then mine. Do this with on_each_cpu() * as we want to ensure all TLB's flushed before proceeding. */ -extern void flush_tlb_all_local(void); - void smp_flush_tlb_all(void) { - on_each_cpu((void (*)(void *))flush_tlb_all_local, NULL, 1, 1); + on_each_cpu(flush_tlb_all_local, NULL, 1, 1); } @@ -474,13 +467,13 @@ smp_cpu_init(int cpunum) */ void __init smp_callin(void) { - extern void cpu_idle(void); /* arch/parisc/kernel/process.c */ int slave_id = cpu_now_booting; #if 0 void *istack; #endif smp_cpu_init(slave_id); + preempt_disable(); #if 0 /* NOT WORKING YET - see entry.S */ istack = (void *)__get_free_pages(GFP_KERNEL,ISTACK_ORDER); @@ -492,43 +485,20 @@ void __init smp_callin(void) #endif flush_cache_all_local(); /* start with known state */ - flush_tlb_all_local(); + flush_tlb_all_local(NULL); local_irq_enable(); /* Interrupts have been off until now */ - /* Slaves wait here until Big Poppa daddy say "jump" */ - mb(); /* PARANOID */ - while (!smp_commenced) ; - mb(); /* PARANOID */ - cpu_idle(); /* Wait for timer to schedule some work */ /* NOTREACHED */ panic("smp_callin() AAAAaaaaahhhh....\n"); } -/* - * Create the idle task for a new Slave CPU. DO NOT use kernel_thread() - * because that could end up calling schedule(). If it did, the new idle - * task could get scheduled before we had a chance to remove it from the - * run-queue... - */ -static struct task_struct *fork_by_hand(void) -{ - struct pt_regs regs; - - /* - * don't care about the regs settings since - * we'll never reschedule the forked task. - */ - return copy_process(CLONE_VM|CLONE_IDLETASK, 0, ®s, 0, NULL, NULL); -} - - /* * Bring one cpu online. */ -static int __init smp_boot_one_cpu(int cpuid, int cpunum) +int __init smp_boot_one_cpu(int cpuid) { struct task_struct *idle; long timeout; @@ -543,19 +513,16 @@ static int __init smp_boot_one_cpu(int cpuid, int cpunum) * Sheesh . . . */ - idle = fork_by_hand(); + idle = fork_idle(cpuid); if (IS_ERR(idle)) panic("SMP: fork failed for CPU:%d", cpuid); - wake_up_forked_process(idle); - init_idle(idle, cpunum); - unhash_process(idle); - idle->thread_info->cpu = cpunum; + task_thread_info(idle)->cpu = cpuid; /* Let _start know what logical CPU we're booting ** (offset into init_tasks[],cpu_data[]) */ - cpu_now_booting = cpunum; + cpu_now_booting = cpuid; /* ** boot strap code needs to know the task address since @@ -564,21 +531,27 @@ static int __init smp_boot_one_cpu(int cpuid, int cpunum) smp_init_current_idle_task = idle ; mb(); + printk("Releasing cpu %d now, hpa=%lx\n", cpuid, cpu_data[cpuid].hpa); + /* ** This gets PDC to release the CPU from a very tight loop. - ** See MEM_RENDEZ comments in head.S. + ** + ** From the PA-RISC 2.0 Firmware Architecture Reference Specification: + ** "The MEM_RENDEZ vector specifies the location of OS_RENDEZ which + ** is executed after receiving the rendezvous signal (an interrupt to + ** EIR{0}). MEM_RENDEZ is valid only when it is nonzero and the + ** contents of memory are valid." */ - __raw_writel(IRQ_OFFSET(TIMER_IRQ), cpu_data[cpunum].hpa); + gsc_writel(TIMER_IRQ - CPU_IRQ_BASE, cpu_data[cpuid].hpa); mb(); /* * OK, wait a bit for that CPU to finish staggering about. - * Slave will set a bit when it reaches smp_cpu_init() and then - * wait for smp_commenced to be 1. - * Once we see the bit change, we can move on. + * Slave will set a bit when it reaches smp_cpu_init(). + * Once the "monarch CPU" sees the bit change, it can move on. */ for (timeout = 0; timeout < 10000; timeout++) { - if(IS_LOGGED_IN(cpunum)) { + if(cpu_online(cpuid)) { /* Which implies Slave has started up */ cpu_now_booting = 0; smp_init_current_idle_task = NULL; @@ -597,131 +570,58 @@ static int __init smp_boot_one_cpu(int cpuid, int cpunum) alive: /* Remember the Slave data */ #if (kDEBUG>=100) - printk(KERN_DEBUG "SMP: CPU:%d (num %d) came alive after %ld _us\n", - cpuid, cpunum, timeout * 100); + printk(KERN_DEBUG "SMP: CPU:%d came alive after %ld _us\n", + cpuid, timeout * 100); #endif /* kDEBUG */ #ifdef ENTRY_SYS_CPUS - cpu_data[cpunum].state = STATE_RUNNING; + cpu_data[cpuid].state = STATE_RUNNING; #endif return 0; } - - - -/* -** inventory.c:do_inventory() has already 'discovered' the additional CPU's. -** We are ready to wrest them from PDC's control now. -** Called by smp_init bring all the secondaries online and hold them. -** -** o Setup of the IPI irq handler is done in irq.c. -** o MEM_RENDEZ is initialzed in head.S:stext() -** -*/ -void __init smp_boot_cpus(void) +void __devinit smp_prepare_boot_cpu(void) { - int i, cpu_count = 1; - unsigned long bogosum = cpu_data[0].loops_per_jiffy; /* Count Monarch */ - - /* REVISIT - assumes first CPU reported by PAT PDC is BSP */ int bootstrap_processor=cpu_data[0].cpuid; /* CPU ID of BSP */ - /* Setup BSP mappings */ - printk(KERN_DEBUG "SMP: bootstrap CPU ID is %d\n",bootstrap_processor); - init_task.thread_info->cpu = bootstrap_processor; - current->thread_info->cpu = bootstrap_processor; - /* Mark Boostrap processor as present */ - cpu_online_map = cpumask_of_cpu(bootstrap_processor); - current->active_mm = &init_mm; - #ifdef ENTRY_SYS_CPUS cpu_data[0].state = STATE_RUNNING; #endif - cpu_present_mask = cpumask_of_cpu(bootstrap_processor); - - /* Nothing to do when told not to. */ - if (max_cpus == 0) { - printk(KERN_INFO "SMP mode deactivated.\n"); - return; - } - - if (max_cpus != -1) - printk(KERN_INFO "Limiting CPUs to %d\n", max_cpus); - /* We found more than one CPU.... */ - if (boot_cpu_data.cpu_count > 1) { + /* Setup BSP mappings */ + printk("SMP: bootstrap CPU ID is %d\n",bootstrap_processor); - for (i = 0; i < NR_CPUS; i++) { - if (cpu_data[i].cpuid == NO_PROC_ID || - cpu_data[i].cpuid == bootstrap_processor) - continue; + cpu_set(bootstrap_processor, cpu_online_map); + cpu_set(bootstrap_processor, cpu_present_map); +} - if (smp_boot_one_cpu(cpu_data[i].cpuid, cpu_count) < 0) - continue; - bogosum += cpu_data[i].loops_per_jiffy; - cpu_count++; /* Count good CPUs only... */ - - cpu_present_mask |= 1UL << i; - - /* Bail when we've started as many CPUS as told to */ - if (cpu_count == max_cpus) - break; - } - } - if (cpu_count == 1) { - printk(KERN_INFO "SMP: Bootstrap processor only.\n"); - } - - /* - * FIXME very rough. - */ - cache_decay_ticks = HZ/100; - printk(KERN_INFO "SMP: Total %d of %d processors activated " - "(%lu.%02lu BogoMIPS noticed) (Present Mask: %lu).\n", - cpu_count, boot_cpu_data.cpu_count, (bogosum + 25) / 5000, - ((bogosum + 25) / 50) % 100, cpu_present_mask); +/* +** inventory.c:do_inventory() hasn't yet been run and thus we +** don't 'discover' the additional CPU's until later. +*/ +void __init smp_prepare_cpus(unsigned int max_cpus) +{ + cpus_clear(cpu_present_map); + cpu_set(0, cpu_present_map); - smp_num_cpus = cpu_count; -#ifdef PER_CPU_IRQ_REGION - ipi_init(); -#endif - return; + parisc_max_cpus = max_cpus; + if (!max_cpus) + printk(KERN_INFO "SMP mode deactivated.\n"); } -/* - * Called from main.c by Monarch Processor. - * After this, any CPU can schedule any task. - */ -void smp_commence(void) -{ - smp_commenced = 1; - mb(); - return; -} -/* - * XXX FIXME : do nothing - */ void smp_cpus_done(unsigned int cpu_max) { - smp_threads_ready = 1; -} - -void __init smp_prepare_cpus(unsigned int max_cpus) -{ - smp_boot_cpus(); + return; } -void __devinit smp_prepare_boot_cpu(void) -{ - cpu_set(smp_processor_id(), cpu_online_map); - cpu_set(smp_processor_id(), cpu_present_mask); -} int __devinit __cpu_up(unsigned int cpu) { + if (cpu != 0 && cpu < parisc_max_cpus) + smp_boot_one_cpu(cpu); + return cpu_online(cpu) ? 0 : -ENOSYS; } @@ -743,14 +643,13 @@ int sys_cpus(int argc, char **argv) if ( argc == 1 ){ #ifdef DUMP_MORE_STATE - for(i=0; i