aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 07:30:36 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:36 -0500
commit0b80fc721bed2635c7f0b198e1c862a4596dc2cd (patch)
treefa3a3a637be8ddcc371fde1d65b961f4103bfd9f
parent8a999410135602d98bd007e835dc21c0c279ad72 (diff)
x86: merge acpi_32/64.h
Merge the files. [ mingo@elte.hu: build fix ] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat
-rw-r--r--include/asm-x86/acpi.h148
-rw-r--r--include/asm-x86/acpi_32.h132
-rw-r--r--include/asm-x86/acpi_64.h144
3 files changed, 143 insertions, 281 deletions
diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
index f8a89793ac8c..c477e5741751 100644
--- a/include/asm-x86/acpi.h
+++ b/include/asm-x86/acpi.h
@@ -1,14 +1,123 @@
1#ifndef _ASM_X86_ACPI_H 1#ifndef _ASM_X86_ACPI_H
2#define _ASM_X86_ACPI_H 2#define _ASM_X86_ACPI_H
3 3
4#ifdef CONFIG_X86_32 4/*
5# include "acpi_32.h" 5 * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
6#else 6 * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
7# include "acpi_64.h" 7 *
8#endif 8 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
9 *
10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by
12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version.
14 *
15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details.
19 *
20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
23 *
24 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
25 */
26#include <acpi/pdc_intel.h>
9 27
28#include <asm/numa.h>
10#include <asm/processor.h> 29#include <asm/processor.h>
11 30
31#define COMPILER_DEPENDENT_INT64 long long
32#define COMPILER_DEPENDENT_UINT64 unsigned long long
33
34/*
35 * Calling conventions:
36 *
37 * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
38 * ACPI_EXTERNAL_XFACE - External ACPI interfaces
39 * ACPI_INTERNAL_XFACE - Internal ACPI interfaces
40 * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
41 */
42#define ACPI_SYSTEM_XFACE
43#define ACPI_EXTERNAL_XFACE
44#define ACPI_INTERNAL_XFACE
45#define ACPI_INTERNAL_VAR_XFACE
46
47/* Asm macros */
48
49#define ACPI_ASM_MACROS
50#define BREAKPOINT3
51#define ACPI_DISABLE_IRQS() local_irq_disable()
52#define ACPI_ENABLE_IRQS() local_irq_enable()
53#define ACPI_FLUSH_CPU_CACHE() wbinvd()
54
55int __acpi_acquire_global_lock(unsigned int *lock);
56int __acpi_release_global_lock(unsigned int *lock);
57
58#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \
59 ((Acq) = __acpi_acquire_global_lock(&facs->global_lock))
60
61#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
62 ((Acq) = __acpi_release_global_lock(&facs->global_lock))
63
64/*
65 * Math helper asm macros
66 */
67#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
68 asm("divl %2;" \
69 :"=a"(q32), "=d"(r32) \
70 :"r"(d32), \
71 "0"(n_lo), "1"(n_hi))
72
73
74#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
75 asm("shrl $1,%2 ;" \
76 "rcrl $1,%3;" \
77 :"=r"(n_hi), "=r"(n_lo) \
78 :"0"(n_hi), "1"(n_lo))
79
80#ifdef CONFIG_ACPI
81extern int acpi_lapic;
82extern int acpi_ioapic;
83extern int acpi_noirq;
84extern int acpi_strict;
85extern int acpi_disabled;
86extern int acpi_ht;
87extern int acpi_pci_disabled;
88extern int acpi_skip_timer_override;
89extern int acpi_use_timer_override;
90
91static inline void disable_acpi(void)
92{
93 acpi_disabled = 1;
94 acpi_ht = 0;
95 acpi_pci_disabled = 1;
96 acpi_noirq = 1;
97}
98
99/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
100#define FIX_ACPI_PAGES 4
101
102extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
103
104static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
105static inline void acpi_disable_pci(void)
106{
107 acpi_pci_disabled = 1;
108 acpi_noirq_set();
109}
110extern int acpi_irq_balance_set(char *str);
111
112/* routines for saving/restoring kernel state */
113extern int acpi_save_state_mem(void);
114extern void acpi_restore_state_mem(void);
115
116extern unsigned long acpi_wakeup_address;
117
118/* early initialization routine */
119extern void acpi_reserve_bootmem(void);
120
12/* 121/*
13 * Check if the CPU can handle C2 and deeper 122 * Check if the CPU can handle C2 and deeper
14 */ 123 */
@@ -29,4 +138,33 @@ static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
29 return max_cstate; 138 return max_cstate;
30} 139}
31 140
141#else /* !CONFIG_ACPI */
142
143#define acpi_lapic 0
144#define acpi_ioapic 0
145static inline void acpi_noirq_set(void) { }
146static inline void acpi_disable_pci(void) { }
147static inline void disable_acpi(void) { }
148
149#endif /* !CONFIG_ACPI */
150
151#define ARCH_HAS_POWER_INIT 1
152
153struct bootnode;
154
155#ifdef CONFIG_ACPI_NUMA
156extern int acpi_numa;
157extern int acpi_scan_nodes(unsigned long start, unsigned long end);
158#ifdef CONFIG_X86_64
159# define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
32#endif 160#endif
161extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,
162 int num_nodes);
163#else
164static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
165 int num_nodes)
166{
167}
168#endif
169
170#endif /*__X86_ASM_ACPI_H*/
diff --git a/include/asm-x86/acpi_32.h b/include/asm-x86/acpi_32.h
deleted file mode 100644
index 03612bcf6422..000000000000
--- a/include/asm-x86/acpi_32.h
+++ /dev/null
@@ -1,132 +0,0 @@
1/*
2 * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
3 * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
4 *
5 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22 */
23
24#ifndef _ASM_ACPI_H
25#define _ASM_ACPI_H
26
27#include <acpi/pdc_intel.h>
28#include <asm/numa.h>
29
30#define COMPILER_DEPENDENT_INT64 long long
31#define COMPILER_DEPENDENT_UINT64 unsigned long long
32
33/*
34 * Calling conventions:
35 *
36 * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
37 * ACPI_EXTERNAL_XFACE - External ACPI interfaces
38 * ACPI_INTERNAL_XFACE - Internal ACPI interfaces
39 * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
40 */
41#define ACPI_SYSTEM_XFACE
42#define ACPI_EXTERNAL_XFACE
43#define ACPI_INTERNAL_XFACE
44#define ACPI_INTERNAL_VAR_XFACE
45
46/* Asm macros */
47
48#define ACPI_ASM_MACROS
49#define BREAKPOINT3
50#define ACPI_DISABLE_IRQS() local_irq_disable()
51#define ACPI_ENABLE_IRQS() local_irq_enable()
52#define ACPI_FLUSH_CPU_CACHE() wbinvd()
53
54int __acpi_acquire_global_lock(unsigned int *lock);
55int __acpi_release_global_lock(unsigned int *lock);
56
57#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \
58 ((Acq) = __acpi_acquire_global_lock(&facs->global_lock))
59
60#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
61 ((Acq) = __acpi_release_global_lock(&facs->global_lock))
62
63/*
64 * Math helper asm macros
65 */
66#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
67 asm("divl %2;" \
68 :"=a"(q32), "=d"(r32) \
69 :"r"(d32), \
70 "0"(n_lo), "1"(n_hi))
71
72
73#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
74 asm("shrl $1,%2 ;" \
75 "rcrl $1,%3;" \
76 :"=r"(n_hi), "=r"(n_lo) \
77 :"0"(n_hi), "1"(n_lo))
78
79#ifdef CONFIG_ACPI
80extern int acpi_lapic;
81extern int acpi_ioapic;
82extern int acpi_noirq;
83extern int acpi_strict;
84extern int acpi_disabled;
85extern int acpi_ht;
86extern int acpi_pci_disabled;
87extern int acpi_skip_timer_override;
88extern int acpi_use_timer_override;
89
90static inline void disable_acpi(void)
91{
92 acpi_disabled = 1;
93 acpi_ht = 0;
94 acpi_pci_disabled = 1;
95 acpi_noirq = 1;
96}
97
98/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
99#define FIX_ACPI_PAGES 4
100
101extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
102
103static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
104static inline void acpi_disable_pci(void)
105{
106 acpi_pci_disabled = 1;
107 acpi_noirq_set();
108}
109extern int acpi_irq_balance_set(char *str);
110
111/* routines for saving/restoring kernel state */
112extern int acpi_save_state_mem(void);
113extern void acpi_restore_state_mem(void);
114
115extern unsigned long acpi_wakeup_address;
116
117/* early initialization routine */
118extern void acpi_reserve_bootmem(void);
119
120#else /* !CONFIG_ACPI */
121
122#define acpi_lapic 0
123#define acpi_ioapic 0
124static inline void acpi_noirq_set(void) { }
125static inline void acpi_disable_pci(void) { }
126static inline void disable_acpi(void) { }
127
128#endif /* !CONFIG_ACPI */
129
130#define ARCH_HAS_POWER_INIT 1
131
132#endif /*_ASM_ACPI_H*/
diff --git a/include/asm-x86/acpi_64.h b/include/asm-x86/acpi_64.h
deleted file mode 100644
index b2670c6db8ec..000000000000
--- a/include/asm-x86/acpi_64.h
+++ /dev/null
@@ -1,144 +0,0 @@
1/*
2 * Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
3 * Copyright (C) 2001 Patrick Mochel <mochel@osdl.org>
4 *
5 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by
9 * the Free Software Foundation; either version 2 of the License, or
10 * (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 *
21 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
22 */
23
24#ifndef _ASM_ACPI_H
25#define _ASM_ACPI_H
26
27#include <acpi/pdc_intel.h>
28#include <asm/numa.h>
29
30#define COMPILER_DEPENDENT_INT64 long long
31#define COMPILER_DEPENDENT_UINT64 unsigned long long
32
33/*
34 * Calling conventions:
35 *
36 * ACPI_SYSTEM_XFACE - Interfaces to host OS (handlers, threads)
37 * ACPI_EXTERNAL_XFACE - External ACPI interfaces
38 * ACPI_INTERNAL_XFACE - Internal ACPI interfaces
39 * ACPI_INTERNAL_VAR_XFACE - Internal variable-parameter list interfaces
40 */
41#define ACPI_SYSTEM_XFACE
42#define ACPI_EXTERNAL_XFACE
43#define ACPI_INTERNAL_XFACE
44#define ACPI_INTERNAL_VAR_XFACE
45
46/* Asm macros */
47
48#define ACPI_ASM_MACROS
49#define BREAKPOINT3
50#define ACPI_DISABLE_IRQS() local_irq_disable()
51#define ACPI_ENABLE_IRQS() local_irq_enable()
52#define ACPI_FLUSH_CPU_CACHE() wbinvd()
53
54int __acpi_acquire_global_lock(unsigned int *lock);
55int __acpi_release_global_lock(unsigned int *lock);
56
57#define ACPI_ACQUIRE_GLOBAL_LOCK(facs, Acq) \
58 ((Acq) = __acpi_acquire_global_lock(&facs->global_lock))
59
60#define ACPI_RELEASE_GLOBAL_LOCK(facs, Acq) \
61 ((Acq) = __acpi_release_global_lock(&facs->global_lock))
62
63/*
64 * Math helper asm macros
65 */
66#define ACPI_DIV_64_BY_32(n_hi, n_lo, d32, q32, r32) \
67 asm("divl %2;" \
68 :"=a"(q32), "=d"(r32) \
69 :"r"(d32), \
70 "0"(n_lo), "1"(n_hi))
71
72
73#define ACPI_SHIFT_RIGHT_64(n_hi, n_lo) \
74 asm("shrl $1,%2 ;" \
75 "rcrl $1,%3;" \
76 :"=r"(n_hi), "=r"(n_lo) \
77 :"0"(n_hi), "1"(n_lo))
78
79#ifdef CONFIG_ACPI
80extern int acpi_lapic;
81extern int acpi_ioapic;
82extern int acpi_noirq;
83extern int acpi_strict;
84extern int acpi_disabled;
85extern int acpi_ht;
86extern int acpi_pci_disabled;
87extern int acpi_skip_timer_override;
88extern int acpi_use_timer_override;
89
90static inline void disable_acpi(void)
91{
92 acpi_disabled = 1;
93 acpi_ht = 0;
94 acpi_pci_disabled = 1;
95 acpi_noirq = 1;
96}
97
98/* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
99#define FIX_ACPI_PAGES 4
100
101extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq);
102
103static inline void acpi_noirq_set(void) { acpi_noirq = 1; }
104static inline void acpi_disable_pci(void)
105{
106 acpi_pci_disabled = 1;
107 acpi_noirq_set();
108}
109extern int acpi_irq_balance_set(char *str);
110
111/* routines for saving/restoring kernel state */
112extern int acpi_save_state_mem(void);
113extern void acpi_restore_state_mem(void);
114
115extern unsigned long acpi_wakeup_address;
116
117/* early initialization routine */
118extern void acpi_reserve_bootmem(void);
119
120#else /* !CONFIG_ACPI */
121
122#define acpi_lapic 0
123#define acpi_ioapic 0
124static inline void acpi_noirq_set(void) { }
125static inline void acpi_disable_pci(void) { }
126
127#endif /* !CONFIG_ACPI */
128
129#define ARCH_HAS_POWER_INIT 1
130
131#ifdef CONFIG_ACPI_NUMA
132extern int acpi_numa;
133extern int acpi_scan_nodes(unsigned long start, unsigned long end);
134#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)
135extern void __init acpi_fake_nodes(const struct bootnode *fake_nodes,
136 int num_nodes);
137#else
138static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
139 int num_nodes)
140{
141}
142#endif
143
144#endif /*_ASM_ACPI_H*/
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-17 03:27:10 -0500