39c715b717
This patch implements a number of smp_processor_id() cleanup ideas that
Arjan van de Ven and I came up with.
The previous __smp_processor_id/_smp_processor_id/smp_processor_id API
spaghetti was hard to follow both on the implementational and on the
usage side.
Some of the complexity arose from picking wrong names, some of the
complexity comes from the fact that not all architectures defined
__smp_processor_id.
In the new code, there are two externally visible symbols:
- smp_processor_id(): debug variant.
- raw_smp_processor_id(): nondebug variant. Replaces all existing
uses of _smp_processor_id() and __smp_processor_id(). Defined
by every SMP architecture in include/asm-*/smp.h.
There is one new internal symbol, dependent on DEBUG_PREEMPT:
- debug_smp_processor_id(): internal debug variant, mapped to
smp_processor_id().
Also, i moved debug_smp_processor_id() from lib/kernel_lock.c into a new
lib/smp_processor_id.c file. All related comments got updated and/or
clarified.
I have build/boot tested the following 8 .config combinations on x86:
{SMP,UP} x {PREEMPT,!PREEMPT} x {DEBUG_PREEMPT,!DEBUG_PREEMPT}
I have also build/boot tested x64 on UP/PREEMPT/DEBUG_PREEMPT. (Other
architectures are untested, but should work just fine.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
/*
|
|
* smp.h: PPC64 specific SMP code.
|
|
*
|
|
* Original was a copy of sparc smp.h. Now heavily modified
|
|
* for PPC.
|
|
*
|
|
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
|
* Copyright (C) 1996-2001 Cort Dougan <cort@fsmlabs.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#ifdef __KERNEL__
|
|
#ifndef _PPC64_SMP_H
|
|
#define _PPC64_SMP_H
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/threads.h>
|
|
#include <linux/cpumask.h>
|
|
#include <linux/kernel.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <asm/paca.h>
|
|
|
|
extern int boot_cpuid;
|
|
extern int boot_cpuid_phys;
|
|
|
|
extern void cpu_die(void);
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
extern void smp_send_debugger_break(int cpu);
|
|
struct pt_regs;
|
|
extern void smp_message_recv(int, struct pt_regs *);
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
extern void fixup_irqs(cpumask_t map);
|
|
int generic_cpu_disable(void);
|
|
int generic_cpu_enable(unsigned int cpu);
|
|
void generic_cpu_die(unsigned int cpu);
|
|
void generic_mach_cpu_die(void);
|
|
#endif
|
|
|
|
#define raw_smp_processor_id() (get_paca()->paca_index)
|
|
#define hard_smp_processor_id() (get_paca()->hw_cpu_id)
|
|
|
|
extern cpumask_t cpu_sibling_map[NR_CPUS];
|
|
|
|
/* Since OpenPIC has only 4 IPIs, we use slightly different message numbers.
|
|
*
|
|
* Make sure this matches openpic_request_IPIs in open_pic.c, or what shows up
|
|
* in /proc/interrupts will be wrong!!! --Troy */
|
|
#define PPC_MSG_CALL_FUNCTION 0
|
|
#define PPC_MSG_RESCHEDULE 1
|
|
/* This is unused now */
|
|
#if 0
|
|
#define PPC_MSG_MIGRATE_TASK 2
|
|
#endif
|
|
#define PPC_MSG_DEBUGGER_BREAK 3
|
|
|
|
void smp_init_iSeries(void);
|
|
void smp_init_pSeries(void);
|
|
|
|
extern int __cpu_disable(void);
|
|
extern void __cpu_die(unsigned int cpu);
|
|
#endif /* CONFIG_SMP */
|
|
|
|
#define get_hard_smp_processor_id(CPU) (paca[(CPU)].hw_cpu_id)
|
|
#define set_hard_smp_processor_id(CPU, VAL) \
|
|
do { (paca[(CPU)].hw_cpu_id = (VAL)); } while (0)
|
|
|
|
extern int smt_enabled_at_boot;
|
|
|
|
extern int smp_mpic_probe(void);
|
|
extern void smp_mpic_setup_cpu(int cpu);
|
|
extern void smp_mpic_message_pass(int target, int msg);
|
|
extern void smp_generic_kick_cpu(int nr);
|
|
|
|
extern void smp_generic_give_timebase(void);
|
|
extern void smp_generic_take_timebase(void);
|
|
|
|
extern struct smp_ops_t *smp_ops;
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#endif /* !(_PPC64_SMP_H) */
|
|
#endif /* __KERNEL__ */
|