diff options
author | Roland Dreier <rolandd@cisco.com> | 2005-11-07 03:58:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:26 -0500 |
commit | b0f7b8bc57ee90138a7c429951457027a90c326f (patch) | |
tree | 07f320bf7d240273faf64d02069488fb29761ae8 /arch/ppc/syslib | |
parent | 41aace4fe81e3da52fa80b8380e5d2d084f77691 (diff) |
[PATCH] ppc32: Add 440SPe support
Add support for the AMCC PowerPC 440SPe SoC, including PCI Express in root
port mode.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/syslib')
-rw-r--r-- | arch/ppc/syslib/Makefile | 1 | ||||
-rw-r--r-- | arch/ppc/syslib/ibm440sp_common.c | 4 | ||||
-rw-r--r-- | arch/ppc/syslib/ibm44x_common.c | 2 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc440spe_pcie.c | 442 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc440spe_pcie.h | 149 | ||||
-rw-r--r-- | arch/ppc/syslib/ppc4xx_pic.c | 37 |
6 files changed, 631 insertions, 4 deletions
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile index 2e58c2105225..13dff1e51f15 100644 --- a/arch/ppc/syslib/Makefile +++ b/arch/ppc/syslib/Makefile | |||
@@ -15,6 +15,7 @@ obj-$(CONFIG_440EP) += ibm440gx_common.o | |||
15 | obj-$(CONFIG_440GP) += ibm440gp_common.o | 15 | obj-$(CONFIG_440GP) += ibm440gp_common.o |
16 | obj-$(CONFIG_440GX) += ibm440gx_common.o | 16 | obj-$(CONFIG_440GX) += ibm440gx_common.o |
17 | obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o | 17 | obj-$(CONFIG_440SP) += ibm440gx_common.o ibm440sp_common.o |
18 | obj-$(CONFIG_440SPE) += ibm440gx_common.o ibm440sp_common.o ppc440spe_pcie.o | ||
18 | ifeq ($(CONFIG_4xx),y) | 19 | ifeq ($(CONFIG_4xx),y) |
19 | ifeq ($(CONFIG_VIRTEX_II_PRO),y) | 20 | ifeq ($(CONFIG_VIRTEX_II_PRO),y) |
20 | obj-$(CONFIG_40x) += xilinx_pic.o | 21 | obj-$(CONFIG_40x) += xilinx_pic.o |
diff --git a/arch/ppc/syslib/ibm440sp_common.c b/arch/ppc/syslib/ibm440sp_common.c index 417d4cff77a0..cdafda127d81 100644 --- a/arch/ppc/syslib/ibm440sp_common.c +++ b/arch/ppc/syslib/ibm440sp_common.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * arch/ppc/syslib/ibm440sp_common.c | 2 | * arch/ppc/syslib/ibm440sp_common.c |
3 | * | 3 | * |
4 | * PPC440SP system library | 4 | * PPC440SP/PPC440SPe system library |
5 | * | 5 | * |
6 | * Matt Porter <mporter@kernel.crashing.org> | 6 | * Matt Porter <mporter@kernel.crashing.org> |
7 | * Copyright 2002-2005 MontaVista Software Inc. | 7 | * Copyright 2002-2005 MontaVista Software Inc. |
@@ -35,7 +35,7 @@ unsigned long __init ibm440sp_find_end_of_memory(void) | |||
35 | u32 mem_size = 0; | 35 | u32 mem_size = 0; |
36 | 36 | ||
37 | /* Read two bank sizes and sum */ | 37 | /* Read two bank sizes and sum */ |
38 | for (i=0; i<2; i++) | 38 | for (i=0; i< MQ0_NUM_BANKS; i++) |
39 | switch (mfdcr(DCRN_MQ0_BS0BAS + i) & MQ0_CONFIG_SIZE_MASK) { | 39 | switch (mfdcr(DCRN_MQ0_BS0BAS + i) & MQ0_CONFIG_SIZE_MASK) { |
40 | case MQ0_CONFIG_SIZE_8M: | 40 | case MQ0_CONFIG_SIZE_8M: |
41 | mem_size += PPC44x_MEM_SIZE_8M; | 41 | mem_size += PPC44x_MEM_SIZE_8M; |
diff --git a/arch/ppc/syslib/ibm44x_common.c b/arch/ppc/syslib/ibm44x_common.c index ebae2e2fcea6..a5bef9d163ab 100644 --- a/arch/ppc/syslib/ibm44x_common.c +++ b/arch/ppc/syslib/ibm44x_common.c | |||
@@ -214,7 +214,7 @@ void __init ibm44x_platform_init(unsigned long r3, unsigned long r4, unsigned lo | |||
214 | /* Called from machine_check_exception */ | 214 | /* Called from machine_check_exception */ |
215 | void platform_machine_check(struct pt_regs *regs) | 215 | void platform_machine_check(struct pt_regs *regs) |
216 | { | 216 | { |
217 | #ifdef CONFIG_440SP | 217 | #if defined(CONFIG_440SP) || defined(CONFIG_440SPE) |
218 | printk("PLB0: BEAR=0x%08x%08x ACR= 0x%08x BESR= 0x%08x%08x\n", | 218 | printk("PLB0: BEAR=0x%08x%08x ACR= 0x%08x BESR= 0x%08x%08x\n", |
219 | mfdcr(DCRN_PLB0_BEARH), mfdcr(DCRN_PLB0_BEARL), | 219 | mfdcr(DCRN_PLB0_BEARH), mfdcr(DCRN_PLB0_BEARL), |
220 | mfdcr(DCRN_PLB0_ACR), mfdcr(DCRN_PLB0_BESRH), | 220 | mfdcr(DCRN_PLB0_ACR), mfdcr(DCRN_PLB0_BESRH), |
diff --git a/arch/ppc/syslib/ppc440spe_pcie.c b/arch/ppc/syslib/ppc440spe_pcie.c new file mode 100644 index 000000000000..1509fc1ddfb6 --- /dev/null +++ b/arch/ppc/syslib/ppc440spe_pcie.c | |||
@@ -0,0 +1,442 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2005 Cisco Systems. All rights reserved. | ||
3 | * Roland Dreier <rolandd@cisco.com> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms of the GNU General Public License as published by the | ||
7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
8 | * option) any later version. | ||
9 | */ | ||
10 | |||
11 | #include <linux/config.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/delay.h> | ||
14 | #include <linux/pci.h> | ||
15 | #include <linux/init.h> | ||
16 | |||
17 | #include <asm/reg.h> | ||
18 | #include <asm/io.h> | ||
19 | #include <asm/ibm44x.h> | ||
20 | |||
21 | #include "ppc440spe_pcie.h" | ||
22 | |||
23 | static int | ||
24 | pcie_read_config(struct pci_bus *bus, unsigned int devfn, int offset, | ||
25 | int len, u32 *val) | ||
26 | { | ||
27 | struct pci_controller *hose = bus->sysdata; | ||
28 | |||
29 | if (PCI_SLOT(devfn) != 1) | ||
30 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
31 | |||
32 | offset += devfn << 12; | ||
33 | |||
34 | /* | ||
35 | * Note: the caller has already checked that offset is | ||
36 | * suitably aligned and that len is 1, 2 or 4. | ||
37 | */ | ||
38 | switch (len) { | ||
39 | case 1: | ||
40 | *val = in_8(hose->cfg_data + offset); | ||
41 | break; | ||
42 | case 2: | ||
43 | *val = in_le16(hose->cfg_data + offset); | ||
44 | break; | ||
45 | default: | ||
46 | *val = in_le32(hose->cfg_data + offset); | ||
47 | break; | ||
48 | } | ||
49 | |||
50 | if (0) printk("%s: read %x(%d) @ %x\n", __func__, *val, len, offset); | ||
51 | |||
52 | return PCIBIOS_SUCCESSFUL; | ||
53 | } | ||
54 | |||
55 | static int | ||
56 | pcie_write_config(struct pci_bus *bus, unsigned int devfn, int offset, | ||
57 | int len, u32 val) | ||
58 | { | ||
59 | struct pci_controller *hose = bus->sysdata; | ||
60 | |||
61 | if (PCI_SLOT(devfn) != 1) | ||
62 | return PCIBIOS_DEVICE_NOT_FOUND; | ||
63 | |||
64 | offset += devfn << 12; | ||
65 | |||
66 | switch (len) { | ||
67 | case 1: | ||
68 | out_8(hose->cfg_data + offset, val); | ||
69 | break; | ||
70 | case 2: | ||
71 | out_le16(hose->cfg_data + offset, val); | ||
72 | break; | ||
73 | default: | ||
74 | out_le32(hose->cfg_data + offset, val); | ||
75 | break; | ||
76 | } | ||
77 | return PCIBIOS_SUCCESSFUL; | ||
78 | } | ||
79 | |||
80 | static struct pci_ops pcie_pci_ops = | ||
81 | { | ||
82 | .read = pcie_read_config, | ||
83 | .write = pcie_write_config | ||
84 | }; | ||
85 | |||
86 | enum { | ||
87 | PTYPE_ENDPOINT = 0x0, | ||
88 | PTYPE_LEGACY_ENDPOINT = 0x1, | ||
89 | PTYPE_ROOT_PORT = 0x4, | ||
90 | |||
91 | LNKW_X1 = 0x1, | ||
92 | LNKW_X4 = 0x4, | ||
93 | LNKW_X8 = 0x8 | ||
94 | }; | ||
95 | |||
96 | static void check_error(void) | ||
97 | { | ||
98 | u32 valPE0, valPE1, valPE2; | ||
99 | |||
100 | /* SDR0_PEGPLLLCT1 reset */ | ||
101 | if (!(valPE0 = SDR_READ(PESDR0_PLLLCT1) & 0x01000000)) { | ||
102 | printk(KERN_INFO "PCIE: SDR0_PEGPLLLCT1 reset error 0x%8x\n", valPE0); | ||
103 | } | ||
104 | |||
105 | valPE0 = SDR_READ(PESDR0_RCSSET); | ||
106 | valPE1 = SDR_READ(PESDR1_RCSSET); | ||
107 | valPE2 = SDR_READ(PESDR2_RCSSET); | ||
108 | |||
109 | /* SDR0_PExRCSSET rstgu */ | ||
110 | if ( !(valPE0 & 0x01000000) || | ||
111 | !(valPE1 & 0x01000000) || | ||
112 | !(valPE2 & 0x01000000)) { | ||
113 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET rstgu error\n"); | ||
114 | } | ||
115 | |||
116 | /* SDR0_PExRCSSET rstdl */ | ||
117 | if ( !(valPE0 & 0x00010000) || | ||
118 | !(valPE1 & 0x00010000) || | ||
119 | !(valPE2 & 0x00010000)) { | ||
120 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET rstdl error\n"); | ||
121 | } | ||
122 | |||
123 | /* SDR0_PExRCSSET rstpyn */ | ||
124 | if ( (valPE0 & 0x00001000) || | ||
125 | (valPE1 & 0x00001000) || | ||
126 | (valPE2 & 0x00001000)) { | ||
127 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET rstpyn error\n"); | ||
128 | } | ||
129 | |||
130 | /* SDR0_PExRCSSET hldplb */ | ||
131 | if ( (valPE0 & 0x10000000) || | ||
132 | (valPE1 & 0x10000000) || | ||
133 | (valPE2 & 0x10000000)) { | ||
134 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET hldplb error\n"); | ||
135 | } | ||
136 | |||
137 | /* SDR0_PExRCSSET rdy */ | ||
138 | if ( (valPE0 & 0x00100000) || | ||
139 | (valPE1 & 0x00100000) || | ||
140 | (valPE2 & 0x00100000)) { | ||
141 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET rdy error\n"); | ||
142 | } | ||
143 | |||
144 | /* SDR0_PExRCSSET shutdown */ | ||
145 | if ( (valPE0 & 0x00000100) || | ||
146 | (valPE1 & 0x00000100) || | ||
147 | (valPE2 & 0x00000100)) { | ||
148 | printk(KERN_INFO "PCIE: SDR0_PExRCSSET shutdown error\n"); | ||
149 | } | ||
150 | } | ||
151 | |||
152 | /* | ||
153 | * Initialize PCI Express core as described in User Manual section 27.12.1 | ||
154 | */ | ||
155 | int ppc440spe_init_pcie(void) | ||
156 | { | ||
157 | /* Set PLL clock receiver to LVPECL */ | ||
158 | SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) | 1 << 28); | ||
159 | |||
160 | check_error(); | ||
161 | |||
162 | printk(KERN_INFO "PCIE initialization OK\n"); | ||
163 | |||
164 | if (!(SDR_READ(PESDR0_PLLLCT2) & 0x10000)) | ||
165 | printk(KERN_INFO "PESDR_PLLCT2 resistance calibration failed (0x%08x)\n", | ||
166 | SDR_READ(PESDR0_PLLLCT2)); | ||
167 | |||
168 | /* De-assert reset of PCIe PLL, wait for lock */ | ||
169 | SDR_WRITE(PESDR0_PLLLCT1, SDR_READ(PESDR0_PLLLCT1) & ~(1 << 24)); | ||
170 | udelay(3); | ||
171 | |||
172 | return 0; | ||
173 | } | ||
174 | |||
175 | int ppc440spe_init_pcie_rootport(int port) | ||
176 | { | ||
177 | static int core_init; | ||
178 | void __iomem *utl_base; | ||
179 | u32 val = 0; | ||
180 | int i; | ||
181 | |||
182 | if (!core_init) { | ||
183 | ++core_init; | ||
184 | i = ppc440spe_init_pcie(); | ||
185 | if (i) | ||
186 | return i; | ||
187 | } | ||
188 | |||
189 | /* | ||
190 | * Initialize various parts of the PCI Express core for our port: | ||
191 | * | ||
192 | * - Set as a root port and enable max width | ||
193 | * (PXIE0 -> X8, PCIE1 and PCIE2 -> X4). | ||
194 | * - Set up UTL configuration. | ||
195 | * - Increase SERDES drive strength to levels suggested by AMCC. | ||
196 | * - De-assert RSTPYN, RSTDL and RSTGU. | ||
197 | */ | ||
198 | switch (port) { | ||
199 | case 0: | ||
200 | SDR_WRITE(PESDR0_DLPSET, PTYPE_ROOT_PORT << 20 | LNKW_X8 << 12); | ||
201 | |||
202 | SDR_WRITE(PESDR0_UTLSET1, 0x21222222); | ||
203 | SDR_WRITE(PESDR0_UTLSET2, 0x11000000); | ||
204 | |||
205 | SDR_WRITE(PESDR0_HSSL0SET1, 0x35000000); | ||
206 | SDR_WRITE(PESDR0_HSSL1SET1, 0x35000000); | ||
207 | SDR_WRITE(PESDR0_HSSL2SET1, 0x35000000); | ||
208 | SDR_WRITE(PESDR0_HSSL3SET1, 0x35000000); | ||
209 | SDR_WRITE(PESDR0_HSSL4SET1, 0x35000000); | ||
210 | SDR_WRITE(PESDR0_HSSL5SET1, 0x35000000); | ||
211 | SDR_WRITE(PESDR0_HSSL6SET1, 0x35000000); | ||
212 | SDR_WRITE(PESDR0_HSSL7SET1, 0x35000000); | ||
213 | |||
214 | SDR_WRITE(PESDR0_RCSSET, | ||
215 | (SDR_READ(PESDR0_RCSSET) & ~(1 << 24 | 1 << 16)) | 1 << 12); | ||
216 | break; | ||
217 | |||
218 | case 1: | ||
219 | SDR_WRITE(PESDR1_DLPSET, PTYPE_ROOT_PORT << 20 | LNKW_X4 << 12); | ||
220 | |||
221 | SDR_WRITE(PESDR1_UTLSET1, 0x21222222); | ||
222 | SDR_WRITE(PESDR1_UTLSET2, 0x11000000); | ||
223 | |||
224 | SDR_WRITE(PESDR1_HSSL0SET1, 0x35000000); | ||
225 | SDR_WRITE(PESDR1_HSSL1SET1, 0x35000000); | ||
226 | SDR_WRITE(PESDR1_HSSL2SET1, 0x35000000); | ||
227 | SDR_WRITE(PESDR1_HSSL3SET1, 0x35000000); | ||
228 | |||
229 | SDR_WRITE(PESDR1_RCSSET, | ||
230 | (SDR_READ(PESDR1_RCSSET) & ~(1 << 24 | 1 << 16)) | 1 << 12); | ||
231 | break; | ||
232 | |||
233 | case 2: | ||
234 | SDR_WRITE(PESDR2_DLPSET, PTYPE_ROOT_PORT << 20 | LNKW_X4 << 12); | ||
235 | |||
236 | SDR_WRITE(PESDR2_UTLSET1, 0x21222222); | ||
237 | SDR_WRITE(PESDR2_UTLSET2, 0x11000000); | ||
238 | |||
239 | SDR_WRITE(PESDR2_HSSL0SET1, 0x35000000); | ||
240 | SDR_WRITE(PESDR2_HSSL1SET1, 0x35000000); | ||
241 | SDR_WRITE(PESDR2_HSSL2SET1, 0x35000000); | ||
242 | SDR_WRITE(PESDR2_HSSL3SET1, 0x35000000); | ||
243 | |||
244 | SDR_WRITE(PESDR2_RCSSET, | ||
245 | (SDR_READ(PESDR2_RCSSET) & ~(1 << 24 | 1 << 16)) | 1 << 12); | ||
246 | break; | ||
247 | } | ||
248 | |||
249 | mdelay(1000); | ||
250 | |||
251 | switch (port) { | ||
252 | case 0: val = SDR_READ(PESDR0_RCSSTS); break; | ||
253 | case 1: val = SDR_READ(PESDR1_RCSSTS); break; | ||
254 | case 2: val = SDR_READ(PESDR2_RCSSTS); break; | ||
255 | } | ||
256 | |||
257 | if (!(val & (1 << 20))) | ||
258 | printk(KERN_INFO "PCIE%d: PGRST inactive\n", port); | ||
259 | else | ||
260 | printk(KERN_WARNING "PGRST for PCIE%d failed %08x\n", port, val); | ||
261 | |||
262 | switch (port) { | ||
263 | case 0: printk(KERN_INFO "PCIE0: LOOP %08x\n", SDR_READ(PESDR0_LOOP)); break; | ||
264 | case 1: printk(KERN_INFO "PCIE1: LOOP %08x\n", SDR_READ(PESDR1_LOOP)); break; | ||
265 | case 2: printk(KERN_INFO "PCIE2: LOOP %08x\n", SDR_READ(PESDR2_LOOP)); break; | ||
266 | } | ||
267 | |||
268 | /* | ||
269 | * Map UTL registers at 0xc_1000_0n00 | ||
270 | */ | ||
271 | switch (port) { | ||
272 | case 0: | ||
273 | mtdcr(DCRN_PEGPL_REGBAH(PCIE0), 0x0000000c); | ||
274 | mtdcr(DCRN_PEGPL_REGBAL(PCIE0), 0x10000000); | ||
275 | mtdcr(DCRN_PEGPL_REGMSK(PCIE0), 0x00007001); | ||
276 | mtdcr(DCRN_PEGPL_SPECIAL(PCIE0), 0x68782800); | ||
277 | break; | ||
278 | |||
279 | case 1: | ||
280 | mtdcr(DCRN_PEGPL_REGBAH(PCIE1), 0x0000000c); | ||
281 | mtdcr(DCRN_PEGPL_REGBAL(PCIE1), 0x10001000); | ||
282 | mtdcr(DCRN_PEGPL_REGMSK(PCIE1), 0x00007001); | ||
283 | mtdcr(DCRN_PEGPL_SPECIAL(PCIE1), 0x68782800); | ||
284 | break; | ||
285 | |||
286 | case 2: | ||
287 | mtdcr(DCRN_PEGPL_REGBAH(PCIE2), 0x0000000c); | ||
288 | mtdcr(DCRN_PEGPL_REGBAL(PCIE2), 0x10002000); | ||
289 | mtdcr(DCRN_PEGPL_REGMSK(PCIE2), 0x00007001); | ||
290 | mtdcr(DCRN_PEGPL_SPECIAL(PCIE2), 0x68782800); | ||
291 | } | ||
292 | |||
293 | utl_base = ioremap64(0xc10000000ull + 0x1000 * port, 0x100); | ||
294 | |||
295 | /* | ||
296 | * Set buffer allocations and then assert VRB and TXE. | ||
297 | */ | ||
298 | out_be32(utl_base + PEUTL_OUTTR, 0x08000000); | ||
299 | out_be32(utl_base + PEUTL_INTR, 0x02000000); | ||
300 | out_be32(utl_base + PEUTL_OPDBSZ, 0x10000000); | ||
301 | out_be32(utl_base + PEUTL_PBBSZ, 0x53000000); | ||
302 | out_be32(utl_base + PEUTL_IPHBSZ, 0x08000000); | ||
303 | out_be32(utl_base + PEUTL_IPDBSZ, 0x10000000); | ||
304 | out_be32(utl_base + PEUTL_RCIRQEN, 0x00f00000); | ||
305 | out_be32(utl_base + PEUTL_PCTL, 0x80800066); | ||
306 | |||
307 | iounmap(utl_base); | ||
308 | |||
309 | /* | ||
310 | * We map PCI Express configuration access into the 512MB regions | ||
311 | * PCIE0: 0xc_4000_0000 | ||
312 | * PCIE1: 0xc_8000_0000 | ||
313 | * PCIE2: 0xc_c000_0000 | ||
314 | */ | ||
315 | switch (port) { | ||
316 | case 0: | ||
317 | mtdcr(DCRN_PEGPL_CFGBAH(PCIE0), 0x0000000c); | ||
318 | mtdcr(DCRN_PEGPL_CFGBAL(PCIE0), 0x40000000); | ||
319 | mtdcr(DCRN_PEGPL_CFGMSK(PCIE0), 0xe0000001); /* 512MB region, valid */ | ||
320 | break; | ||
321 | |||
322 | case 1: | ||
323 | mtdcr(DCRN_PEGPL_CFGBAH(PCIE1), 0x0000000c); | ||
324 | mtdcr(DCRN_PEGPL_CFGBAL(PCIE1), 0x80000000); | ||
325 | mtdcr(DCRN_PEGPL_CFGMSK(PCIE1), 0xe0000001); /* 512MB region, valid */ | ||
326 | break; | ||
327 | |||
328 | case 2: | ||
329 | mtdcr(DCRN_PEGPL_CFGBAH(PCIE2), 0x0000000c); | ||
330 | mtdcr(DCRN_PEGPL_CFGBAL(PCIE2), 0xc0000000); | ||
331 | mtdcr(DCRN_PEGPL_CFGMSK(PCIE2), 0xe0000001); /* 512MB region, valid */ | ||
332 | break; | ||
333 | } | ||
334 | |||
335 | /* | ||
336 | * Check for VC0 active and assert RDY. | ||
337 | */ | ||
338 | switch (port) { | ||
339 | case 0: | ||
340 | if (!(SDR_READ(PESDR0_RCSSTS) & (1 << 16))) | ||
341 | printk(KERN_WARNING "PCIE0: VC0 not active\n"); | ||
342 | SDR_WRITE(PESDR0_RCSSET, SDR_READ(PESDR0_RCSSET) | 1 << 20); | ||
343 | break; | ||
344 | case 1: | ||
345 | if (!(SDR_READ(PESDR1_RCSSTS) & (1 << 16))) | ||
346 | printk(KERN_WARNING "PCIE0: VC0 not active\n"); | ||
347 | SDR_WRITE(PESDR1_RCSSET, SDR_READ(PESDR1_RCSSET) | 1 << 20); | ||
348 | break; | ||
349 | case 2: | ||
350 | if (!(SDR_READ(PESDR2_RCSSTS) & (1 << 16))) | ||
351 | printk(KERN_WARNING "PCIE0: VC0 not active\n"); | ||
352 | SDR_WRITE(PESDR2_RCSSET, SDR_READ(PESDR2_RCSSET) | 1 << 20); | ||
353 | break; | ||
354 | } | ||
355 | |||
356 | #if 0 | ||
357 | /* Dump all config regs */ | ||
358 | for (i = 0x300; i <= 0x320; ++i) | ||
359 | printk("[%04x] 0x%08x\n", i, SDR_READ(i)); | ||
360 | for (i = 0x340; i <= 0x353; ++i) | ||
361 | printk("[%04x] 0x%08x\n", i, SDR_READ(i)); | ||
362 | for (i = 0x370; i <= 0x383; ++i) | ||
363 | printk("[%04x] 0x%08x\n", i, SDR_READ(i)); | ||
364 | for (i = 0x3a0; i <= 0x3a2; ++i) | ||
365 | printk("[%04x] 0x%08x\n", i, SDR_READ(i)); | ||
366 | for (i = 0x3c0; i <= 0x3c3; ++i) | ||
367 | printk("[%04x] 0x%08x\n", i, SDR_READ(i)); | ||
368 | #endif | ||
369 | |||
370 | mdelay(100); | ||
371 | |||
372 | return 0; | ||
373 | } | ||
374 | |||
375 | void ppc440spe_setup_pcie(struct pci_controller *hose, int port) | ||
376 | { | ||
377 | void __iomem *mbase; | ||
378 | |||
379 | /* | ||
380 | * Map 16MB, which is enough for 4 bits of bus # | ||
381 | */ | ||
382 | hose->cfg_data = ioremap64(0xc40000000ull + port * 0x40000000, | ||
383 | 1 << 24); | ||
384 | hose->ops = &pcie_pci_ops; | ||
385 | |||
386 | /* | ||
387 | * Set bus numbers on our root port | ||
388 | */ | ||
389 | mbase = ioremap64(0xc50000000ull + port * 0x40000000, 4096); | ||
390 | out_8(mbase + PCI_PRIMARY_BUS, 0); | ||
391 | out_8(mbase + PCI_SECONDARY_BUS, 0); | ||
392 | |||
393 | /* | ||
394 | * Set up outbound translation to hose->mem_space from PLB | ||
395 | * addresses at an offset of 0xd_0000_0000. We set the low | ||
396 | * bits of the mask to 11 to turn off splitting into 8 | ||
397 | * subregions and to enable the outbound translation. | ||
398 | */ | ||
399 | out_le32(mbase + PECFG_POM0LAH, 0); | ||
400 | out_le32(mbase + PECFG_POM0LAL, hose->mem_space.start); | ||
401 | |||
402 | switch (port) { | ||
403 | case 0: | ||
404 | mtdcr(DCRN_PEGPL_OMR1BAH(PCIE0), 0x0000000d); | ||
405 | mtdcr(DCRN_PEGPL_OMR1BAL(PCIE0), hose->mem_space.start); | ||
406 | mtdcr(DCRN_PEGPL_OMR1MSKH(PCIE0), 0x7fffffff); | ||
407 | mtdcr(DCRN_PEGPL_OMR1MSKL(PCIE0), | ||
408 | ~(hose->mem_space.end - hose->mem_space.start) | 3); | ||
409 | break; | ||
410 | case 1: | ||
411 | mtdcr(DCRN_PEGPL_OMR1BAH(PCIE1), 0x0000000d); | ||
412 | mtdcr(DCRN_PEGPL_OMR1BAL(PCIE1), hose->mem_space.start); | ||
413 | mtdcr(DCRN_PEGPL_OMR1MSKH(PCIE1), 0x7fffffff); | ||
414 | mtdcr(DCRN_PEGPL_OMR1MSKL(PCIE1), | ||
415 | ~(hose->mem_space.end - hose->mem_space.start) | 3); | ||
416 | |||
417 | break; | ||
418 | case 2: | ||
419 | mtdcr(DCRN_PEGPL_OMR1BAH(PCIE2), 0x0000000d); | ||
420 | mtdcr(DCRN_PEGPL_OMR1BAL(PCIE2), hose->mem_space.start); | ||
421 | mtdcr(DCRN_PEGPL_OMR1MSKH(PCIE2), 0x7fffffff); | ||
422 | mtdcr(DCRN_PEGPL_OMR1MSKL(PCIE2), | ||
423 | ~(hose->mem_space.end - hose->mem_space.start) | 3); | ||
424 | break; | ||
425 | } | ||
426 | |||
427 | /* Set up 16GB inbound memory window at 0 */ | ||
428 | out_le32(mbase + PCI_BASE_ADDRESS_0, 0); | ||
429 | out_le32(mbase + PCI_BASE_ADDRESS_1, 0); | ||
430 | out_le32(mbase + PECFG_BAR0HMPA, 0x7fffffc); | ||
431 | out_le32(mbase + PECFG_BAR0LMPA, 0); | ||
432 | out_le32(mbase + PECFG_PIM0LAL, 0); | ||
433 | out_le32(mbase + PECFG_PIM0LAH, 0); | ||
434 | out_le32(mbase + PECFG_PIMEN, 0x1); | ||
435 | |||
436 | /* Enable I/O, Mem, and Busmaster cycles */ | ||
437 | out_le16(mbase + PCI_COMMAND, | ||
438 | in_le16(mbase + PCI_COMMAND) | | ||
439 | PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER); | ||
440 | |||
441 | iounmap(mbase); | ||
442 | } | ||
diff --git a/arch/ppc/syslib/ppc440spe_pcie.h b/arch/ppc/syslib/ppc440spe_pcie.h new file mode 100644 index 000000000000..55b765ad3272 --- /dev/null +++ b/arch/ppc/syslib/ppc440spe_pcie.h | |||
@@ -0,0 +1,149 @@ | |||
1 | /* | ||
2 | * Copyright (c) 2005 Cisco Systems. All rights reserved. | ||
3 | * Roland Dreier <rolandd@cisco.com> | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms of the GNU General Public License as published by the | ||
7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
8 | * option) any later version. | ||
9 | */ | ||
10 | |||
11 | #ifndef __PPC_SYSLIB_PPC440SPE_PCIE_H | ||
12 | #define __PPC_SYSLIB_PPC440SPE_PCIE_H | ||
13 | |||
14 | #define DCRN_SDR0_CFGADDR 0x00e | ||
15 | #define DCRN_SDR0_CFGDATA 0x00f | ||
16 | |||
17 | #define DCRN_PCIE0_BASE 0x100 | ||
18 | #define DCRN_PCIE1_BASE 0x120 | ||
19 | #define DCRN_PCIE2_BASE 0x140 | ||
20 | #define PCIE0 DCRN_PCIE0_BASE | ||
21 | #define PCIE1 DCRN_PCIE1_BASE | ||
22 | #define PCIE2 DCRN_PCIE2_BASE | ||
23 | |||
24 | #define DCRN_PEGPL_CFGBAH(base) (base + 0x00) | ||
25 | #define DCRN_PEGPL_CFGBAL(base) (base + 0x01) | ||
26 | #define DCRN_PEGPL_CFGMSK(base) (base + 0x02) | ||
27 | #define DCRN_PEGPL_MSGBAH(base) (base + 0x03) | ||
28 | #define DCRN_PEGPL_MSGBAL(base) (base + 0x04) | ||
29 | #define DCRN_PEGPL_MSGMSK(base) (base + 0x05) | ||
30 | #define DCRN_PEGPL_OMR1BAH(base) (base + 0x06) | ||
31 | #define DCRN_PEGPL_OMR1BAL(base) (base + 0x07) | ||
32 | #define DCRN_PEGPL_OMR1MSKH(base) (base + 0x08) | ||
33 | #define DCRN_PEGPL_OMR1MSKL(base) (base + 0x09) | ||
34 | #define DCRN_PEGPL_REGBAH(base) (base + 0x12) | ||
35 | #define DCRN_PEGPL_REGBAL(base) (base + 0x13) | ||
36 | #define DCRN_PEGPL_REGMSK(base) (base + 0x14) | ||
37 | #define DCRN_PEGPL_SPECIAL(base) (base + 0x15) | ||
38 | |||
39 | /* | ||
40 | * System DCRs (SDRs) | ||
41 | */ | ||
42 | #define PESDR0_PLLLCT1 0x03a0 | ||
43 | #define PESDR0_PLLLCT2 0x03a1 | ||
44 | #define PESDR0_PLLLCT3 0x03a2 | ||
45 | |||
46 | #define PESDR0_UTLSET1 0x0300 | ||
47 | #define PESDR0_UTLSET2 0x0301 | ||
48 | #define PESDR0_DLPSET 0x0302 | ||
49 | #define PESDR0_LOOP 0x0303 | ||
50 | #define PESDR0_RCSSET 0x0304 | ||
51 | #define PESDR0_RCSSTS 0x0305 | ||
52 | #define PESDR0_HSSL0SET1 0x0306 | ||
53 | #define PESDR0_HSSL0SET2 0x0307 | ||
54 | #define PESDR0_HSSL0STS 0x0308 | ||
55 | #define PESDR0_HSSL1SET1 0x0309 | ||
56 | #define PESDR0_HSSL1SET2 0x030a | ||
57 | #define PESDR0_HSSL1STS 0x030b | ||
58 | #define PESDR0_HSSL2SET1 0x030c | ||
59 | #define PESDR0_HSSL2SET2 0x030d | ||
60 | #define PESDR0_HSSL2STS 0x030e | ||
61 | #define PESDR0_HSSL3SET1 0x030f | ||
62 | #define PESDR0_HSSL3SET2 0x0310 | ||
63 | #define PESDR0_HSSL3STS 0x0311 | ||
64 | #define PESDR0_HSSL4SET1 0x0312 | ||
65 | #define PESDR0_HSSL4SET2 0x0313 | ||
66 | #define PESDR0_HSSL4STS 0x0314 | ||
67 | #define PESDR0_HSSL5SET1 0x0315 | ||
68 | #define PESDR0_HSSL5SET2 0x0316 | ||
69 | #define PESDR0_HSSL5STS 0x0317 | ||
70 | #define PESDR0_HSSL6SET1 0x0318 | ||
71 | #define PESDR0_HSSL6SET2 0x0319 | ||
72 | #define PESDR0_HSSL6STS 0x031a | ||
73 | #define PESDR0_HSSL7SET1 0x031b | ||
74 | #define PESDR0_HSSL7SET2 0x031c | ||
75 | #define PESDR0_HSSL7STS 0x031d | ||
76 | #define PESDR0_HSSCTLSET 0x031e | ||
77 | #define PESDR0_LANE_ABCD 0x031f | ||
78 | #define PESDR0_LANE_EFGH 0x0320 | ||
79 | |||
80 | #define PESDR1_UTLSET1 0x0340 | ||
81 | #define PESDR1_UTLSET2 0x0341 | ||
82 | #define PESDR1_DLPSET 0x0342 | ||
83 | #define PESDR1_LOOP 0x0343 | ||
84 | #define PESDR1_RCSSET 0x0344 | ||
85 | #define PESDR1_RCSSTS 0x0345 | ||
86 | #define PESDR1_HSSL0SET1 0x0346 | ||
87 | #define PESDR1_HSSL0SET2 0x0347 | ||
88 | #define PESDR1_HSSL0STS 0x0348 | ||
89 | #define PESDR1_HSSL1SET1 0x0349 | ||
90 | #define PESDR1_HSSL1SET2 0x034a | ||
91 | #define PESDR1_HSSL1STS 0x034b | ||
92 | #define PESDR1_HSSL2SET1 0x034c | ||
93 | #define PESDR1_HSSL2SET2 0x034d | ||
94 | #define PESDR1_HSSL2STS 0x034e | ||
95 | #define PESDR1_HSSL3SET1 0x034f | ||
96 | #define PESDR1_HSSL3SET2 0x0350 | ||
97 | #define PESDR1_HSSL3STS 0x0351 | ||
98 | #define PESDR1_HSSCTLSET 0x0352 | ||
99 | #define PESDR1_LANE_ABCD 0x0353 | ||
100 | |||
101 | #define PESDR2_UTLSET1 0x0370 | ||
102 | #define PESDR2_UTLSET2 0x0371 | ||
103 | #define PESDR2_DLPSET 0x0372 | ||
104 | #define PESDR2_LOOP 0x0373 | ||
105 | #define PESDR2_RCSSET 0x0374 | ||
106 | #define PESDR2_RCSSTS 0x0375 | ||
107 | #define PESDR2_HSSL0SET1 0x0376 | ||
108 | #define PESDR2_HSSL0SET2 0x0377 | ||
109 | #define PESDR2_HSSL0STS 0x0378 | ||
110 | #define PESDR2_HSSL1SET1 0x0379 | ||
111 | #define PESDR2_HSSL1SET2 0x037a | ||
112 | #define PESDR2_HSSL1STS 0x037b | ||
113 | #define PESDR2_HSSL2SET1 0x037c | ||
114 | #define PESDR2_HSSL2SET2 0x037d | ||
115 | #define PESDR2_HSSL2STS 0x037e | ||
116 | #define PESDR2_HSSL3SET1 0x037f | ||
117 | #define PESDR2_HSSL3SET2 0x0380 | ||
118 | #define PESDR2_HSSL3STS 0x0381 | ||
119 | #define PESDR2_HSSCTLSET 0x0382 | ||
120 | #define PESDR2_LANE_ABCD 0x0383 | ||
121 | |||
122 | /* | ||
123 | * UTL register offsets | ||
124 | */ | ||
125 | #define PEUTL_PBBSZ 0x20 | ||
126 | #define PEUTL_OPDBSZ 0x68 | ||
127 | #define PEUTL_IPHBSZ 0x70 | ||
128 | #define PEUTL_IPDBSZ 0x78 | ||
129 | #define PEUTL_OUTTR 0x90 | ||
130 | #define PEUTL_INTR 0x98 | ||
131 | #define PEUTL_PCTL 0xa0 | ||
132 | #define PEUTL_RCIRQEN 0xb8 | ||
133 | |||
134 | /* | ||
135 | * Config space register offsets | ||
136 | */ | ||
137 | #define PECFG_BAR0LMPA 0x210 | ||
138 | #define PECFG_BAR0HMPA 0x214 | ||
139 | #define PECFG_PIMEN 0x33c | ||
140 | #define PECFG_PIM0LAL 0x340 | ||
141 | #define PECFG_PIM0LAH 0x344 | ||
142 | #define PECFG_POM0LAL 0x380 | ||
143 | #define PECFG_POM0LAH 0x384 | ||
144 | |||
145 | int ppc440spe_init_pcie(void); | ||
146 | int ppc440spe_init_pcie_rootport(int port); | ||
147 | void ppc440spe_setup_pcie(struct pci_controller *hose, int port); | ||
148 | |||
149 | #endif /* __PPC_SYSLIB_PPC440SPE_PCIE_H */ | ||
diff --git a/arch/ppc/syslib/ppc4xx_pic.c b/arch/ppc/syslib/ppc4xx_pic.c index 0b435633a0d1..aa4165144ec2 100644 --- a/arch/ppc/syslib/ppc4xx_pic.c +++ b/arch/ppc/syslib/ppc4xx_pic.c | |||
@@ -38,6 +38,7 @@ extern unsigned char ppc4xx_uic_ext_irq_cfg[] __attribute__ ((weak)); | |||
38 | #define IRQ_MASK_UICx(irq) (1 << (31 - ((irq) & 0x1f))) | 38 | #define IRQ_MASK_UICx(irq) (1 << (31 - ((irq) & 0x1f))) |
39 | #define IRQ_MASK_UIC1(irq) IRQ_MASK_UICx(irq) | 39 | #define IRQ_MASK_UIC1(irq) IRQ_MASK_UICx(irq) |
40 | #define IRQ_MASK_UIC2(irq) IRQ_MASK_UICx(irq) | 40 | #define IRQ_MASK_UIC2(irq) IRQ_MASK_UICx(irq) |
41 | #define IRQ_MASK_UIC3(irq) IRQ_MASK_UICx(irq) | ||
41 | 42 | ||
42 | #define UIC_HANDLERS(n) \ | 43 | #define UIC_HANDLERS(n) \ |
43 | static void ppc4xx_uic##n##_enable(unsigned int irq) \ | 44 | static void ppc4xx_uic##n##_enable(unsigned int irq) \ |
@@ -88,7 +89,38 @@ static void ppc4xx_uic##n##_end(unsigned int irq) \ | |||
88 | .end = ppc4xx_uic##n##_end, \ | 89 | .end = ppc4xx_uic##n##_end, \ |
89 | } \ | 90 | } \ |
90 | 91 | ||
91 | #if NR_UICS == 3 | 92 | #if NR_UICS == 4 |
93 | #define ACK_UIC0_PARENT | ||
94 | #define ACK_UIC1_PARENT mtdcr(DCRN_UIC_SR(UIC0), UIC0_UIC1NC); | ||
95 | #define ACK_UIC2_PARENT mtdcr(DCRN_UIC_SR(UIC0), UIC0_UIC2NC); | ||
96 | #define ACK_UIC3_PARENT mtdcr(DCRN_UIC_SR(UIC0), UIC0_UIC3NC); | ||
97 | UIC_HANDLERS(0); | ||
98 | UIC_HANDLERS(1); | ||
99 | UIC_HANDLERS(2); | ||
100 | UIC_HANDLERS(3); | ||
101 | |||
102 | static int ppc4xx_pic_get_irq(struct pt_regs *regs) | ||
103 | { | ||
104 | u32 uic0 = mfdcr(DCRN_UIC_MSR(UIC0)); | ||
105 | if (uic0 & UIC0_UIC1NC) | ||
106 | return 64 - ffs(mfdcr(DCRN_UIC_MSR(UIC1))); | ||
107 | else if (uic0 & UIC0_UIC2NC) | ||
108 | return 96 - ffs(mfdcr(DCRN_UIC_MSR(UIC2))); | ||
109 | else if (uic0 & UIC0_UIC3NC) | ||
110 | return 128 - ffs(mfdcr(DCRN_UIC_MSR(UIC3))); | ||
111 | else | ||
112 | return uic0 ? 32 - ffs(uic0) : -1; | ||
113 | } | ||
114 | |||
115 | static void __init ppc4xx_pic_impl_init(void) | ||
116 | { | ||
117 | /* Enable cascade interrupts in UIC0 */ | ||
118 | ppc_cached_irq_mask[0] |= UIC0_UIC1NC | UIC0_UIC2NC | UIC0_UIC3NC; | ||
119 | mtdcr(DCRN_UIC_SR(UIC0), UIC0_UIC1NC | UIC0_UIC2NC | UIC0_UIC3NC); | ||
120 | mtdcr(DCRN_UIC_ER(UIC0), ppc_cached_irq_mask[0]); | ||
121 | } | ||
122 | |||
123 | #elif NR_UICS == 3 | ||
92 | #define ACK_UIC0_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC0NC); | 124 | #define ACK_UIC0_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC0NC); |
93 | #define ACK_UIC1_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC1NC); | 125 | #define ACK_UIC1_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC1NC); |
94 | #define ACK_UIC2_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC2NC); | 126 | #define ACK_UIC2_PARENT mtdcr(DCRN_UIC_SR(UICB), UICB_UIC2NC); |
@@ -170,6 +202,9 @@ static struct ppc4xx_uic_impl { | |||
170 | { .decl = DECLARE_UIC(1), .base = UIC1 }, | 202 | { .decl = DECLARE_UIC(1), .base = UIC1 }, |
171 | #if NR_UICS > 2 | 203 | #if NR_UICS > 2 |
172 | { .decl = DECLARE_UIC(2), .base = UIC2 }, | 204 | { .decl = DECLARE_UIC(2), .base = UIC2 }, |
205 | #if NR_UICS > 3 | ||
206 | { .decl = DECLARE_UIC(3), .base = UIC3 }, | ||
207 | #endif | ||
173 | #endif | 208 | #endif |
174 | #endif | 209 | #endif |
175 | }; | 210 | }; |