1 files changed, 0 insertions, 131 deletions
diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h
deleted file mode 100644
index ef328995ba9d..000000000000
--- a/include/asm-powerpc/firmware.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- *  Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
- *
- *  Modifications for ppc64:
- *      Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.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.
- */
-#ifndef __ASM_POWERPC_FIRMWARE_H
-#define __ASM_POWERPC_FIRMWARE_H
-#ifdef __KERNEL__
-#include <asm/asm-compat.h>
-#include <asm/feature-fixups.h>
-/* firmware feature bitmask values */
-#define FIRMWARE_MAX_FEATURES 63
-#define FW_FEATURE_PFT          ASM_CONST(0x0000000000000001)
-#define FW_FEATURE_TCE          ASM_CONST(0x0000000000000002)
-#define FW_FEATURE_SPRG0        ASM_CONST(0x0000000000000004)
-#define FW_FEATURE_DABR         ASM_CONST(0x0000000000000008)
-#define FW_FEATURE_COPY         ASM_CONST(0x0000000000000010)
-#define FW_FEATURE_ASR          ASM_CONST(0x0000000000000020)
-#define FW_FEATURE_DEBUG        ASM_CONST(0x0000000000000040)
-#define FW_FEATURE_TERM         ASM_CONST(0x0000000000000080)
-#define FW_FEATURE_PERF         ASM_CONST(0x0000000000000100)
-#define FW_FEATURE_DUMP         ASM_CONST(0x0000000000000200)
-#define FW_FEATURE_INTERRUPT    ASM_CONST(0x0000000000000400)
-#define FW_FEATURE_MIGRATE      ASM_CONST(0x0000000000000800)
-#define FW_FEATURE_PERFMON      ASM_CONST(0x0000000000001000)
-#define FW_FEATURE_CRQ          ASM_CONST(0x0000000000002000)
-#define FW_FEATURE_VIO          ASM_CONST(0x0000000000004000)
-#define FW_FEATURE_RDMA         ASM_CONST(0x0000000000008000)
-#define FW_FEATURE_LLAN         ASM_CONST(0x0000000000010000)
-#define FW_FEATURE_BULK         ASM_CONST(0x0000000000020000)
-#define FW_FEATURE_XDABR        ASM_CONST(0x0000000000040000)
-#define FW_FEATURE_MULTITCE     ASM_CONST(0x0000000000080000)
-#define FW_FEATURE_SPLPAR       ASM_CONST(0x0000000000100000)
-#define FW_FEATURE_ISERIES      ASM_CONST(0x0000000000200000)
-#define FW_FEATURE_LPAR         ASM_CONST(0x0000000000400000)
-#define FW_FEATURE_PS3_LV1      ASM_CONST(0x0000000000800000)
-#define FW_FEATURE_BEAT         ASM_CONST(0x0000000001000000)
-#define FW_FEATURE_BULK_REMOVE  ASM_CONST(0x0000000002000000)
-#ifndef __ASSEMBLY__
-enum {
-#ifdef CONFIG_PPC64
-        FW_FEATURE_PSERIES_POSSIBLE = FW_FEATURE_PFT | FW_FEATURE_TCE |
-                FW_FEATURE_SPRG0 | FW_FEATURE_DABR | FW_FEATURE_COPY |
-                FW_FEATURE_ASR | FW_FEATURE_DEBUG | FW_FEATURE_TERM |
-                FW_FEATURE_PERF | FW_FEATURE_DUMP | FW_FEATURE_INTERRUPT |
-                FW_FEATURE_MIGRATE | FW_FEATURE_PERFMON | FW_FEATURE_CRQ |
-                FW_FEATURE_VIO | FW_FEATURE_RDMA | FW_FEATURE_LLAN |
-                FW_FEATURE_BULK | FW_FEATURE_XDABR | FW_FEATURE_MULTITCE |
-                FW_FEATURE_SPLPAR | FW_FEATURE_LPAR,
-        FW_FEATURE_PSERIES_ALWAYS = 0,
-        FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
-        FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES | FW_FEATURE_LPAR,
-        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
-        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
-        FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_BEAT,
-        FW_FEATURE_CELLEB_ALWAYS = 0,
-        FW_FEATURE_NATIVE_POSSIBLE = 0,
-        FW_FEATURE_NATIVE_ALWAYS = 0,
-        FW_FEATURE_POSSIBLE =
-#ifdef CONFIG_PPC_PSERIES
-                FW_FEATURE_PSERIES_POSSIBLE |
-#endif
-#ifdef CONFIG_PPC_ISERIES
-                FW_FEATURE_ISERIES_POSSIBLE |
-#endif
-#ifdef CONFIG_PPC_PS3
-                FW_FEATURE_PS3_POSSIBLE |
-#endif
-#ifdef CONFIG_PPC_CELLEB
-                FW_FEATURE_CELLEB_POSSIBLE |
-#endif
-#ifdef CONFIG_PPC_NATIVE
-                FW_FEATURE_NATIVE_ALWAYS |
-#endif
-                0,
-        FW_FEATURE_ALWAYS =
-#ifdef CONFIG_PPC_PSERIES
-                FW_FEATURE_PSERIES_ALWAYS &
-#endif
-#ifdef CONFIG_PPC_ISERIES
-                FW_FEATURE_ISERIES_ALWAYS &
-#endif
-#ifdef CONFIG_PPC_PS3
-                FW_FEATURE_PS3_ALWAYS &
-#endif
-#ifdef CONFIG_PPC_CELLEB
-                FW_FEATURE_CELLEB_ALWAYS &
-#endif
-#ifdef CONFIG_PPC_NATIVE
-                FW_FEATURE_NATIVE_ALWAYS &
-#endif
-                FW_FEATURE_POSSIBLE,
-#else /* CONFIG_PPC64 */
-        FW_FEATURE_POSSIBLE = 0,
-        FW_FEATURE_ALWAYS = 0,
-#endif
-};
-/* This is used to identify firmware features which are available
- * to the kernel.
- */
-extern unsigned long    powerpc_firmware_features;
-#define firmware_has_feature(feature)                                   \
-        ((FW_FEATURE_ALWAYS & (feature)) ||                             \
-                (FW_FEATURE_POSSIBLE & powerpc_firmware_features & (feature)))
-extern void system_reset_fwnmi(void);
-extern void machine_check_fwnmi(void);
-/* This is true if we are using the firmware NMI handler (typically LPAR) */
-extern int fwnmi_active;
-extern unsigned int __start___fw_ftr_fixup, __stop___fw_ftr_fixup;
-#endif /* __ASSEMBLY__ */
-#endif /* __KERNEL__ */
-#endif /* __ASM_POWERPC_FIRMWARE_H */

diff --git a/include/asm-powerpc/firmware.h b/include/asm-powerpc/firmware.h deleted file mode 100644 index ef328995ba9d..000000000000 --- a/include/asm-powerpc/firmware.h +++ /dev/null
@@ -1,131 +0,0 @@
1	/*
2	* Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
3	*
4	* Modifications for ppc64:
5	* Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com>
6	*
7	* This program is free software; you can redistribute it and/or
8	* modify it under the terms of the GNU General Public License
9	* as published by the Free Software Foundation; either version
10	* 2 of the License, or (at your option) any later version.
11	*/
12	#ifndef __ASM_POWERPC_FIRMWARE_H
13	#define __ASM_POWERPC_FIRMWARE_H
14
15	#ifdef __KERNEL__
16
17	#include <asm/asm-compat.h>
18	#include <asm/feature-fixups.h>
19
20	/* firmware feature bitmask values */
21	#define FIRMWARE_MAX_FEATURES 63
22
23	#define FW_FEATURE_PFT ASM_CONST(0x0000000000000001)
24	#define FW_FEATURE_TCE ASM_CONST(0x0000000000000002)
25	#define FW_FEATURE_SPRG0 ASM_CONST(0x0000000000000004)
26	#define FW_FEATURE_DABR ASM_CONST(0x0000000000000008)
27	#define FW_FEATURE_COPY ASM_CONST(0x0000000000000010)
28	#define FW_FEATURE_ASR ASM_CONST(0x0000000000000020)
29	#define FW_FEATURE_DEBUG ASM_CONST(0x0000000000000040)
30	#define FW_FEATURE_TERM ASM_CONST(0x0000000000000080)
31	#define FW_FEATURE_PERF ASM_CONST(0x0000000000000100)
32	#define FW_FEATURE_DUMP ASM_CONST(0x0000000000000200)
33	#define FW_FEATURE_INTERRUPT ASM_CONST(0x0000000000000400)
34	#define FW_FEATURE_MIGRATE ASM_CONST(0x0000000000000800)
35	#define FW_FEATURE_PERFMON ASM_CONST(0x0000000000001000)
36	#define FW_FEATURE_CRQ ASM_CONST(0x0000000000002000)
37	#define FW_FEATURE_VIO ASM_CONST(0x0000000000004000)
38	#define FW_FEATURE_RDMA ASM_CONST(0x0000000000008000)
39	#define FW_FEATURE_LLAN ASM_CONST(0x0000000000010000)
40	#define FW_FEATURE_BULK ASM_CONST(0x0000000000020000)
41	#define FW_FEATURE_XDABR ASM_CONST(0x0000000000040000)
42	#define FW_FEATURE_MULTITCE ASM_CONST(0x0000000000080000)
43	#define FW_FEATURE_SPLPAR ASM_CONST(0x0000000000100000)
44	#define FW_FEATURE_ISERIES ASM_CONST(0x0000000000200000)
45	#define FW_FEATURE_LPAR ASM_CONST(0x0000000000400000)
46	#define FW_FEATURE_PS3_LV1 ASM_CONST(0x0000000000800000)
47	#define FW_FEATURE_BEAT ASM_CONST(0x0000000001000000)
48	#define FW_FEATURE_BULK_REMOVE ASM_CONST(0x0000000002000000)
49
50	#ifndef __ASSEMBLY__
51
52	enum {
53	#ifdef CONFIG_PPC64
54	FW_FEATURE_PSERIES_POSSIBLE = FW_FEATURE_PFT \| FW_FEATURE_TCE \|
55	FW_FEATURE_SPRG0 \| FW_FEATURE_DABR \| FW_FEATURE_COPY \|
56	FW_FEATURE_ASR \| FW_FEATURE_DEBUG \| FW_FEATURE_TERM \|
57	FW_FEATURE_PERF \| FW_FEATURE_DUMP \| FW_FEATURE_INTERRUPT \|
58	FW_FEATURE_MIGRATE \| FW_FEATURE_PERFMON \| FW_FEATURE_CRQ \|
59	FW_FEATURE_VIO \| FW_FEATURE_RDMA \| FW_FEATURE_LLAN \|
60	FW_FEATURE_BULK \| FW_FEATURE_XDABR \| FW_FEATURE_MULTITCE \|
61	FW_FEATURE_SPLPAR \| FW_FEATURE_LPAR,
62	FW_FEATURE_PSERIES_ALWAYS = 0,
63	FW_FEATURE_ISERIES_POSSIBLE = FW_FEATURE_ISERIES \| FW_FEATURE_LPAR,
64	FW_FEATURE_ISERIES_ALWAYS = FW_FEATURE_ISERIES \| FW_FEATURE_LPAR,
65	FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR \| FW_FEATURE_PS3_LV1,
66	FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR \| FW_FEATURE_PS3_LV1,
67	FW_FEATURE_CELLEB_POSSIBLE = FW_FEATURE_LPAR \| FW_FEATURE_BEAT,
68	FW_FEATURE_CELLEB_ALWAYS = 0,
69	FW_FEATURE_NATIVE_POSSIBLE = 0,
70	FW_FEATURE_NATIVE_ALWAYS = 0,
71	FW_FEATURE_POSSIBLE =
72	#ifdef CONFIG_PPC_PSERIES
73	FW_FEATURE_PSERIES_POSSIBLE \|
74	#endif
75	#ifdef CONFIG_PPC_ISERIES
76	FW_FEATURE_ISERIES_POSSIBLE \|
77	#endif
78	#ifdef CONFIG_PPC_PS3
79	FW_FEATURE_PS3_POSSIBLE \|
80	#endif
81	#ifdef CONFIG_PPC_CELLEB
82	FW_FEATURE_CELLEB_POSSIBLE \|
83	#endif
84	#ifdef CONFIG_PPC_NATIVE
85	FW_FEATURE_NATIVE_ALWAYS \|
86	#endif
87	0,
88	FW_FEATURE_ALWAYS =
89	#ifdef CONFIG_PPC_PSERIES
90	FW_FEATURE_PSERIES_ALWAYS &
91	#endif
92	#ifdef CONFIG_PPC_ISERIES
93	FW_FEATURE_ISERIES_ALWAYS &
94	#endif
95	#ifdef CONFIG_PPC_PS3
96	FW_FEATURE_PS3_ALWAYS &
97	#endif
98	#ifdef CONFIG_PPC_CELLEB
99	FW_FEATURE_CELLEB_ALWAYS &
100	#endif
101	#ifdef CONFIG_PPC_NATIVE
102	FW_FEATURE_NATIVE_ALWAYS &
103	#endif
104	FW_FEATURE_POSSIBLE,
105
106	#else /* CONFIG_PPC64 */
107	FW_FEATURE_POSSIBLE = 0,
108	FW_FEATURE_ALWAYS = 0,
109	#endif
110	};
111
112	/* This is used to identify firmware features which are available
113	* to the kernel.
114	*/
115	extern unsigned long powerpc_firmware_features;
116
117	#define firmware_has_feature(feature) \
118	((FW_FEATURE_ALWAYS & (feature)) \|\| \
119	(FW_FEATURE_POSSIBLE & powerpc_firmware_features & (feature)))
120
121	extern void system_reset_fwnmi(void);
122	extern void machine_check_fwnmi(void);
123
124	/* This is true if we are using the firmware NMI handler (typically LPAR) */
125	extern int fwnmi_active;
126
127	extern unsigned int __start___fw_ftr_fixup, __stop___fw_ftr_fixup;
128
129	#endif /* __ASSEMBLY__ */
130	#endif /* __KERNEL__ */
131	#endif /* __ASM_POWERPC_FIRMWARE_H */