aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:15 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:15 -0500
commit67c5fc5c330f63360e26609534b219df1aaa03ca (patch)
tree6ba4e34c6118ff92985a5f55c625181c1dff000f
parent42e0a9aa5d467188687c6b705412578e53c14af6 (diff)
x86: merge apic_32/64.h
Unify apic.h variants. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat
-rw-r--r--include/asm-x86/apic.h140
-rw-r--r--include/asm-x86/apic_32.h122
-rw-r--r--include/asm-x86/apic_64.h95
3 files changed, 137 insertions, 220 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
index 9fbcc0bd2ac..c064c1f84ba 100644
--- a/include/asm-x86/apic.h
+++ b/include/asm-x86/apic.h
@@ -1,5 +1,139 @@
1#ifdef CONFIG_X86_32 1#ifndef _ASM_X86_APIC_H
2# include "apic_32.h" 2#define _ASM_X86_APIC_H
3
4#include <linux/pm.h>
5#include <linux/delay.h>
6#include <asm/fixmap.h>
7#include <asm/apicdef.h>
8#include <asm/processor.h>
9#include <asm/system.h>
10
11#define ARCH_APICTIMER_STOPS_ON_C3 1
12
13#define Dprintk(x...)
14
15/*
16 * Debugging macros
17 */
18#define APIC_QUIET 0
19#define APIC_VERBOSE 1
20#define APIC_DEBUG 2
21
22/*
23 * Define the default level of output to be very little
24 * This can be turned up by using apic=verbose for more
25 * information and apic=debug for _lots_ of information.
26 * apic_verbosity is defined in apic.c
27 */
28#define apic_printk(v, s, a...) do { \
29 if ((v) <= apic_verbosity) \
30 printk(s, ##a); \
31 } while (0)
32
33
34extern void generic_apic_probe(void);
35
36#ifdef CONFIG_X86_LOCAL_APIC
37
38extern int apic_verbosity;
39extern int timer_over_8254;
40extern int local_apic_timer_c2_ok;
41extern int local_apic_timer_disabled;
42
43extern int apic_runs_main_timer;
44extern int ioapic_force;
45extern int disable_apic_timer;
46extern unsigned boot_cpu_id;
47
48/*
49 * Basic functions accessing APICs.
50 */
51#ifdef CONFIG_PARAVIRT
52#include <asm/paravirt.h>
3#else 53#else
4# include "apic_64.h" 54#define apic_write native_apic_write
55#define apic_write_atomic native_apic_write_atomic
56#define apic_read native_apic_read
57#define setup_boot_clock setup_boot_APIC_clock
58#define setup_secondary_clock setup_secondary_APIC_clock
5#endif 59#endif
60
61static inline fastcall void native_apic_write(unsigned long reg, u32 v)
62{
63 *((volatile u32 *)(APIC_BASE + reg)) = v;
64}
65
66static inline fastcall void native_apic_write_atomic(unsigned long reg, u32 v)
67{
68 (void) xchg((u32*)(APIC_BASE + reg), v);
69}
70
71static inline fastcall u32 native_apic_read(unsigned long reg)
72{
73 return *((volatile u32 *)(APIC_BASE + reg));
74}
75
76extern void apic_wait_icr_idle(void);
77extern u32 safe_apic_wait_icr_idle(void);
78extern int get_physical_broadcast(void);
79
80#ifdef CONFIG_X86_GOOD_APIC
81# define FORCE_READ_AROUND_WRITE 0
82# define apic_read_around(x)
83# define apic_write_around(x, y) apic_write((x), (y))
84#else
85# define FORCE_READ_AROUND_WRITE 1
86# define apic_read_around(x) apic_read(x)
87# define apic_write_around(x, y) apic_write_atomic((x), (y))
88#endif
89
90static inline void ack_APIC_irq(void)
91{
92 /*
93 * ack_APIC_irq() actually gets compiled as a single instruction:
94 * - a single rmw on Pentium/82489DX
95 * - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
96 * ... yummie.
97 */
98
99 /* Docs say use 0 for future compatibility */
100 apic_write_around(APIC_EOI, 0);
101}
102
103extern int lapic_get_maxlvt(void);
104extern void clear_local_APIC(void);
105extern void connect_bsp_APIC(void);
106extern void disconnect_bsp_APIC(int virt_wire_setup);
107extern void disable_local_APIC(void);
108extern void lapic_shutdown(void);
109extern int verify_local_APIC(void);
110extern void cache_APIC_registers(void);
111extern void sync_Arb_IDs(void);
112extern void init_bsp_APIC(void);
113extern void setup_local_APIC(void);
114extern void init_apic_mappings(void);
115extern void smp_local_timer_interrupt(void);
116extern void setup_boot_APIC_clock(void);
117extern void setup_secondary_APIC_clock(void);
118extern int APIC_init_uniprocessor(void);
119extern void enable_NMI_through_LVT0(void *dummy);
120
121/*
122 * On 32bit this is mach-xxx local
123 */
124#ifdef CONFIG_X86_64
125extern void setup_apic_routing(void);
126#endif
127
128extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
129 unsigned char msg_type, unsigned char mask);
130
131extern int apic_is_clustered_box(void);
132
133#else /* !CONFIG_X86_LOCAL_APIC */
134static inline void lapic_shutdown(void) { }
135#define local_apic_timer_c2_ok 1
136
137#endif /* !CONFIG_X86_LOCAL_APIC */
138
139#endif /* __ASM_APIC_H */
diff --git a/include/asm-x86/apic_32.h b/include/asm-x86/apic_32.h
deleted file mode 100644
index 649e9a6f668..00000000000
--- a/include/asm-x86/apic_32.h
+++ /dev/null
@@ -1,122 +0,0 @@
1#ifndef __ASM_APIC_H
2#define __ASM_APIC_H
3
4#include <linux/pm.h>
5#include <linux/delay.h>
6#include <asm/fixmap.h>
7#include <asm/apicdef.h>
8#include <asm/processor.h>
9#include <asm/system.h>
10
11#define Dprintk(x...)
12
13/*
14 * Debugging macros
15 */
16#define APIC_QUIET 0
17#define APIC_VERBOSE 1
18#define APIC_DEBUG 2
19
20/*
21 * Define the default level of output to be very little
22 * This can be turned up by using apic=verbose for more
23 * information and apic=debug for _lots_ of information.
24 * apic_verbosity is defined in apic.c
25 */
26#define apic_printk(v, s, a...) do { \
27 if ((v) <= apic_verbosity) \
28 printk(s, ##a); \
29 } while (0)
30
31
32extern void generic_apic_probe(void);
33
34#ifdef CONFIG_X86_LOCAL_APIC
35
36extern int apic_verbosity;
37extern int timer_over_8254;
38extern int local_apic_timer_c2_ok;
39extern int local_apic_timer_disabled;
40
41/*
42 * Basic functions accessing APICs.
43 */
44#ifdef CONFIG_PARAVIRT
45#include <asm/paravirt.h>
46#else
47#define apic_write native_apic_write
48#define apic_write_atomic native_apic_write_atomic
49#define apic_read native_apic_read
50#define setup_boot_clock setup_boot_APIC_clock
51#define setup_secondary_clock setup_secondary_APIC_clock
52#endif
53
54static __inline fastcall void native_apic_write(unsigned long reg, u32 v)
55{
56 *((volatile u32 *)(APIC_BASE + reg)) = v;
57}
58
59static __inline fastcall void native_apic_write_atomic(unsigned long reg, u32 v)
60{
61 (void) xchg((u32 *)(APIC_BASE + reg), v);
62}
63
64static __inline fastcall u32 native_apic_read(unsigned long reg)
65{
66 return *((volatile u32 *)(APIC_BASE + reg));
67}
68
69extern void apic_wait_icr_idle(void);
70extern u32 safe_apic_wait_icr_idle(void);
71extern int get_physical_broadcast(void);
72
73#ifdef CONFIG_X86_GOOD_APIC
74# define FORCE_READ_AROUND_WRITE 0
75# define apic_read_around(x)
76# define apic_write_around(x,y) apic_write((x),(y))
77#else
78# define FORCE_READ_AROUND_WRITE 1
79# define apic_read_around(x) apic_read(x)
80# define apic_write_around(x,y) apic_write_atomic((x),(y))
81#endif
82
83static inline void ack_APIC_irq(void)
84{
85 /*
86 * ack_APIC_irq() actually gets compiled as a single instruction:
87 * - a single rmw on Pentium/82489DX
88 * - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
89 * ... yummie.
90 */
91
92 /* Docs say use 0 for future compatibility */
93 apic_write_around(APIC_EOI, 0);
94}
95
96extern int lapic_get_maxlvt(void);
97extern void clear_local_APIC(void);
98extern void connect_bsp_APIC(void);
99extern void disconnect_bsp_APIC(int virt_wire_setup);
100extern void disable_local_APIC(void);
101extern void lapic_shutdown(void);
102extern int verify_local_APIC(void);
103extern void cache_APIC_registers(void);
104extern void sync_Arb_IDs(void);
105extern void init_bsp_APIC(void);
106extern void setup_local_APIC(void);
107extern void init_apic_mappings(void);
108extern void smp_local_timer_interrupt(void);
109extern void setup_boot_APIC_clock(void);
110extern void setup_secondary_APIC_clock(void);
111extern int APIC_init_uniprocessor(void);
112extern void enable_NMI_through_LVT0(void *dummy);
113
114#define ARCH_APICTIMER_STOPS_ON_C3 1
115
116#else /* !CONFIG_X86_LOCAL_APIC */
117static inline void lapic_shutdown(void) { }
118#define local_apic_timer_c2_ok 1
119
120#endif /* !CONFIG_X86_LOCAL_APIC */
121
122#endif /* __ASM_APIC_H */
diff --git a/include/asm-x86/apic_64.h b/include/asm-x86/apic_64.h
deleted file mode 100644
index 9d0c06c4df9..00000000000
--- a/include/asm-x86/apic_64.h
+++ /dev/null
@@ -1,95 +0,0 @@
1#ifndef __ASM_APIC_H
2#define __ASM_APIC_H
3
4#include <linux/pm.h>
5#include <linux/delay.h>
6#include <asm/fixmap.h>
7#include <asm/apicdef.h>
8#include <asm/system.h>
9
10#define Dprintk(x...)
11
12/*
13 * Debugging macros
14 */
15#define APIC_QUIET 0
16#define APIC_VERBOSE 1
17#define APIC_DEBUG 2
18
19extern int apic_verbosity;
20extern int apic_runs_main_timer;
21extern int ioapic_force;
22extern int disable_apic_timer;
23
24/*
25 * Define the default level of output to be very little
26 * This can be turned up by using apic=verbose for more
27 * information and apic=debug for _lots_ of information.
28 * apic_verbosity is defined in apic.c
29 */
30#define apic_printk(v, s, a...) do { \
31 if ((v) <= apic_verbosity) \
32 printk(s, ##a); \
33 } while (0)
34
35struct pt_regs;
36
37/*
38 * Basic functions accessing APICs.
39 */
40
41static __inline void apic_write(unsigned long reg, u32 v)
42{
43 *((volatile unsigned int *)(APIC_BASE+reg)) = v;
44}
45
46static __inline u32 apic_read(unsigned long reg)
47{
48 return *((volatile u32 *)(APIC_BASE+reg));
49}
50
51extern void apic_wait_icr_idle(void);
52extern u32 safe_apic_wait_icr_idle(void);
53
54static inline void ack_APIC_irq(void)
55{
56 /*
57 * ack_APIC_irq() actually gets compiled as a single instruction:
58 * - a single rmw on Pentium/82489DX
59 * - a single write on P6+ cores (CONFIG_X86_GOOD_APIC)
60 * ... yummie.
61 */
62
63 /* Docs say use 0 for future compatibility */
64 apic_write(APIC_EOI, 0);
65}
66
67extern int lapic_get_maxlvt(void);
68extern void clear_local_APIC(void);
69extern void connect_bsp_APIC(void);
70extern void disconnect_bsp_APIC(int virt_wire_setup);
71extern void disable_local_APIC(void);
72extern void lapic_shutdown(void);
73extern int verify_local_APIC(void);
74extern void cache_APIC_registers(void);
75extern void sync_Arb_IDs(void);
76extern void init_bsp_APIC(void);
77extern void setup_local_APIC(void);
78extern void init_apic_mappings(void);
79extern void smp_local_timer_interrupt(void);
80extern void setup_boot_APIC_clock(void);
81extern void setup_secondary_APIC_clock(void);
82extern int APIC_init_uniprocessor(void);
83extern void setup_apic_routing(void);
84
85extern void setup_APIC_extended_lvt(unsigned char lvt_off, unsigned char vector,
86 unsigned char msg_type, unsigned char mask);
87
88extern int apic_is_clustered_box(void);
89
90#define ARCH_APICTIMER_STOPS_ON_C3 1
91
92extern unsigned boot_cpu_id;
93extern int local_apic_timer_c2_ok;
94
95#endif /* __ASM_APIC_H */
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-06 13:58:54 -0500