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>
75 lines
1.6 KiB
C
75 lines
1.6 KiB
C
/* smp.h: Sparc64 specific SMP stuff.
|
|
*
|
|
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
|
|
*/
|
|
|
|
#ifndef _SPARC64_SMP_H
|
|
#define _SPARC64_SMP_H
|
|
|
|
#include <linux/config.h>
|
|
#include <linux/threads.h>
|
|
#include <asm/asi.h>
|
|
#include <asm/starfire.h>
|
|
#include <asm/spitfire.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/cpumask.h>
|
|
#include <linux/cache.h>
|
|
|
|
#endif /* !(__ASSEMBLY__) */
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/*
|
|
* Private routines/data
|
|
*/
|
|
|
|
#include <asm/bitops.h>
|
|
#include <asm/atomic.h>
|
|
|
|
extern cpumask_t phys_cpu_present_map;
|
|
#define cpu_possible_map phys_cpu_present_map
|
|
|
|
/*
|
|
* General functions that each host system must provide.
|
|
*/
|
|
|
|
static __inline__ int hard_smp_processor_id(void)
|
|
{
|
|
if (tlb_type == cheetah || tlb_type == cheetah_plus) {
|
|
unsigned long cfg, ver;
|
|
__asm__ __volatile__("rdpr %%ver, %0" : "=r" (ver));
|
|
if ((ver >> 32) == 0x003e0016) {
|
|
__asm__ __volatile__("ldxa [%%g0] %1, %0"
|
|
: "=r" (cfg)
|
|
: "i" (ASI_JBUS_CONFIG));
|
|
return ((cfg >> 17) & 0x1f);
|
|
} else {
|
|
__asm__ __volatile__("ldxa [%%g0] %1, %0"
|
|
: "=r" (cfg)
|
|
: "i" (ASI_SAFARI_CONFIG));
|
|
return ((cfg >> 17) & 0x3ff);
|
|
}
|
|
} else if (this_is_starfire != 0) {
|
|
return starfire_hard_smp_processor_id();
|
|
} else {
|
|
unsigned long upaconfig;
|
|
__asm__ __volatile__("ldxa [%%g0] %1, %0"
|
|
: "=r" (upaconfig)
|
|
: "i" (ASI_UPA_CONFIG));
|
|
return ((upaconfig >> 17) & 0x1f);
|
|
}
|
|
}
|
|
|
|
#define raw_smp_processor_id() (current_thread_info()->cpu)
|
|
|
|
#endif /* !(__ASSEMBLY__) */
|
|
|
|
#endif /* !(CONFIG_SMP) */
|
|
|
|
#define NO_PROC_ID 0xFF
|
|
|
|
#endif /* !(_SPARC64_SMP_H) */
|