diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:23:20 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:23:20 -0400 |
commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /arch/x86/es7000 | |
parent | d84705969f898f294bc3fc32eca33580f14105bd (diff) | |
parent | 43603c8df97f246e8be7b9cc92a8f968a85108bd (diff) |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/x86/es7000')
-rw-r--r-- | arch/x86/es7000/Makefile | 5 | ||||
-rw-r--r-- | arch/x86/es7000/es7000.h | 114 | ||||
-rw-r--r-- | arch/x86/es7000/es7000plat.c | 262 |
3 files changed, 0 insertions, 381 deletions
diff --git a/arch/x86/es7000/Makefile b/arch/x86/es7000/Makefile deleted file mode 100644 index 3ef8b43b62fc..000000000000 --- a/arch/x86/es7000/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the linux kernel. | ||
3 | # | ||
4 | |||
5 | obj-$(CONFIG_X86_ES7000) := es7000plat.o | ||
diff --git a/arch/x86/es7000/es7000.h b/arch/x86/es7000/es7000.h deleted file mode 100644 index 4e62f6fa95b8..000000000000 --- a/arch/x86/es7000/es7000.h +++ /dev/null | |||
@@ -1,114 +0,0 @@ | |||
1 | /* | ||
2 | * Written by: Garry Forsgren, Unisys Corporation | ||
3 | * Natalie Protasevich, Unisys Corporation | ||
4 | * This file contains the code to configure and interface | ||
5 | * with Unisys ES7000 series hardware system manager. | ||
6 | * | ||
7 | * Copyright (c) 2003 Unisys Corporation. All Rights Reserved. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of version 2 of the GNU General Public License as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This program is distributed in the hope that it would be useful, but | ||
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License along | ||
18 | * with this program; if not, write the Free Software Foundation, Inc., 59 | ||
19 | * Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
20 | * | ||
21 | * Contact information: Unisys Corporation, Township Line & Union Meeting | ||
22 | * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or: | ||
23 | * | ||
24 | * http://www.unisys.com | ||
25 | */ | ||
26 | |||
27 | /* | ||
28 | * ES7000 chipsets | ||
29 | */ | ||
30 | |||
31 | #define NON_UNISYS 0 | ||
32 | #define ES7000_CLASSIC 1 | ||
33 | #define ES7000_ZORRO 2 | ||
34 | |||
35 | |||
36 | #define MIP_REG 1 | ||
37 | #define MIP_PSAI_REG 4 | ||
38 | |||
39 | #define MIP_BUSY 1 | ||
40 | #define MIP_SPIN 0xf0000 | ||
41 | #define MIP_VALID 0x0100000000000000ULL | ||
42 | #define MIP_PORT(VALUE) ((VALUE >> 32) & 0xffff) | ||
43 | |||
44 | #define MIP_RD_LO(VALUE) (VALUE & 0xffffffff) | ||
45 | |||
46 | struct mip_reg_info { | ||
47 | unsigned long long mip_info; | ||
48 | unsigned long long delivery_info; | ||
49 | unsigned long long host_reg; | ||
50 | unsigned long long mip_reg; | ||
51 | }; | ||
52 | |||
53 | struct part_info { | ||
54 | unsigned char type; | ||
55 | unsigned char length; | ||
56 | unsigned char part_id; | ||
57 | unsigned char apic_mode; | ||
58 | unsigned long snum; | ||
59 | char ptype[16]; | ||
60 | char sname[64]; | ||
61 | char pname[64]; | ||
62 | }; | ||
63 | |||
64 | struct psai { | ||
65 | unsigned long long entry_type; | ||
66 | unsigned long long addr; | ||
67 | unsigned long long bep_addr; | ||
68 | }; | ||
69 | |||
70 | struct es7000_mem_info { | ||
71 | unsigned char type; | ||
72 | unsigned char length; | ||
73 | unsigned char resv[6]; | ||
74 | unsigned long long start; | ||
75 | unsigned long long size; | ||
76 | }; | ||
77 | |||
78 | struct es7000_oem_table { | ||
79 | unsigned long long hdr; | ||
80 | struct mip_reg_info mip; | ||
81 | struct part_info pif; | ||
82 | struct es7000_mem_info shm; | ||
83 | struct psai psai; | ||
84 | }; | ||
85 | |||
86 | #ifdef CONFIG_ACPI | ||
87 | |||
88 | struct oem_table { | ||
89 | struct acpi_table_header Header; | ||
90 | u32 OEMTableAddr; | ||
91 | u32 OEMTableSize; | ||
92 | }; | ||
93 | |||
94 | extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | ||
95 | #endif | ||
96 | |||
97 | struct mip_reg { | ||
98 | unsigned long long off_0; | ||
99 | unsigned long long off_8; | ||
100 | unsigned long long off_10; | ||
101 | unsigned long long off_18; | ||
102 | unsigned long long off_20; | ||
103 | unsigned long long off_28; | ||
104 | unsigned long long off_30; | ||
105 | unsigned long long off_38; | ||
106 | }; | ||
107 | |||
108 | #define MIP_SW_APIC 0x1020b | ||
109 | #define MIP_FUNC(VALUE) (VALUE & 0xff) | ||
110 | |||
111 | extern int parse_unisys_oem (char *oemptr); | ||
112 | extern void setup_unisys(void); | ||
113 | extern int es7000_start_cpu(int cpu, unsigned long eip); | ||
114 | extern void es7000_sw_apic(void); | ||
diff --git a/arch/x86/es7000/es7000plat.c b/arch/x86/es7000/es7000plat.c deleted file mode 100644 index 7789fde13c3f..000000000000 --- a/arch/x86/es7000/es7000plat.c +++ /dev/null | |||
@@ -1,262 +0,0 @@ | |||
1 | /* | ||
2 | * Written by: Garry Forsgren, Unisys Corporation | ||
3 | * Natalie Protasevich, Unisys Corporation | ||
4 | * This file contains the code to configure and interface | ||
5 | * with Unisys ES7000 series hardware system manager. | ||
6 | * | ||
7 | * Copyright (c) 2003 Unisys Corporation. All Rights Reserved. | ||
8 | * | ||
9 | * This program is free software; you can redistribute it and/or modify it | ||
10 | * under the terms of version 2 of the GNU General Public License as | ||
11 | * published by the Free Software Foundation. | ||
12 | * | ||
13 | * This program is distributed in the hope that it would be useful, but | ||
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License along | ||
18 | * with this program; if not, write the Free Software Foundation, Inc., 59 | ||
19 | * Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
20 | * | ||
21 | * Contact information: Unisys Corporation, Township Line & Union Meeting | ||
22 | * Roads-A, Unisys Way, Blue Bell, Pennsylvania, 19424, or: | ||
23 | * | ||
24 | * http://www.unisys.com | ||
25 | */ | ||
26 | |||
27 | #include <linux/module.h> | ||
28 | #include <linux/types.h> | ||
29 | #include <linux/kernel.h> | ||
30 | #include <linux/smp.h> | ||
31 | #include <linux/string.h> | ||
32 | #include <linux/spinlock.h> | ||
33 | #include <linux/errno.h> | ||
34 | #include <linux/notifier.h> | ||
35 | #include <linux/reboot.h> | ||
36 | #include <linux/init.h> | ||
37 | #include <linux/acpi.h> | ||
38 | #include <asm/io.h> | ||
39 | #include <asm/nmi.h> | ||
40 | #include <asm/smp.h> | ||
41 | #include <asm/apicdef.h> | ||
42 | #include "es7000.h" | ||
43 | #include <mach_mpparse.h> | ||
44 | |||
45 | /* | ||
46 | * ES7000 Globals | ||
47 | */ | ||
48 | |||
49 | static volatile unsigned long *psai = NULL; | ||
50 | static struct mip_reg *mip_reg; | ||
51 | static struct mip_reg *host_reg; | ||
52 | static int mip_port; | ||
53 | static unsigned long mip_addr, host_addr; | ||
54 | |||
55 | int es7000_plat; | ||
56 | |||
57 | /* | ||
58 | * GSI override for ES7000 platforms. | ||
59 | */ | ||
60 | |||
61 | static unsigned int base; | ||
62 | |||
63 | static int | ||
64 | es7000_rename_gsi(int ioapic, int gsi) | ||
65 | { | ||
66 | if (es7000_plat == ES7000_ZORRO) | ||
67 | return gsi; | ||
68 | |||
69 | if (!base) { | ||
70 | int i; | ||
71 | for (i = 0; i < nr_ioapics; i++) | ||
72 | base += nr_ioapic_registers[i]; | ||
73 | } | ||
74 | |||
75 | if (!ioapic && (gsi < 16)) | ||
76 | gsi += base; | ||
77 | return gsi; | ||
78 | } | ||
79 | |||
80 | void __init | ||
81 | setup_unisys(void) | ||
82 | { | ||
83 | /* | ||
84 | * Determine the generation of the ES7000 currently running. | ||
85 | * | ||
86 | * es7000_plat = 1 if the machine is a 5xx ES7000 box | ||
87 | * es7000_plat = 2 if the machine is a x86_64 ES7000 box | ||
88 | * | ||
89 | */ | ||
90 | if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2)) | ||
91 | es7000_plat = ES7000_ZORRO; | ||
92 | else | ||
93 | es7000_plat = ES7000_CLASSIC; | ||
94 | ioapic_renumber_irq = es7000_rename_gsi; | ||
95 | } | ||
96 | |||
97 | /* | ||
98 | * Parse the OEM Table | ||
99 | */ | ||
100 | |||
101 | int __init | ||
102 | parse_unisys_oem (char *oemptr) | ||
103 | { | ||
104 | int i; | ||
105 | int success = 0; | ||
106 | unsigned char type, size; | ||
107 | unsigned long val; | ||
108 | char *tp = NULL; | ||
109 | struct psai *psaip = NULL; | ||
110 | struct mip_reg_info *mi; | ||
111 | struct mip_reg *host, *mip; | ||
112 | |||
113 | tp = oemptr; | ||
114 | |||
115 | tp += 8; | ||
116 | |||
117 | for (i=0; i <= 6; i++) { | ||
118 | type = *tp++; | ||
119 | size = *tp++; | ||
120 | tp -= 2; | ||
121 | switch (type) { | ||
122 | case MIP_REG: | ||
123 | mi = (struct mip_reg_info *)tp; | ||
124 | val = MIP_RD_LO(mi->host_reg); | ||
125 | host_addr = val; | ||
126 | host = (struct mip_reg *)val; | ||
127 | host_reg = __va(host); | ||
128 | val = MIP_RD_LO(mi->mip_reg); | ||
129 | mip_port = MIP_PORT(mi->mip_info); | ||
130 | mip_addr = val; | ||
131 | mip = (struct mip_reg *)val; | ||
132 | mip_reg = __va(mip); | ||
133 | pr_debug("es7000_mipcfg: host_reg = 0x%lx \n", | ||
134 | (unsigned long)host_reg); | ||
135 | pr_debug("es7000_mipcfg: mip_reg = 0x%lx \n", | ||
136 | (unsigned long)mip_reg); | ||
137 | success++; | ||
138 | break; | ||
139 | case MIP_PSAI_REG: | ||
140 | psaip = (struct psai *)tp; | ||
141 | if (tp != NULL) { | ||
142 | if (psaip->addr) | ||
143 | psai = __va(psaip->addr); | ||
144 | else | ||
145 | psai = NULL; | ||
146 | success++; | ||
147 | } | ||
148 | break; | ||
149 | default: | ||
150 | break; | ||
151 | } | ||
152 | tp += size; | ||
153 | } | ||
154 | |||
155 | if (success < 2) { | ||
156 | es7000_plat = NON_UNISYS; | ||
157 | } else | ||
158 | setup_unisys(); | ||
159 | return es7000_plat; | ||
160 | } | ||
161 | |||
162 | #ifdef CONFIG_ACPI | ||
163 | int __init | ||
164 | find_unisys_acpi_oem_table(unsigned long *oem_addr) | ||
165 | { | ||
166 | struct acpi_table_header *header = NULL; | ||
167 | int i = 0; | ||
168 | while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) { | ||
169 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { | ||
170 | struct oem_table *t = (struct oem_table *)header; | ||
171 | *oem_addr = (unsigned long)__acpi_map_table(t->OEMTableAddr, | ||
172 | t->OEMTableSize); | ||
173 | return 0; | ||
174 | } | ||
175 | } | ||
176 | return -1; | ||
177 | } | ||
178 | #endif | ||
179 | |||
180 | static void | ||
181 | es7000_spin(int n) | ||
182 | { | ||
183 | int i = 0; | ||
184 | |||
185 | while (i++ < n) | ||
186 | rep_nop(); | ||
187 | } | ||
188 | |||
189 | static int __init | ||
190 | es7000_mip_write(struct mip_reg *mip_reg) | ||
191 | { | ||
192 | int status = 0; | ||
193 | int spin; | ||
194 | |||
195 | spin = MIP_SPIN; | ||
196 | while (((unsigned long long)host_reg->off_38 & | ||
197 | (unsigned long long)MIP_VALID) != 0) { | ||
198 | if (--spin <= 0) { | ||
199 | printk("es7000_mip_write: Timeout waiting for Host Valid Flag"); | ||
200 | return -1; | ||
201 | } | ||
202 | es7000_spin(MIP_SPIN); | ||
203 | } | ||
204 | |||
205 | memcpy(host_reg, mip_reg, sizeof(struct mip_reg)); | ||
206 | outb(1, mip_port); | ||
207 | |||
208 | spin = MIP_SPIN; | ||
209 | |||
210 | while (((unsigned long long)mip_reg->off_38 & | ||
211 | (unsigned long long)MIP_VALID) == 0) { | ||
212 | if (--spin <= 0) { | ||
213 | printk("es7000_mip_write: Timeout waiting for MIP Valid Flag"); | ||
214 | return -1; | ||
215 | } | ||
216 | es7000_spin(MIP_SPIN); | ||
217 | } | ||
218 | |||
219 | status = ((unsigned long long)mip_reg->off_0 & | ||
220 | (unsigned long long)0xffff0000000000ULL) >> 48; | ||
221 | mip_reg->off_38 = ((unsigned long long)mip_reg->off_38 & | ||
222 | (unsigned long long)~MIP_VALID); | ||
223 | return status; | ||
224 | } | ||
225 | |||
226 | int | ||
227 | es7000_start_cpu(int cpu, unsigned long eip) | ||
228 | { | ||
229 | unsigned long vect = 0, psaival = 0; | ||
230 | |||
231 | if (psai == NULL) | ||
232 | return -1; | ||
233 | |||
234 | vect = ((unsigned long)__pa(eip)/0x1000) << 16; | ||
235 | psaival = (0x1000000 | vect | cpu); | ||
236 | |||
237 | while (*psai & 0x1000000) | ||
238 | ; | ||
239 | |||
240 | *psai = psaival; | ||
241 | |||
242 | return 0; | ||
243 | |||
244 | } | ||
245 | |||
246 | void __init | ||
247 | es7000_sw_apic(void) | ||
248 | { | ||
249 | if (es7000_plat) { | ||
250 | int mip_status; | ||
251 | struct mip_reg es7000_mip_reg; | ||
252 | |||
253 | printk("ES7000: Enabling APIC mode.\n"); | ||
254 | memset(&es7000_mip_reg, 0, sizeof(struct mip_reg)); | ||
255 | es7000_mip_reg.off_0 = MIP_SW_APIC; | ||
256 | es7000_mip_reg.off_38 = (MIP_VALID); | ||
257 | while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) | ||
258 | printk("es7000_sw_apic: command failed, status = %x\n", | ||
259 | mip_status); | ||
260 | return; | ||
261 | } | ||
262 | } | ||