diff options
Diffstat (limited to 'include/asm-mips/sn')
-rw-r--r-- | include/asm-mips/sn/addrs.h | 28 | ||||
-rw-r--r-- | include/asm-mips/sn/agent.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/arch.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/fru.h (renamed from include/asm-mips/sn/sn0/sn0_fru.h) | 8 | ||||
-rw-r--r-- | include/asm-mips/sn/io.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/ioc3.h | 2 | ||||
-rw-r--r-- | include/asm-mips/sn/klconfig.h | 100 | ||||
-rw-r--r-- | include/asm-mips/sn/kldir.h | 35 | ||||
-rw-r--r-- | include/asm-mips/sn/launch.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/mapped_kernel.h | 1 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/addrs.h | 88 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/arch.h | 18 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hub.h | 4 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubio.h | 16 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubmd.h | 3 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/hubpi.h | 18 | ||||
-rw-r--r-- | include/asm-mips/sn/sn0/ip27.h | 9 |
17 files changed, 27 insertions, 307 deletions
diff --git a/include/asm-mips/sn/addrs.h b/include/asm-mips/sn/addrs.h index 2b5cef1ba37..8fa0af6b68d 100644 --- a/include/asm-mips/sn/addrs.h +++ b/include/asm-mips/sn/addrs.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _ASM_SN_ADDRS_H | 9 | #ifndef _ASM_SN_ADDRS_H |
10 | #define _ASM_SN_ADDRS_H | 10 | #define _ASM_SN_ADDRS_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | 12 | ||
14 | #ifndef __ASSEMBLY__ | 13 | #ifndef __ASSEMBLY__ |
15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
@@ -27,13 +26,8 @@ | |||
27 | 26 | ||
28 | #ifndef __ASSEMBLY__ | 27 | #ifndef __ASSEMBLY__ |
29 | 28 | ||
30 | #if defined(CONFIG_SGI_IO) /* FIXME */ | ||
31 | #define PS_UINT_CAST (__psunsigned_t) | ||
32 | #define UINT64_CAST (__uint64_t) | ||
33 | #else /* CONFIG_SGI_IO */ | ||
34 | #define PS_UINT_CAST (unsigned long) | 29 | #define PS_UINT_CAST (unsigned long) |
35 | #define UINT64_CAST (unsigned long) | 30 | #define UINT64_CAST (unsigned long) |
36 | #endif /* CONFIG_SGI_IO */ | ||
37 | 31 | ||
38 | #define HUBREG_CAST (volatile hubreg_t *) | 32 | #define HUBREG_CAST (volatile hubreg_t *) |
39 | 33 | ||
@@ -253,14 +247,6 @@ | |||
253 | * for _x. | 247 | * for _x. |
254 | */ | 248 | */ |
255 | 249 | ||
256 | #ifdef _STANDALONE | ||
257 | |||
258 | /* DO NOT USE THESE DIRECTLY IN THE KERNEL. SEE BELOW. */ | ||
259 | #define LOCAL_HUB(_x) (HUBREG_CAST (IALIAS_BASE + (_x))) | ||
260 | #define REMOTE_HUB(_n, _x) (HUBREG_CAST (NODE_SWIN_BASE(_n, 1) + \ | ||
261 | 0x800000 + (_x))) | ||
262 | #endif /* _STANDALONE */ | ||
263 | |||
264 | /* | 250 | /* |
265 | * WARNING: | 251 | * WARNING: |
266 | * When certain Hub chip workaround are defined, it's not sufficient | 252 | * When certain Hub chip workaround are defined, it's not sufficient |
@@ -327,20 +313,6 @@ | |||
327 | PHYS_TO_K0(NODE_OFFSET(nasid) | ARCS_SPB_OFFSET) | 313 | PHYS_TO_K0(NODE_OFFSET(nasid) | ARCS_SPB_OFFSET) |
328 | #define ARCS_SPB_SIZE 0x0400 | 314 | #define ARCS_SPB_SIZE 0x0400 |
329 | 315 | ||
330 | #ifdef _STANDALONE | ||
331 | |||
332 | #define ARCS_TVECTOR_OFFSET 0x2800 | ||
333 | #define ARCS_PVECTOR_OFFSET 0x2c00 | ||
334 | |||
335 | /* | ||
336 | * These addresses are used by the master CPU to install the transfer | ||
337 | * and private vectors. All others use the SPB to find them. | ||
338 | */ | ||
339 | #define TVADDR (NODE_CAC_BASE(get_nasid()) + ARCS_TVECTOR_OFFSET) | ||
340 | #define PVADDR (NODE_CAC_BASE(get_nasid()) + ARCS_PVECTOR_OFFSET) | ||
341 | |||
342 | #endif /* _STANDALONE */ | ||
343 | |||
344 | #define KLDIR_OFFSET 0x2000 | 316 | #define KLDIR_OFFSET 0x2000 |
345 | #define KLDIR_ADDR(nasid) \ | 317 | #define KLDIR_ADDR(nasid) \ |
346 | TO_NODE_UNCAC((nasid), KLDIR_OFFSET) | 318 | TO_NODE_UNCAC((nasid), KLDIR_OFFSET) |
diff --git a/include/asm-mips/sn/agent.h b/include/asm-mips/sn/agent.h index d6df13aaed4..ac4ea85c3a5 100644 --- a/include/asm-mips/sn/agent.h +++ b/include/asm-mips/sn/agent.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _ASM_SGI_SN_AGENT_H | 11 | #ifndef _ASM_SGI_SN_AGENT_H |
12 | #define _ASM_SGI_SN_AGENT_H | 12 | #define _ASM_SGI_SN_AGENT_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/topology.h> | 14 | #include <linux/topology.h> |
16 | #include <asm/sn/addrs.h> | 15 | #include <asm/sn/addrs.h> |
17 | #include <asm/sn/arch.h> | 16 | #include <asm/sn/arch.h> |
diff --git a/include/asm-mips/sn/arch.h b/include/asm-mips/sn/arch.h index d247a819de7..51174af6ac5 100644 --- a/include/asm-mips/sn/arch.h +++ b/include/asm-mips/sn/arch.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _ASM_SN_ARCH_H | 11 | #ifndef _ASM_SN_ARCH_H |
12 | #define _ASM_SN_ARCH_H | 12 | #define _ASM_SN_ARCH_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | #include <linux/types.h> | 14 | #include <linux/types.h> |
16 | #include <asm/sn/types.h> | 15 | #include <asm/sn/types.h> |
17 | #ifdef CONFIG_SGI_IP27 | 16 | #ifdef CONFIG_SGI_IP27 |
diff --git a/include/asm-mips/sn/sn0/sn0_fru.h b/include/asm-mips/sn/fru.h index 82c6377c275..b3e3606723b 100644 --- a/include/asm-mips/sn/sn0/sn0_fru.h +++ b/include/asm-mips/sn/fru.h | |||
@@ -6,10 +6,10 @@ | |||
6 | * Derived from IRIX <sys/SN/SN0/sn0_fru.h> | 6 | * Derived from IRIX <sys/SN/SN0/sn0_fru.h> |
7 | * | 7 | * |
8 | * Copyright (C) 1992 - 1997, 1999 Silcon Graphics, Inc. | 8 | * Copyright (C) 1992 - 1997, 1999 Silcon Graphics, Inc. |
9 | * Copyright (C) 1999 Ralf Baechle (ralf@gnu.org) | 9 | * Copyright (C) 1999, 2006 Ralf Baechle (ralf@linux-mips) |
10 | */ | 10 | */ |
11 | #ifndef _ASM_SN_SN0_SN0_FRU_H | 11 | #ifndef __ASM_SN_FRU_H |
12 | #define _ASM_SN_SN0_SN0_FRU_H | 12 | #define __ASM_SN_FRU_H |
13 | 13 | ||
14 | #define MAX_DIMMS 8 /* max # of dimm banks */ | 14 | #define MAX_DIMMS 8 /* max # of dimm banks */ |
15 | #define MAX_PCIDEV 8 /* max # of pci devices on a pci bus */ | 15 | #define MAX_PCIDEV 8 /* max # of pci devices on a pci bus */ |
@@ -41,4 +41,4 @@ typedef struct kf_pci_bus_s { | |||
41 | /* confidence level that the pci dev is bad */ | 41 | /* confidence level that the pci dev is bad */ |
42 | } kf_pci_bus_t; | 42 | } kf_pci_bus_t; |
43 | 43 | ||
44 | #endif /* _ASM_SN_SN0_SN0_FRU_H */ | 44 | #endif /* __ASM_SN_FRU_H */ |
diff --git a/include/asm-mips/sn/io.h b/include/asm-mips/sn/io.h index 13326453efc..ab2fa8cd262 100644 --- a/include/asm-mips/sn/io.h +++ b/include/asm-mips/sn/io.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _ASM_SN_IO_H | 9 | #ifndef _ASM_SN_IO_H |
10 | #define _ASM_SN_IO_H | 10 | #define _ASM_SN_IO_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #if defined (CONFIG_SGI_IP27) | 12 | #if defined (CONFIG_SGI_IP27) |
14 | #include <asm/sn/sn0/hubio.h> | 13 | #include <asm/sn/sn0/hubio.h> |
15 | #endif | 14 | #endif |
diff --git a/include/asm-mips/sn/ioc3.h b/include/asm-mips/sn/ioc3.h index f7d530f306f..099677774d7 100644 --- a/include/asm-mips/sn/ioc3.h +++ b/include/asm-mips/sn/ioc3.h | |||
@@ -5,6 +5,8 @@ | |||
5 | #ifndef _IOC3_H | 5 | #ifndef _IOC3_H |
6 | #define _IOC3_H | 6 | #define _IOC3_H |
7 | 7 | ||
8 | #include <linux/types.h> | ||
9 | |||
8 | /* SUPERIO uart register map */ | 10 | /* SUPERIO uart register map */ |
9 | typedef volatile struct ioc3_uartregs { | 11 | typedef volatile struct ioc3_uartregs { |
10 | union { | 12 | union { |
diff --git a/include/asm-mips/sn/klconfig.h b/include/asm-mips/sn/klconfig.h index 9709ff701d9..b63cd0655b3 100644 --- a/include/asm-mips/sn/klconfig.h +++ b/include/asm-mips/sn/klconfig.h | |||
@@ -27,7 +27,6 @@ | |||
27 | * that offsets of existing fields do not change. | 27 | * that offsets of existing fields do not change. |
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include <linux/config.h> | ||
31 | #include <linux/types.h> | 30 | #include <linux/types.h> |
32 | #include <asm/sn/types.h> | 31 | #include <asm/sn/types.h> |
33 | 32 | ||
@@ -37,7 +36,7 @@ | |||
37 | //#include <sys/SN/router.h> | 36 | //#include <sys/SN/router.h> |
38 | // XXX Stolen from <sys/SN/router.h>: | 37 | // XXX Stolen from <sys/SN/router.h>: |
39 | #define MAX_ROUTER_PORTS (6) /* Max. number of ports on a router */ | 38 | #define MAX_ROUTER_PORTS (6) /* Max. number of ports on a router */ |
40 | #include <asm/sn/sn0/sn0_fru.h> | 39 | #include <asm/sn/fru.h> |
41 | //#include <sys/graph.h> | 40 | //#include <sys/graph.h> |
42 | //#include <sys/xtalk/xbow.h> | 41 | //#include <sys/xtalk/xbow.h> |
43 | 42 | ||
@@ -54,32 +53,21 @@ | |||
54 | #include <asm/sn/agent.h> | 53 | #include <asm/sn/agent.h> |
55 | #include <asm/arc/types.h> | 54 | #include <asm/arc/types.h> |
56 | #include <asm/arc/hinv.h> | 55 | #include <asm/arc/hinv.h> |
57 | #if defined(CONFIG_SGI_IO) || defined(CONFIG_SGI_IP35) | 56 | #if defined(CONFIG_SGI_IP35) |
58 | // The hack file has to be before vector and after sn0_fru.... | 57 | // The hack file has to be before vector and after sn0_fru.... |
59 | #include <asm/hack.h> | 58 | #include <asm/hack.h> |
60 | #include <asm/sn/vector.h> | 59 | #include <asm/sn/vector.h> |
61 | #include <asm/xtalk/xtalk.h> | 60 | #include <asm/xtalk/xtalk.h> |
62 | #endif /* CONFIG_SGI_IO || CONFIG_SGI_IP35 */ | 61 | #endif /* CONFIG_SGI_IP35 */ |
63 | #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ | 62 | #endif /* CONFIG_SGI_IP27 || CONFIG_SGI_IP35 */ |
64 | 63 | ||
65 | #define KLCFGINFO_MAGIC 0xbeedbabe | 64 | #define KLCFGINFO_MAGIC 0xbeedbabe |
66 | 65 | ||
67 | #ifdef FRUTEST | ||
68 | typedef u64 klconf_off_t; | ||
69 | #else | ||
70 | typedef s32 klconf_off_t; | 66 | typedef s32 klconf_off_t; |
71 | #endif | ||
72 | 67 | ||
73 | /* | 68 | /* |
74 | * Some IMPORTANT OFFSETS. These are the offsets on all NODES. | 69 | * Some IMPORTANT OFFSETS. These are the offsets on all NODES. |
75 | */ | 70 | */ |
76 | #if 0 | ||
77 | #define RAMBASE 0 | ||
78 | #define ARCSSPB_OFF 0x1000 /* shift it to sys/arcs/spb.h */ | ||
79 | |||
80 | #define OFF_HWGRAPH 0 | ||
81 | #endif | ||
82 | |||
83 | #define MAX_MODULE_ID 255 | 71 | #define MAX_MODULE_ID 255 |
84 | #define SIZE_PAD 4096 /* 4k padding for structures */ | 72 | #define SIZE_PAD 4096 /* 4k padding for structures */ |
85 | /* | 73 | /* |
@@ -134,15 +122,9 @@ typedef s32 klconf_off_t; | |||
134 | 122 | ||
135 | 123 | ||
136 | typedef struct console_s { | 124 | typedef struct console_s { |
137 | #if defined(CONFIG_SGI_IO) /* FIXME */ | ||
138 | __psunsigned_t uart_base; | ||
139 | __psunsigned_t config_base; | ||
140 | __psunsigned_t memory_base; | ||
141 | #else | ||
142 | unsigned long uart_base; | 125 | unsigned long uart_base; |
143 | unsigned long config_base; | 126 | unsigned long config_base; |
144 | unsigned long memory_base; | 127 | unsigned long memory_base; |
145 | #endif | ||
146 | short baud; | 128 | short baud; |
147 | short flag; | 129 | short flag; |
148 | int type; | 130 | int type; |
@@ -174,10 +156,6 @@ typedef struct kl_config_hdr { | |||
174 | 156 | ||
175 | 157 | ||
176 | #define KL_CONFIG_HDR(_nasid) ((kl_config_hdr_t *)(KLCONFIG_ADDR(_nasid))) | 158 | #define KL_CONFIG_HDR(_nasid) ((kl_config_hdr_t *)(KLCONFIG_ADDR(_nasid))) |
177 | #if 0 | ||
178 | #define KL_CONFIG_MALLOC_HDR(_nasid) \ | ||
179 | (KL_CONFIG_HDR(_nasid)->ch_malloc_hdr) | ||
180 | #endif | ||
181 | #define KL_CONFIG_INFO_OFFSET(_nasid) \ | 159 | #define KL_CONFIG_INFO_OFFSET(_nasid) \ |
182 | (KL_CONFIG_HDR(_nasid)->ch_board_info) | 160 | (KL_CONFIG_HDR(_nasid)->ch_board_info) |
183 | #define KL_CONFIG_INFO_SET_OFFSET(_nasid, _off) \ | 161 | #define KL_CONFIG_INFO_SET_OFFSET(_nasid, _off) \ |
@@ -197,23 +175,13 @@ typedef struct kl_config_hdr { | |||
197 | 175 | ||
198 | /* --- New Macros for the changed kl_config_hdr_t structure --- */ | 176 | /* --- New Macros for the changed kl_config_hdr_t structure --- */ |
199 | 177 | ||
200 | #if defined(CONFIG_SGI_IO) | ||
201 | #define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\ | ||
202 | ((__psunsigned_t)_k + (_k->ch_malloc_hdr_off))) | ||
203 | #else | ||
204 | #define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\ | 178 | #define PTR_CH_MALLOC_HDR(_k) ((klc_malloc_hdr_t *)\ |
205 | (unsigned long)_k + (_k->ch_malloc_hdr_off))) | 179 | (unsigned long)_k + (_k->ch_malloc_hdr_off))) |
206 | #endif | ||
207 | 180 | ||
208 | #define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n)) | 181 | #define KL_CONFIG_CH_MALLOC_HDR(_n) PTR_CH_MALLOC_HDR(KL_CONFIG_HDR(_n)) |
209 | 182 | ||
210 | #if defined(CONFIG_SGI_IO) | ||
211 | #define PTR_CH_CONS_INFO(_k) ((console_t *)\ | ||
212 | ((__psunsigned_t)_k + (_k->ch_cons_off))) | ||
213 | #else | ||
214 | #define PTR_CH_CONS_INFO(_k) ((console_t *)\ | 183 | #define PTR_CH_CONS_INFO(_k) ((console_t *)\ |
215 | ((unsigned long)_k + (_k->ch_cons_off))) | 184 | ((unsigned long)_k + (_k->ch_cons_off))) |
216 | #endif | ||
217 | 185 | ||
218 | #define KL_CONFIG_CH_CONS_INFO(_n) PTR_CH_CONS_INFO(KL_CONFIG_HDR(_n)) | 186 | #define KL_CONFIG_CH_CONS_INFO(_n) PTR_CH_CONS_INFO(KL_CONFIG_HDR(_n)) |
219 | 187 | ||
@@ -490,14 +458,6 @@ typedef struct lboard_s { | |||
490 | #define KLCF_NUM_COMPS(_brd) ((_brd)->brd_numcompts) | 458 | #define KLCF_NUM_COMPS(_brd) ((_brd)->brd_numcompts) |
491 | #define KLCF_MODULE_ID(_brd) ((_brd)->brd_module) | 459 | #define KLCF_MODULE_ID(_brd) ((_brd)->brd_module) |
492 | 460 | ||
493 | #ifdef FRUTEST | ||
494 | |||
495 | #define KLCF_NEXT(_brd) ((_brd)->brd_next ? (lboard_t *)((_brd)->brd_next): NULL) | ||
496 | #define KLCF_COMP(_brd, _ndx) (klinfo_t *)((_brd)->brd_compts[(_ndx)]) | ||
497 | #define KLCF_COMP_ERROR(_brd, _comp) (_brd = _brd , (_comp)->errinfo) | ||
498 | |||
499 | #else | ||
500 | |||
501 | #define KLCF_NEXT(_brd) \ | 461 | #define KLCF_NEXT(_brd) \ |
502 | ((_brd)->brd_next ? \ | 462 | ((_brd)->brd_next ? \ |
503 | (lboard_t *)(NODE_OFFSET_TO_K1(NASID_GET(_brd), (_brd)->brd_next)):\ | 463 | (lboard_t *)(NODE_OFFSET_TO_K1(NASID_GET(_brd), (_brd)->brd_next)):\ |
@@ -509,8 +469,6 @@ typedef struct lboard_s { | |||
509 | #define KLCF_COMP_ERROR(_brd, _comp) \ | 469 | #define KLCF_COMP_ERROR(_brd, _comp) \ |
510 | (NODE_OFFSET_TO_K1(NASID_GET(_brd), (_comp)->errinfo)) | 470 | (NODE_OFFSET_TO_K1(NASID_GET(_brd), (_comp)->errinfo)) |
511 | 471 | ||
512 | #endif | ||
513 | |||
514 | #define KLCF_COMP_TYPE(_comp) ((_comp)->struct_type) | 472 | #define KLCF_COMP_TYPE(_comp) ((_comp)->struct_type) |
515 | #define KLCF_BRIDGE_W_ID(_comp) ((_comp)->physid) /* Widget ID */ | 473 | #define KLCF_BRIDGE_W_ID(_comp) ((_comp)->physid) /* Widget ID */ |
516 | 474 | ||
@@ -631,18 +589,6 @@ typedef struct klport_s { | |||
631 | klconf_off_t port_offset; | 589 | klconf_off_t port_offset; |
632 | } klport_t; | 590 | } klport_t; |
633 | 591 | ||
634 | #if 0 | ||
635 | /* | ||
636 | * This is very similar to the klport_s but instead of having a componant | ||
637 | * offset it has a board offset. | ||
638 | */ | ||
639 | typedef struct klxbow_port_s { | ||
640 | nasid_t port_nasid; | ||
641 | unsigned char port_flag; | ||
642 | klconf_off_t board_offset; | ||
643 | } klxbow_port_t; | ||
644 | #endif | ||
645 | |||
646 | typedef struct klcpu_s { /* CPU */ | 592 | typedef struct klcpu_s { /* CPU */ |
647 | klinfo_t cpu_info; | 593 | klinfo_t cpu_info; |
648 | unsigned short cpu_prid; /* Processor PRID value */ | 594 | unsigned short cpu_prid; /* Processor PRID value */ |
@@ -656,7 +602,7 @@ typedef struct klcpu_s { /* CPU */ | |||
656 | 602 | ||
657 | typedef struct klhub_s { /* HUB */ | 603 | typedef struct klhub_s { /* HUB */ |
658 | klinfo_t hub_info; | 604 | klinfo_t hub_info; |
659 | uint hub_flags; /* PCFG_HUB_xxx flags */ | 605 | unsigned int hub_flags; /* PCFG_HUB_xxx flags */ |
660 | klport_t hub_port; /* hub is connected to this */ | 606 | klport_t hub_port; /* hub is connected to this */ |
661 | nic_t hub_box_nic; /* nic of containing box */ | 607 | nic_t hub_box_nic; /* nic of containing box */ |
662 | klconf_off_t hub_mfg_nic; /* MFG NIC string */ | 608 | klconf_off_t hub_mfg_nic; /* MFG NIC string */ |
@@ -665,7 +611,7 @@ typedef struct klhub_s { /* HUB */ | |||
665 | 611 | ||
666 | typedef struct klhub_uart_s { /* HUB */ | 612 | typedef struct klhub_uart_s { /* HUB */ |
667 | klinfo_t hubuart_info; | 613 | klinfo_t hubuart_info; |
668 | uint hubuart_flags; /* PCFG_HUB_xxx flags */ | 614 | unsigned int hubuart_flags; /* PCFG_HUB_xxx flags */ |
669 | nic_t hubuart_box_nic; /* nic of containing box */ | 615 | nic_t hubuart_box_nic; /* nic of containing box */ |
670 | } klhub_uart_t ; | 616 | } klhub_uart_t ; |
671 | 617 | ||
@@ -764,7 +710,7 @@ typedef struct klvmed_s { /* VME DEVICE - VME BOARD */ | |||
764 | /* XXX - Don't we need the number of ports here?!? */ | 710 | /* XXX - Don't we need the number of ports here?!? */ |
765 | typedef struct klrou_s { /* ROUTER */ | 711 | typedef struct klrou_s { /* ROUTER */ |
766 | klinfo_t rou_info ; | 712 | klinfo_t rou_info ; |
767 | uint rou_flags ; /* PCFG_ROUTER_xxx flags */ | 713 | unsigned int rou_flags ; /* PCFG_ROUTER_xxx flags */ |
768 | nic_t rou_box_nic ; /* nic of the containing module */ | 714 | nic_t rou_box_nic ; /* nic of the containing module */ |
769 | klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ | 715 | klport_t rou_port[MAX_ROUTER_PORTS + 1] ; /* array index 1 to 6 */ |
770 | klconf_off_t rou_mfg_nic ; /* MFG NIC string */ | 716 | klconf_off_t rou_mfg_nic ; /* MFG NIC string */ |
@@ -787,8 +733,8 @@ typedef struct klgfx_s { /* GRAPHICS Device */ | |||
787 | klinfo_t gfx_info; | 733 | klinfo_t gfx_info; |
788 | klconf_off_t old_gndevs; /* for compatibility with older proms */ | 734 | klconf_off_t old_gndevs; /* for compatibility with older proms */ |
789 | klconf_off_t old_gdoff0; /* for compatibility with older proms */ | 735 | klconf_off_t old_gdoff0; /* for compatibility with older proms */ |
790 | uint cookie; /* for compatibility with older proms */ | 736 | unsigned int cookie; /* for compatibility with older proms */ |
791 | uint moduleslot; | 737 | unsigned int moduleslot; |
792 | struct klgfx_s *gfx_next_pipe; | 738 | struct klgfx_s *gfx_next_pipe; |
793 | graphics_t gfx_specific; | 739 | graphics_t gfx_specific; |
794 | klconf_off_t pad0; /* for compatibility with older proms */ | 740 | klconf_off_t pad0; /* for compatibility with older proms */ |
@@ -945,36 +891,6 @@ extern klcpu_t *nasid_slice_to_cpuinfo(nasid_t, int); | |||
945 | extern lboard_t *find_lboard_class(lboard_t *start, unsigned char brd_class); | 891 | extern lboard_t *find_lboard_class(lboard_t *start, unsigned char brd_class); |
946 | 892 | ||
947 | 893 | ||
948 | #if defined(CONFIG_SGI_IO) | ||
949 | extern xwidgetnum_t nodevertex_widgetnum_get(vertex_hdl_t node_vtx); | ||
950 | extern vertex_hdl_t nodevertex_xbow_peer_get(vertex_hdl_t node_vtx); | ||
951 | extern lboard_t *find_gfxpipe(int pipenum); | ||
952 | extern void setup_gfxpipe_link(vertex_hdl_t vhdl,int pipenum); | ||
953 | extern lboard_t *find_lboard_module_class(lboard_t *start, moduleid_t mod, | ||
954 | unsigned char brd_class); | ||
955 | extern lboard_t *find_nic_lboard(lboard_t *, nic_t); | ||
956 | extern lboard_t *find_nic_type_lboard(nasid_t, unsigned char, nic_t); | ||
957 | extern lboard_t *find_lboard_modslot(lboard_t *start, moduleid_t mod, slotid_t slot); | ||
958 | extern lboard_t *find_lboard_module(lboard_t *start, moduleid_t mod); | ||
959 | extern lboard_t *get_board_name(nasid_t nasid, moduleid_t mod, slotid_t slot, char *name); | ||
960 | extern int config_find_nic_router(nasid_t, nic_t, lboard_t **, klrou_t**); | ||
961 | extern int config_find_nic_hub(nasid_t, nic_t, lboard_t **, klhub_t**); | ||
962 | extern int config_find_xbow(nasid_t, lboard_t **, klxbow_t**); | ||
963 | extern klcpu_t *get_cpuinfo(cpuid_t cpu); | ||
964 | extern int update_klcfg_cpuinfo(nasid_t, int); | ||
965 | extern void board_to_path(lboard_t *brd, char *path); | ||
966 | extern moduleid_t get_module_id(nasid_t nasid); | ||
967 | extern void nic_name_convert(char *old_name, char *new_name); | ||
968 | extern int module_brds(nasid_t nasid, lboard_t **module_brds, int n); | ||
969 | extern lboard_t *brd_from_key(ulong_t key); | ||
970 | extern void device_component_canonical_name_get(lboard_t *,klinfo_t *, | ||
971 | char *); | ||
972 | extern int board_serial_number_get(lboard_t *,char *); | ||
973 | extern int is_master_baseio(nasid_t,moduleid_t,slotid_t); | ||
974 | extern nasid_t get_actual_nasid(lboard_t *brd) ; | ||
975 | extern net_vec_t klcfg_discover_route(lboard_t *, lboard_t *, int); | ||
976 | #else /* CONFIG_SGI_IO */ | ||
977 | extern klcpu_t *sn_get_cpuinfo(cpuid_t cpu); | 894 | extern klcpu_t *sn_get_cpuinfo(cpuid_t cpu); |
978 | #endif /* CONFIG_SGI_IO */ | ||
979 | 895 | ||
980 | #endif /* _ASM_SN_KLCONFIG_H */ | 896 | #endif /* _ASM_SN_KLCONFIG_H */ |
diff --git a/include/asm-mips/sn/kldir.h b/include/asm-mips/sn/kldir.h index f0efab1672e..0573cbffc10 100644 --- a/include/asm-mips/sn/kldir.h +++ b/include/asm-mips/sn/kldir.h | |||
@@ -11,11 +11,6 @@ | |||
11 | #ifndef _ASM_SN_KLDIR_H | 11 | #ifndef _ASM_SN_KLDIR_H |
12 | #define _ASM_SN_KLDIR_H | 12 | #define _ASM_SN_KLDIR_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | |||
16 | #if defined(CONFIG_SGI_IO) | ||
17 | #include <asm/hack.h> | ||
18 | #endif | ||
19 | 14 | ||
20 | /* | 15 | /* |
21 | * The kldir memory area resides at a fixed place in each node's memory and | 16 | * The kldir memory area resides at a fixed place in each node's memory and |
@@ -136,8 +131,6 @@ | |||
136 | #define KLDIR_OFF_STRIDE 0x28 | 131 | #define KLDIR_OFF_STRIDE 0x28 |
137 | #endif /* __ASSEMBLY__ */ | 132 | #endif /* __ASSEMBLY__ */ |
138 | 133 | ||
139 | #if !defined(CONFIG_SGI_IO) | ||
140 | |||
141 | /* | 134 | /* |
142 | * This is defined here because IP27_SYMMON_STK_SIZE must be at least what | 135 | * This is defined here because IP27_SYMMON_STK_SIZE must be at least what |
143 | * we define here. Since it's set up in the prom. We can't redefine it later | 136 | * we define here. Since it's set up in the prom. We can't redefine it later |
@@ -147,7 +140,7 @@ | |||
147 | */ | 140 | */ |
148 | #define SYMMON_STACK_SIZE 0x8000 | 141 | #define SYMMON_STACK_SIZE 0x8000 |
149 | 142 | ||
150 | #if defined (PROM) || defined (SABLE) | 143 | #if defined (PROM) |
151 | 144 | ||
152 | /* | 145 | /* |
153 | * These defines are prom version dependent. No code other than the IP27 | 146 | * These defines are prom version dependent. No code other than the IP27 |
@@ -184,7 +177,7 @@ | |||
184 | #define IP27_FREEMEM_COUNT 1 | 177 | #define IP27_FREEMEM_COUNT 1 |
185 | #define IP27_FREEMEM_STRIDE 0 | 178 | #define IP27_FREEMEM_STRIDE 0 |
186 | 179 | ||
187 | #endif /* PROM || SABLE*/ | 180 | #endif /* PROM */ |
188 | /* | 181 | /* |
189 | * There will be only one of these in a partition so the IO6 must set it up. | 182 | * There will be only one of these in a partition so the IO6 must set it up. |
190 | */ | 183 | */ |
@@ -207,17 +200,11 @@ | |||
207 | #define KLDIR_ENT_SIZE 0x40 | 200 | #define KLDIR_ENT_SIZE 0x40 |
208 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) | 201 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) |
209 | 202 | ||
210 | #endif /* !CONFIG_SGI_IO */ | ||
211 | |||
212 | #ifndef __ASSEMBLY__ | 203 | #ifndef __ASSEMBLY__ |
213 | typedef struct kldir_ent_s { | 204 | typedef struct kldir_ent_s { |
214 | u64 magic; /* Indicates validity of entry */ | 205 | u64 magic; /* Indicates validity of entry */ |
215 | off_t offset; /* Offset from start of node space */ | 206 | off_t offset; /* Offset from start of node space */ |
216 | #if defined(CONFIG_SGI_IO) /* FIXME */ | ||
217 | __psunsigned_t pointer; /* Pointer to area in some cases */ | ||
218 | #else | ||
219 | unsigned long pointer; /* Pointer to area in some cases */ | 207 | unsigned long pointer; /* Pointer to area in some cases */ |
220 | #endif | ||
221 | size_t size; /* Size in bytes */ | 208 | size_t size; /* Size in bytes */ |
222 | u64 count; /* Repeat count if array, 1 if not */ | 209 | u64 count; /* Repeat count if array, 1 if not */ |
223 | size_t stride; /* Stride if array, 0 if not */ | 210 | size_t stride; /* Stride if array, 0 if not */ |
@@ -227,22 +214,4 @@ typedef struct kldir_ent_s { | |||
227 | } kldir_ent_t; | 214 | } kldir_ent_t; |
228 | #endif /* !__ASSEMBLY__ */ | 215 | #endif /* !__ASSEMBLY__ */ |
229 | 216 | ||
230 | #if defined(CONFIG_SGI_IO) | ||
231 | |||
232 | #define KLDIR_ENT_SIZE 0x40 | ||
233 | #define KLDIR_MAX_ENTRIES (0x400 / 0x40) | ||
234 | |||
235 | /* | ||
236 | * The actual offsets of each memory area are machine-dependent | ||
237 | */ | ||
238 | #ifdef CONFIG_SGI_IP27 | ||
239 | // Not yet #include <asm/sn/sn0/kldir.h> | ||
240 | #elif defined(CONFIG_SGI_IP35) | ||
241 | #include <asm/sn/sn1/kldir.h> | ||
242 | #else | ||
243 | #error "kldir.h is currently defined for IP27 and IP35 platforms only" | ||
244 | #endif | ||
245 | |||
246 | #endif /* CONFIG_SGI_IO */ | ||
247 | |||
248 | #endif /* _ASM_SN_KLDIR_H */ | 217 | #endif /* _ASM_SN_KLDIR_H */ |
diff --git a/include/asm-mips/sn/launch.h b/include/asm-mips/sn/launch.h index b67699c0c47..b7c2226312c 100644 --- a/include/asm-mips/sn/launch.h +++ b/include/asm-mips/sn/launch.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef _ASM_SN_LAUNCH_H | 9 | #ifndef _ASM_SN_LAUNCH_H |
10 | #define _ASM_SN_LAUNCH_H | 10 | #define _ASM_SN_LAUNCH_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <asm/sn/types.h> | 12 | #include <asm/sn/types.h> |
14 | #include <asm/sn/addrs.h> | 13 | #include <asm/sn/addrs.h> |
15 | 14 | ||
diff --git a/include/asm-mips/sn/mapped_kernel.h b/include/asm-mips/sn/mapped_kernel.h index 59edb20f8ec..c3dd5d0d525 100644 --- a/include/asm-mips/sn/mapped_kernel.h +++ b/include/asm-mips/sn/mapped_kernel.h | |||
@@ -20,7 +20,6 @@ | |||
20 | * code. So no jumps can be done before we have switched to using | 20 | * code. So no jumps can be done before we have switched to using |
21 | * cksseg addresses. | 21 | * cksseg addresses. |
22 | */ | 22 | */ |
23 | #include <linux/config.h> | ||
24 | #include <asm/addrspace.h> | 23 | #include <asm/addrspace.h> |
25 | 24 | ||
26 | #define REP_BASE CAC_BASE | 25 | #define REP_BASE CAC_BASE |
diff --git a/include/asm-mips/sn/sn0/addrs.h b/include/asm-mips/sn/sn0/addrs.h index 398815639fb..9e8cc52910f 100644 --- a/include/asm-mips/sn/sn0/addrs.h +++ b/include/asm-mips/sn/sn0/addrs.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _ASM_SN_SN0_ADDRS_H | 11 | #ifndef _ASM_SN_SN0_ADDRS_H |
12 | #define _ASM_SN_SN0_ADDRS_H | 12 | #define _ASM_SN_SN0_ADDRS_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * SN0 (on a T5) Address map | 16 | * SN0 (on a T5) Address map |
@@ -49,7 +48,7 @@ | |||
49 | * so for now we just use defines bracketed by an ifdef. | 48 | * so for now we just use defines bracketed by an ifdef. |
50 | */ | 49 | */ |
51 | 50 | ||
52 | #ifdef CONFIG_SGI_SN0_N_MODE | 51 | #ifdef CONFIG_SGI_SN_N_MODE |
53 | 52 | ||
54 | #define NODE_SIZE_BITS 31 | 53 | #define NODE_SIZE_BITS 31 |
55 | #define BWIN_SIZE_BITS 28 | 54 | #define BWIN_SIZE_BITS 28 |
@@ -63,7 +62,7 @@ | |||
63 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) | 62 | #define BDDIR_UPPER_MASK (UINT64_CAST 0x7ffff << 10) |
64 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) | 63 | #define BDECC_UPPER_MASK (UINT64_CAST 0x3ffffff << 3) |
65 | 64 | ||
66 | #else /* !defined(CONFIG_SGI_SN0_N_MODE), assume that M-mode is desired */ | 65 | #else /* !defined(CONFIG_SGI_SN_N_MODE), assume that M-mode is desired */ |
67 | 66 | ||
68 | #define NODE_SIZE_BITS 32 | 67 | #define NODE_SIZE_BITS 32 |
69 | #define BWIN_SIZE_BITS 29 | 68 | #define BWIN_SIZE_BITS 29 |
@@ -77,7 +76,7 @@ | |||
77 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) | 76 | #define BDDIR_UPPER_MASK (UINT64_CAST 0xfffff << 10) |
78 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) | 77 | #define BDECC_UPPER_MASK (UINT64_CAST 0x7ffffff << 3) |
79 | 78 | ||
80 | #endif /* !defined(CONFIG_SGI_SN0_N_MODE) */ | 79 | #endif /* !defined(CONFIG_SGI_SN_N_MODE) */ |
81 | 80 | ||
82 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) | 81 | #define NODE_ADDRSPACE_SIZE (UINT64_CAST 1 << NODE_SIZE_BITS) |
83 | 82 | ||
@@ -85,15 +84,15 @@ | |||
85 | #define NASID_GET(_pa) (int) ((UINT64_CAST (_pa) >> \ | 84 | #define NASID_GET(_pa) (int) ((UINT64_CAST (_pa) >> \ |
86 | NASID_SHFT) & NASID_BITMASK) | 85 | NASID_SHFT) & NASID_BITMASK) |
87 | 86 | ||
88 | #if !defined(__ASSEMBLY__) && !defined(_STANDALONE) | 87 | #if !defined(__ASSEMBLY__) |
89 | 88 | ||
90 | #define NODE_SWIN_BASE(nasid, widget) \ | 89 | #define NODE_SWIN_BASE(nasid, widget) \ |
91 | ((widget == 0) ? NODE_BWIN_BASE((nasid), SWIN0_BIGWIN) \ | 90 | ((widget == 0) ? NODE_BWIN_BASE((nasid), SWIN0_BIGWIN) \ |
92 | : RAW_NODE_SWIN_BASE(nasid, widget)) | 91 | : RAW_NODE_SWIN_BASE(nasid, widget)) |
93 | #else /* __ASSEMBLY__ || _STANDALONE */ | 92 | #else /* __ASSEMBLY__ */ |
94 | #define NODE_SWIN_BASE(nasid, widget) \ | 93 | #define NODE_SWIN_BASE(nasid, widget) \ |
95 | (NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS)) | 94 | (NODE_IO_BASE(nasid) + (UINT64_CAST (widget) << SWIN_SIZE_BITS)) |
96 | #endif /* __ASSEMBLY__ || _STANDALONE */ | 95 | #endif /* __ASSEMBLY__ */ |
97 | 96 | ||
98 | /* | 97 | /* |
99 | * The following definitions pertain to the IO special address | 98 | * The following definitions pertain to the IO special address |
@@ -143,12 +142,7 @@ | |||
143 | #define SN0_WIDGET_BASE(_nasid, _wid) (NODE_SWIN_BASE((_nasid), (_wid))) | 142 | #define SN0_WIDGET_BASE(_nasid, _wid) (NODE_SWIN_BASE((_nasid), (_wid))) |
144 | 143 | ||
145 | /* Turn on sable logging for the processors whose bits are set. */ | 144 | /* Turn on sable logging for the processors whose bits are set. */ |
146 | #ifdef SABLE | ||
147 | #define SABLE_LOG_TRIGGER(_map) \ | ||
148 | *((volatile hubreg_t *)(IO_BASE + 0x17ffff0)) = (_map) | ||
149 | #else | ||
150 | #define SABLE_LOG_TRIGGER(_map) | 145 | #define SABLE_LOG_TRIGGER(_map) |
151 | #endif /* SABLE */ | ||
152 | 146 | ||
153 | #ifndef __ASSEMBLY__ | 147 | #ifndef __ASSEMBLY__ |
154 | #define KERN_NMI_ADDR(nasid, slice) \ | 148 | #define KERN_NMI_ADDR(nasid, slice) \ |
@@ -281,76 +275,6 @@ | |||
281 | 275 | ||
282 | #define _ARCSPROM | 276 | #define _ARCSPROM |
283 | 277 | ||
284 | #ifdef _STANDALONE | ||
285 | |||
286 | /* | ||
287 | * The PROM needs to pass the device base address and the | ||
288 | * device pci cfg space address to the device drivers during | ||
289 | * install. The COMPONENT->Key field is used for this purpose. | ||
290 | * Macros needed by SN0 device drivers to convert the | ||
291 | * COMPONENT->Key field to the respective base address. | ||
292 | * Key field looks as follows: | ||
293 | * | ||
294 | * +----------------------------------------------------+ | ||
295 | * |devnasid | widget |pciid |hubwidid|hstnasid | adap | | ||
296 | * | 2 | 1 | 1 | 1 | 2 | 1 | | ||
297 | * +----------------------------------------------------+ | ||
298 | * | | | | | | | | ||
299 | * 64 48 40 32 24 8 0 | ||
300 | * | ||
301 | * These are used by standalone drivers till the io infrastructure | ||
302 | * is in place. | ||
303 | */ | ||
304 | |||
305 | #ifndef __ASSEMBLY__ | ||
306 | |||
307 | #define uchar unsigned char | ||
308 | |||
309 | #define KEY_DEVNASID_SHFT 48 | ||
310 | #define KEY_WIDID_SHFT 40 | ||
311 | #define KEY_PCIID_SHFT 32 | ||
312 | #define KEY_HUBWID_SHFT 24 | ||
313 | #define KEY_HSTNASID_SHFT 8 | ||
314 | |||
315 | #define MK_SN0_KEY(nasid, widid, pciid) \ | ||
316 | ((((__psunsigned_t)nasid)<< KEY_DEVNASID_SHFT |\ | ||
317 | ((__psunsigned_t)widid) << KEY_WIDID_SHFT) |\ | ||
318 | ((__psunsigned_t)pciid) << KEY_PCIID_SHFT) | ||
319 | |||
320 | #define ADD_HUBWID_KEY(key,hubwid)\ | ||
321 | (key|=((__psunsigned_t)hubwid << KEY_HUBWID_SHFT)) | ||
322 | |||
323 | #define ADD_HSTNASID_KEY(key,hstnasid)\ | ||
324 | (key|=((__psunsigned_t)hstnasid << KEY_HSTNASID_SHFT)) | ||
325 | |||
326 | #define GET_DEVNASID_FROM_KEY(key) ((short)(key >> KEY_DEVNASID_SHFT)) | ||
327 | #define GET_WIDID_FROM_KEY(key) ((uchar)(key >> KEY_WIDID_SHFT)) | ||
328 | #define GET_PCIID_FROM_KEY(key) ((uchar)(key >> KEY_PCIID_SHFT)) | ||
329 | #define GET_HUBWID_FROM_KEY(key) ((uchar)(key >> KEY_HUBWID_SHFT)) | ||
330 | #define GET_HSTNASID_FROM_KEY(key) ((short)(key >> KEY_HSTNASID_SHFT)) | ||
331 | |||
332 | #define PCI_64_TARGID_SHFT 60 | ||
333 | |||
334 | #define GET_PCIBASE_FROM_KEY(key) (NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\ | ||
335 | GET_WIDID_FROM_KEY(key))\ | ||
336 | | BRIDGE_DEVIO(GET_PCIID_FROM_KEY(key))) | ||
337 | |||
338 | #define GET_PCICFGBASE_FROM_KEY(key) \ | ||
339 | (NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\ | ||
340 | GET_WIDID_FROM_KEY(key))\ | ||
341 | | BRIDGE_TYPE0_CFG_DEV(GET_PCIID_FROM_KEY(key))) | ||
342 | |||
343 | #define GET_WIDBASE_FROM_KEY(key) \ | ||
344 | (NODE_SWIN_BASE(GET_DEVNASID_FROM_KEY(key),\ | ||
345 | GET_WIDID_FROM_KEY(key))) | ||
346 | |||
347 | #define PUT_INSTALL_STATUS(c,s) c->Revision = s | ||
348 | #define GET_INSTALL_STATUS(c) c->Revision | ||
349 | |||
350 | #endif /* !__ASSEMBLY__ */ | ||
351 | |||
352 | #endif /* _STANDALONE */ | ||
353 | |||
354 | #if defined (HUB_ERR_STS_WAR) | 278 | #if defined (HUB_ERR_STS_WAR) |
355 | 279 | ||
356 | #define ERR_STS_WAR_REGISTER IIO_IIBUSERR | 280 | #define ERR_STS_WAR_REGISTER IIO_IIBUSERR |
diff --git a/include/asm-mips/sn/sn0/arch.h b/include/asm-mips/sn/sn0/arch.h index fb78773a5ef..f734f2007f2 100644 --- a/include/asm-mips/sn/sn0/arch.h +++ b/include/asm-mips/sn/sn0/arch.h | |||
@@ -11,9 +11,6 @@ | |||
11 | #ifndef _ASM_SN_SN0_ARCH_H | 11 | #ifndef _ASM_SN_SN0_ARCH_H |
12 | #define _ASM_SN_SN0_ARCH_H | 12 | #define _ASM_SN_SN0_ARCH_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | |||
16 | #ifndef SABLE | ||
17 | 14 | ||
18 | #ifndef SN0XXL /* 128 cpu SMP max */ | 15 | #ifndef SN0XXL /* 128 cpu SMP max */ |
19 | /* | 16 | /* |
@@ -54,25 +51,16 @@ | |||
54 | */ | 51 | */ |
55 | #define MAX_PARTITIONS MAX_REGIONS | 52 | #define MAX_PARTITIONS MAX_REGIONS |
56 | 53 | ||
57 | |||
58 | #else | ||
59 | |||
60 | #define MAX_COMPACT_NODES 4 | ||
61 | #define MAX_NASIDS 4 | ||
62 | #define MAXCPUS 8 | ||
63 | |||
64 | #endif | ||
65 | |||
66 | #define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8) | 54 | #define NASID_MASK_BYTES ((MAX_NASIDS + 7) / 8) |
67 | 55 | ||
68 | /* | 56 | /* |
69 | * Slot constants for SN0 | 57 | * Slot constants for SN0 |
70 | */ | 58 | */ |
71 | #ifdef CONFIG_SGI_SN0_N_MODE | 59 | #ifdef CONFIG_SGI_SN_N_MODE |
72 | #define MAX_MEM_SLOTS 16 /* max slots per node */ | 60 | #define MAX_MEM_SLOTS 16 /* max slots per node */ |
73 | #else /* !CONFIG_SGI_SN0_N_MODE, assume M_MODE */ | 61 | #else /* !CONFIG_SGI_SN_N_MODE, assume CONFIG_SGI_SN_M_MODE */ |
74 | #define MAX_MEM_SLOTS 32 /* max slots per node */ | 62 | #define MAX_MEM_SLOTS 32 /* max slots per node */ |
75 | #endif /* defined(N_MODE) */ | 63 | #endif /* CONFIG_SGI_SN_M_MODE */ |
76 | 64 | ||
77 | #define SLOT_SHIFT (27) | 65 | #define SLOT_SHIFT (27) |
78 | #define SLOT_MIN_MEM_SIZE (32*1024*1024) | 66 | #define SLOT_MIN_MEM_SIZE (32*1024*1024) |
diff --git a/include/asm-mips/sn/sn0/hub.h b/include/asm-mips/sn/sn0/hub.h index f5dbba6f461..3e228f8e796 100644 --- a/include/asm-mips/sn/sn0/hub.h +++ b/include/asm-mips/sn/sn0/hub.h | |||
@@ -31,10 +31,6 @@ | |||
31 | #include <asm/sn/sn0/hubni.h> | 31 | #include <asm/sn/sn0/hubni.h> |
32 | //#include <asm/sn/sn0/hubcore.h> | 32 | //#include <asm/sn/sn0/hubcore.h> |
33 | 33 | ||
34 | #ifdef SABLE | ||
35 | #define IP27_NO_HUBUART_INT 1 | ||
36 | #endif | ||
37 | |||
38 | /* Translation of uncached attributes */ | 34 | /* Translation of uncached attributes */ |
39 | #define UATTR_HSPEC 0 | 35 | #define UATTR_HSPEC 0 |
40 | #define UATTR_IO 1 | 36 | #define UATTR_IO 1 |
diff --git a/include/asm-mips/sn/sn0/hubio.h b/include/asm-mips/sn/sn0/hubio.h index f314da21b97..ef91b336355 100644 --- a/include/asm-mips/sn/sn0/hubio.h +++ b/include/asm-mips/sn/sn0/hubio.h | |||
@@ -486,22 +486,6 @@ typedef union h1_icrba_u { | |||
486 | #define ICRBN_A_CERR_SHFT 54 | 486 | #define ICRBN_A_CERR_SHFT 54 |
487 | #define ICRBN_A_ERR_MASK 0x3ff | 487 | #define ICRBN_A_ERR_MASK 0x3ff |
488 | 488 | ||
489 | #if 0 /* Disabled, this causes namespace polution and break allmodconfig */ | ||
490 | /* | ||
491 | * Easy access macros. | ||
492 | */ | ||
493 | #define a_error icrba_fields_s.error | ||
494 | #define a_ecode icrba_fields_s.ecode | ||
495 | #define a_lnetuce icrba_fields_s.lnetuce | ||
496 | #define a_mark icrba_fields_s.mark | ||
497 | #define a_xerr icrba_fields_s.xerr | ||
498 | #define a_sidn icrba_fields_s.sidn | ||
499 | #define a_tnum icrba_fields_s.tnum | ||
500 | #define a_addr icrba_fields_s.addr | ||
501 | #define a_valid icrba_fields_s.valid | ||
502 | #define a_iow icrba_fields_s.iow | ||
503 | #endif | ||
504 | |||
505 | #endif /* !__ASSEMBLY__ */ | 489 | #endif /* !__ASSEMBLY__ */ |
506 | 490 | ||
507 | #define IIO_ICRB_ADDR_SHFT 2 /* Shift to get proper address */ | 491 | #define IIO_ICRB_ADDR_SHFT 2 /* Shift to get proper address */ |
diff --git a/include/asm-mips/sn/sn0/hubmd.h b/include/asm-mips/sn/sn0/hubmd.h index a66def4e0ba..14c225d8066 100644 --- a/include/asm-mips/sn/sn0/hubmd.h +++ b/include/asm-mips/sn/sn0/hubmd.h | |||
@@ -11,7 +11,6 @@ | |||
11 | #ifndef _ASM_SN_SN0_HUBMD_H | 11 | #ifndef _ASM_SN_SN0_HUBMD_H |
12 | #define _ASM_SN_SN0_HUBMD_H | 12 | #define _ASM_SN_SN0_HUBMD_H |
13 | 13 | ||
14 | #include <linux/config.h> | ||
15 | 14 | ||
16 | /* | 15 | /* |
17 | * Hub Memory/Directory interface registers | 16 | * Hub Memory/Directory interface registers |
@@ -92,7 +91,7 @@ | |||
92 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ | 91 | #define MD_UREG1_14 0x2200f0 /* uController/UART 1 register */ |
93 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ | 92 | #define MD_UREG1_15 0x2200f8 /* uController/UART 1 register */ |
94 | 93 | ||
95 | #ifdef CONFIG_SGI_SN0_N_MODE | 94 | #ifdef CONFIG_SGI_SN_N_MODE |
96 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ | 95 | #define MD_MEM_BANKS 4 /* 4 banks of memory max in N mode */ |
97 | #else | 96 | #else |
98 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ | 97 | #define MD_MEM_BANKS 8 /* 8 banks of memory max in M mode */ |
diff --git a/include/asm-mips/sn/sn0/hubpi.h b/include/asm-mips/sn/sn0/hubpi.h index 355bba8552e..e39f5f9da04 100644 --- a/include/asm-mips/sn/sn0/hubpi.h +++ b/include/asm-mips/sn/sn0/hubpi.h | |||
@@ -398,24 +398,6 @@ typedef u64 rtc_time_t; | |||
398 | 398 | ||
399 | /* PI_RT_FILTER_CTRL mask and shift definitions */ | 399 | /* PI_RT_FILTER_CTRL mask and shift definitions */ |
400 | 400 | ||
401 | #if 0 | ||
402 | /* | ||
403 | * XXX - This register's definition has changed, but it's only implemented | ||
404 | * in Hub 2. | ||
405 | */ | ||
406 | #define PRFC_DROP_COUNT_SHFT 27 | ||
407 | #define PRFC_DROP_COUNT_MASK (UINT64_CAST 0x3ff << 27) | ||
408 | #define PRFC_DROP_CTR_SHFT 18 | ||
409 | #define PRFC_DROP_CTR_MASK (UINT64_CAST 0x1ff << 18) | ||
410 | #define PRFC_MASK_ENABLE_SHFT 10 | ||
411 | #define PRFC_MASK_ENABLE_MASK (UINT64_CAST 0x7f << 10) | ||
412 | #define PRFC_MASK_CTR_SHFT 2 | ||
413 | #define PRFC_MASK_CTR_MASK (UINT64_CAST 0xff << 2) | ||
414 | #define PRFC_OFFSET_SHFT 0 | ||
415 | #define PRFC_OFFSET_MASK (UINT64_CAST 3) | ||
416 | #endif /* 0 */ | ||
417 | |||
418 | |||
419 | /* | 401 | /* |
420 | * Bits for NACK_CNT_A/B and NACK_CMP | 402 | * Bits for NACK_CNT_A/B and NACK_CMP |
421 | */ | 403 | */ |
diff --git a/include/asm-mips/sn/sn0/ip27.h b/include/asm-mips/sn/sn0/ip27.h index ade0e974dd7..3c97e0855c8 100644 --- a/include/asm-mips/sn/sn0/ip27.h +++ b/include/asm-mips/sn/sn0/ip27.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Derived from IRIX <sys/SN/SN0/IP27.h>. | 6 | * Derived from IRIX <sys/SN/SN0/IP27.h>. |
7 | * | 7 | * |
8 | * Copyright (C) 1992 - 1997, 1999 Silicon Graphics, Inc. | 8 | * Copyright (C) 1992 - 1997, 1999 Silicon Graphics, Inc. |
9 | * Copyright (C) 1999 by Ralf Baechle | 9 | * Copyright (C) 1999, 2006 by Ralf Baechle |
10 | */ | 10 | */ |
11 | #ifndef _ASM_SN_SN0_IP27_H | 11 | #ifndef _ASM_SN_SN0_IP27_H |
12 | #define _ASM_SN_SN0_IP27_H | 12 | #define _ASM_SN_SN0_IP27_H |
@@ -82,11 +82,4 @@ | |||
82 | #define SEND_NMI(_nasid, _slice) \ | 82 | #define SEND_NMI(_nasid, _slice) \ |
83 | REMOTE_HUB_S((_nasid), (PI_NMI_A + ((_slice) * PI_NMI_OFFSET)), 1) | 83 | REMOTE_HUB_S((_nasid), (PI_NMI_A + ((_slice) * PI_NMI_OFFSET)), 1) |
84 | 84 | ||
85 | /* Sanity hazzard ... Below all the Origin hacks are following. */ | ||
86 | |||
87 | #define SN00_BRIDGE 0x9200000008000000 | ||
88 | #define SN00I_BRIDGE0 0x920000000b000000 | ||
89 | #define SN00I_BRIDGE1 0x920000000e000000 | ||
90 | #define SN00I_BRIDGE2 0x920000000f000000 | ||
91 | |||
92 | #endif /* _ASM_SN_SN0_IP27_H */ | 85 | #endif /* _ASM_SN_SN0_IP27_H */ |