]> git.ipfire.org Git - people/ms/u-boot.git/blame - arch/powerpc/cpu/mpc85xx/cpu_init.c
powerpc/mpc85xx: Introduce new macros to add and delete TLB entries
[people/ms/u-boot.git] / arch / powerpc / cpu / mpc85xx / cpu_init.c
CommitLineData
42d1f039 1/*
a09b9b68 2 * Copyright 2007-2011 Freescale Semiconductor, Inc.
29372ff3 3 *
42d1f039
WD
4 * (C) Copyright 2003 Motorola Inc.
5 * Modified by Xianghua Xiao, X.Xiao@motorola.com
6 *
7 * (C) Copyright 2000
8 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
9 *
10 * See file CREDITS for list of people who contributed to this
11 * project.
12 *
13 * This program is free software; you can redistribute it and/or
14 * modify it under the terms of the GNU General Public License as
15 * published by the Free Software Foundation; either version 2 of
16 * the License, or (at your option) any later version.
17 *
18 * This program is distributed in the hope that it will be useful,
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 * GNU General Public License for more details.
22 *
23 * You should have received a copy of the GNU General Public License
24 * along with this program; if not, write to the Free Software
25 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
26 * MA 02111-1307 USA
27 */
28
29#include <common.h>
30#include <watchdog.h>
31#include <asm/processor.h>
32#include <ioports.h>
f54fe87a 33#include <sata.h>
c916d7c9 34#include <fm_eth.h>
42d1f039 35#include <asm/io.h>
fd3c9bef 36#include <asm/cache.h>
87163180 37#include <asm/mmu.h>
83d40dfd 38#include <asm/fsl_law.h>
f54fe87a 39#include <asm/fsl_serdes.h>
5ffa88ec 40#include <asm/fsl_srio.h>
57125f22 41#include <hwconfig.h>
fbc20aab 42#include <linux/compiler.h>
ec2b74ff 43#include "mp.h"
f2717b47 44#ifdef CONFIG_SYS_QE_FMAN_FW_IN_NAND
a7b1e1b7
HW
45#include <nand.h>
46#include <errno.h>
47#endif
42d1f039 48
fbc20aab
TT
49#include "../../../../drivers/block/fsl_sata.h"
50
d87080b7
WD
51DECLARE_GLOBAL_DATA_PTR;
52
da9d4610
AF
53#ifdef CONFIG_QE
54extern qe_iop_conf_t qe_iop_conf_tab[];
55extern void qe_config_iopin(u8 port, u8 pin, int dir,
56 int open_drain, int assign);
57extern void qe_init(uint qe_base);
58extern void qe_reset(void);
59
60static void config_qe_ioports(void)
61{
62 u8 port, pin;
63 int dir, open_drain, assign;
64 int i;
65
66 for (i = 0; qe_iop_conf_tab[i].assign != QE_IOP_TAB_END; i++) {
67 port = qe_iop_conf_tab[i].port;
68 pin = qe_iop_conf_tab[i].pin;
69 dir = qe_iop_conf_tab[i].dir;
70 open_drain = qe_iop_conf_tab[i].open_drain;
71 assign = qe_iop_conf_tab[i].assign;
72 qe_config_iopin(port, pin, dir, open_drain, assign);
73 }
74}
75#endif
40d5fa35 76
9c4c5ae3 77#ifdef CONFIG_CPM2
aafeefbd 78void config_8560_ioports (volatile ccsr_cpm_t * cpm)
42d1f039
WD
79{
80 int portnum;
81
82 for (portnum = 0; portnum < 4; portnum++) {
83 uint pmsk = 0,
84 ppar = 0,
85 psor = 0,
86 pdir = 0,
87 podr = 0,
88 pdat = 0;
89 iop_conf_t *iopc = (iop_conf_t *) & iop_conf_tab[portnum][0];
90 iop_conf_t *eiopc = iopc + 32;
91 uint msk = 1;
92
93 /*
94 * NOTE:
95 * index 0 refers to pin 31,
96 * index 31 refers to pin 0
97 */
98 while (iopc < eiopc) {
99 if (iopc->conf) {
100 pmsk |= msk;
101 if (iopc->ppar)
102 ppar |= msk;
103 if (iopc->psor)
104 psor |= msk;
105 if (iopc->pdir)
106 pdir |= msk;
107 if (iopc->podr)
108 podr |= msk;
109 if (iopc->pdat)
110 pdat |= msk;
111 }
112
113 msk <<= 1;
114 iopc++;
115 }
116
117 if (pmsk != 0) {
aafeefbd 118 volatile ioport_t *iop = ioport_addr (cpm, portnum);
42d1f039
WD
119 uint tpmsk = ~pmsk;
120
121 /*
122 * the (somewhat confused) paragraph at the
123 * bottom of page 35-5 warns that there might
124 * be "unknown behaviour" when programming
125 * PSORx and PDIRx, if PPARx = 1, so I
126 * decided this meant I had to disable the
127 * dedicated function first, and enable it
128 * last.
129 */
130 iop->ppar &= tpmsk;
131 iop->psor = (iop->psor & tpmsk) | psor;
132 iop->podr = (iop->podr & tpmsk) | podr;
133 iop->pdat = (iop->pdat & tpmsk) | pdat;
134 iop->pdir = (iop->pdir & tpmsk) | pdir;
135 iop->ppar |= ppar;
136 }
137 }
138}
139#endif
140
6aba33e9
KG
141#ifdef CONFIG_SYS_FSL_CPC
142static void enable_cpc(void)
143{
144 int i;
145 u32 size = 0;
146
147 cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR;
148
149 for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
150 u32 cpccfg0 = in_be32(&cpc->cpccfg0);
151 size += CPC_CFG0_SZ_K(cpccfg0);
2a9fab82
SX
152#ifdef CONFIG_RAMBOOT_PBL
153 if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN) {
154 /* find and disable LAW of SRAM */
155 struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR);
156
157 if (law.index == -1) {
158 printf("\nFatal error happened\n");
159 return;
160 }
161 disable_law(law.index);
162
163 clrbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_CDQ_SPEC_DIS);
164 out_be32(&cpc->cpccsr0, 0);
165 out_be32(&cpc->cpcsrcr0, 0);
166 }
167#endif
6aba33e9 168
1d2c2a62
KG
169#ifdef CONFIG_SYS_FSL_ERRATUM_CPC_A002
170 setbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_TAG_ECC_SCRUB_DIS);
171#endif
868da593
KG
172#ifdef CONFIG_SYS_FSL_ERRATUM_CPC_A003
173 setbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_DATA_ECC_SCRUB_DIS);
174#endif
1d2c2a62 175
6aba33e9
KG
176 out_be32(&cpc->cpccsr0, CPC_CSR0_CE | CPC_CSR0_PE);
177 /* Read back to sync write */
178 in_be32(&cpc->cpccsr0);
179
180 }
181
182 printf("Corenet Platform Cache: %d KB enabled\n", size);
183}
184
185void invalidate_cpc(void)
186{
187 int i;
188 cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR;
189
190 for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
2a9fab82
SX
191 /* skip CPC when it used as all SRAM */
192 if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN)
193 continue;
6aba33e9
KG
194 /* Flash invalidate the CPC and clear all the locks */
195 out_be32(&cpc->cpccsr0, CPC_CSR0_FI | CPC_CSR0_LFC);
196 while (in_be32(&cpc->cpccsr0) & (CPC_CSR0_FI | CPC_CSR0_LFC))
197 ;
198 }
199}
200#else
201#define enable_cpc()
202#define invalidate_cpc()
203#endif /* CONFIG_SYS_FSL_CPC */
204
42d1f039
WD
205/*
206 * Breathe some life into the CPU...
207 *
208 * Set up the memory map
209 * initialize a bunch of registers
210 */
211
3c2a67ee
KG
212#ifdef CONFIG_FSL_CORENET
213static void corenet_tb_init(void)
214{
215 volatile ccsr_rcpm_t *rcpm =
216 (void *)(CONFIG_SYS_FSL_CORENET_RCPM_ADDR);
217 volatile ccsr_pic_t *pic =
680c613a 218 (void *)(CONFIG_SYS_MPC8xxx_PIC_ADDR);
3c2a67ee
KG
219 u32 whoami = in_be32(&pic->whoami);
220
221 /* Enable the timebase register for this core */
222 out_be32(&rcpm->ctbenrl, (1 << whoami));
223}
224#endif
225
42d1f039
WD
226void cpu_init_f (void)
227{
42d1f039 228 extern void m8560_cpm_reset (void);
f110fe94
SG
229#ifdef CONFIG_SYS_DCSRBAR_PHYS
230 ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
231#endif
7065b7d4
RG
232#if defined(CONFIG_SECURE_BOOT)
233 struct law_entry law;
234#endif
a2cd50ed
PT
235#ifdef CONFIG_MPC8548
236 ccsr_local_ecm_t *ecm = (void *)(CONFIG_SYS_MPC85xx_ECM_ADDR);
237 uint svr = get_svr();
238
239 /*
240 * CPU2 errata workaround: A core hang possible while executing
241 * a msync instruction and a snoopable transaction from an I/O
242 * master tagged to make quick forward progress is present.
243 * Fixed in silicon rev 2.1.
244 */
245 if ((SVR_MAJ(svr) == 1) || ((SVR_MAJ(svr) == 2 && SVR_MIN(svr) == 0x0)))
246 out_be32(&ecm->eebpcr, in_be32(&ecm->eebpcr) | (1 << 16));
247#endif
42d1f039 248
87163180
KG
249 disable_tlb(14);
250 disable_tlb(15);
251
7065b7d4
RG
252#if defined(CONFIG_SECURE_BOOT)
253 /* Disable the LAW created for NOR flash by the PBI commands */
254 law = find_law(CONFIG_SYS_PBI_FLASH_BASE);
255 if (law.index != -1)
256 disable_law(law.index);
257#endif
258
9c4c5ae3 259#ifdef CONFIG_CPM2
6d0f6bcf 260 config_8560_ioports((ccsr_cpm_t *)CONFIG_SYS_MPC85xx_CPM_ADDR);
42d1f039
WD
261#endif
262
f51cdaf1 263 init_early_memctl_regs();
42d1f039 264
9c4c5ae3 265#if defined(CONFIG_CPM2)
42d1f039
WD
266 m8560_cpm_reset();
267#endif
da9d4610
AF
268#ifdef CONFIG_QE
269 /* Config QE ioports */
270 config_qe_ioports();
271#endif
79f4333c
PT
272#if defined(CONFIG_FSL_DMA)
273 dma_init();
274#endif
3c2a67ee
KG
275#ifdef CONFIG_FSL_CORENET
276 corenet_tb_init();
277#endif
94e9411b 278 init_used_tlb_cams();
6aba33e9
KG
279
280 /* Invalidate the CPC before DDR gets enabled */
281 invalidate_cpc();
f110fe94
SG
282
283 #ifdef CONFIG_SYS_DCSRBAR_PHYS
284 /* set DCSRCR so that DCSR space is 1G */
285 setbits_be32(&gur->dcsrcr, FSL_CORENET_DCSR_SZ_1G);
286 in_be32(&gur->dcsrcr);
287#endif
288
42d1f039
WD
289}
290
35079aa9
KG
291/* Implement a dummy function for those platforms w/o SERDES */
292static void __fsl_serdes__init(void)
293{
294 return ;
295}
296__attribute__((weak, alias("__fsl_serdes__init"))) void fsl_serdes_init(void);
d9b94f28 297
42d1f039 298/*
d9b94f28
JL
299 * Initialize L2 as cache.
300 *
301 * The newer 8548, etc, parts have twice as much cache, but
302 * use the same bit-encoding as the older 8555, etc, parts.
303 *
42d1f039 304 */
d9b94f28 305int cpu_init_r(void)
42d1f039 306{
fbc20aab 307 __maybe_unused u32 svr = get_svr();
3f0202ed 308#ifdef CONFIG_SYS_LBC_LCRR
f51cdaf1 309 volatile fsl_lbc_t *lbc = LBC_BASE_ADDR;
3f0202ed
LC
310#endif
311
5e23ab0a
YS
312#if defined(CONFIG_SYS_P4080_ERRATUM_CPU22) || \
313 defined(CONFIG_SYS_FSL_ERRATUM_NMG_CPU_A011)
314 /*
57125f22 315 * CPU22 and NMG_CPU_A011 share the same workaround.
5e23ab0a
YS
316 * CPU22 applies to P4080 rev 1.0, 2.0, fixed in 3.0
317 * NMG_CPU_A011 applies to P4080 rev 1.0, 2.0, fixed in 3.0
57125f22
YS
318 * also applies to P3041 rev 1.0, 1.1, P2041 rev 1.0, 1.1, both
319 * fixed in 2.0. NMG_CPU_A011 is activated by default and can
320 * be disabled by hwconfig with syntax:
321 *
322 * fsl_cpu_a011:disable
5e23ab0a 323 */
57125f22
YS
324 extern int enable_cpu_a011_workaround;
325#ifdef CONFIG_SYS_P4080_ERRATUM_CPU22
326 enable_cpu_a011_workaround = (SVR_MAJ(svr) < 3);
327#else
328 char buffer[HWCONFIG_BUFFER_SIZE];
329 char *buf = NULL;
330 int n, res;
331
332 n = getenv_f("hwconfig", buffer, sizeof(buffer));
333 if (n > 0)
334 buf = buffer;
335
336 res = hwconfig_arg_cmp_f("fsl_cpu_a011", "disable", buf);
337 if (res > 0)
338 enable_cpu_a011_workaround = 0;
339 else {
340 if (n >= HWCONFIG_BUFFER_SIZE) {
341 printf("fsl_cpu_a011 was not found. hwconfig variable "
342 "may be too long\n");
343 }
344 enable_cpu_a011_workaround =
345 (SVR_SOC_VER(svr) == SVR_P4080 && SVR_MAJ(svr) < 3) ||
346 (SVR_SOC_VER(svr) != SVR_P4080 && SVR_MAJ(svr) < 2);
347 }
348#endif
349 if (enable_cpu_a011_workaround) {
1e9ea85f
YS
350 flush_dcache();
351 mtspr(L1CSR2, (mfspr(L1CSR2) | L1CSR2_DCWS));
352 sync();
353 }
fd3c9bef
KG
354#endif
355
6beecfbb
WG
356 puts ("L2: ");
357
42d1f039 358#if defined(CONFIG_L2_CACHE)
6d0f6bcf 359 volatile ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;
d9b94f28 360 volatile uint cache_ctl;
fbc20aab 361 uint ver;
73f15a06 362 u32 l2siz_field;
d9b94f28 363
f3e04bdc 364 ver = SVR_SOC_VER(svr);
42d1f039 365
d65cfe89 366 asm("msync;isync");
d9b94f28 367 cache_ctl = l2cache->l2ctl;
7da53351
MH
368
369#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L2_ADDR)
370 if (cache_ctl & MPC85xx_L2CTL_L2E) {
371 /* Clear L2 SRAM memory-mapped base address */
372 out_be32(&l2cache->l2srbar0, 0x0);
373 out_be32(&l2cache->l2srbar1, 0x0);
374
375 /* set MBECCDIS=0, SBECCDIS=0 */
376 clrbits_be32(&l2cache->l2errdis,
377 (MPC85xx_L2ERRDIS_MBECC |
378 MPC85xx_L2ERRDIS_SBECC));
379
380 /* set L2E=0, L2SRAM=0 */
381 clrbits_be32(&l2cache->l2ctl,
382 (MPC85xx_L2CTL_L2E |
383 MPC85xx_L2CTL_L2SRAM_ENTIRE));
384 }
385#endif
386
73f15a06 387 l2siz_field = (cache_ctl >> 28) & 0x3;
d9b94f28 388
73f15a06
KG
389 switch (l2siz_field) {
390 case 0x0:
391 printf(" unknown size (0x%08x)\n", cache_ctl);
392 return -1;
393 break;
394 case 0x1:
395 if (ver == SVR_8540 || ver == SVR_8560 ||
48f6a5c3 396 ver == SVR_8541 || ver == SVR_8555) {
73f15a06
KG
397 puts("128 KB ");
398 /* set L2E=1, L2I=1, & L2BLKSZ=1 (128 Kbyte) */
399 cache_ctl = 0xc4000000;
d9b94f28 400 } else {
73f15a06
KG
401 puts("256 KB ");
402 cache_ctl = 0xc0000000; /* set L2E=1, L2I=1, & L2SRAM=0 */
403 }
404 break;
405 case 0x2:
406 if (ver == SVR_8540 || ver == SVR_8560 ||
48f6a5c3 407 ver == SVR_8541 || ver == SVR_8555) {
6beecfbb 408 puts("256 KB ");
29372ff3
ES
409 /* set L2E=1, L2I=1, & L2BLKSZ=2 (256 Kbyte) */
410 cache_ctl = 0xc8000000;
73f15a06
KG
411 } else {
412 puts ("512 KB ");
413 /* set L2E=1, L2I=1, & L2SRAM=0 */
414 cache_ctl = 0xc0000000;
d9b94f28 415 }
d65cfe89 416 break;
73f15a06
KG
417 case 0x3:
418 puts("1024 KB ");
419 /* set L2E=1, L2I=1, & L2SRAM=0 */
420 cache_ctl = 0xc0000000;
29372ff3 421 break;
d65cfe89
JL
422 }
423
76b474e2 424 if (l2cache->l2ctl & MPC85xx_L2CTL_L2E) {
6beecfbb 425 puts("already enabled");
888279b5 426#if defined(CONFIG_SYS_INIT_L2_ADDR) && defined(CONFIG_SYS_FLASH_BASE)
e4c9a35d 427 u32 l2srbar = l2cache->l2srbar0;
76b474e2
MH
428 if (l2cache->l2ctl & MPC85xx_L2CTL_L2SRAM_ENTIRE
429 && l2srbar >= CONFIG_SYS_FLASH_BASE) {
6d0f6bcf 430 l2srbar = CONFIG_SYS_INIT_L2_ADDR;
29372ff3 431 l2cache->l2srbar0 = l2srbar;
6d0f6bcf 432 printf("moving to 0x%08x", CONFIG_SYS_INIT_L2_ADDR);
29372ff3 433 }
6d0f6bcf 434#endif /* CONFIG_SYS_INIT_L2_ADDR */
29372ff3
ES
435 puts("\n");
436 } else {
437 asm("msync;isync");
438 l2cache->l2ctl = cache_ctl; /* invalidate & enable */
439 asm("msync;isync");
6beecfbb 440 puts("enabled\n");
29372ff3 441 }
1b3e4044 442#elif defined(CONFIG_BACKSIDE_L2_CACHE)
48f6a5c3 443 if (SVR_SOC_VER(svr) == SVR_P2040) {
acf3f8da
KG
444 puts("N/A\n");
445 goto skip_l2;
446 }
447
1b3e4044
KG
448 u32 l2cfg0 = mfspr(SPRN_L2CFG0);
449
450 /* invalidate the L2 cache */
25bacf7a
KG
451 mtspr(SPRN_L2CSR0, (L2CSR0_L2FI|L2CSR0_L2LFC));
452 while (mfspr(SPRN_L2CSR0) & (L2CSR0_L2FI|L2CSR0_L2LFC))
1b3e4044
KG
453 ;
454
82fd1f8d
KG
455#ifdef CONFIG_SYS_CACHE_STASHING
456 /* set stash id to (coreID) * 2 + 32 + L2 (1) */
457 mtspr(SPRN_L2CSR1, (32 + 1));
458#endif
459
1b3e4044
KG
460 /* enable the cache */
461 mtspr(SPRN_L2CSR0, CONFIG_SYS_INIT_L2CSR0);
462
654ea1f3
DL
463 if (CONFIG_SYS_INIT_L2CSR0 & L2CSR0_L2E) {
464 while (!(mfspr(SPRN_L2CSR0) & L2CSR0_L2E))
465 ;
1b3e4044 466 printf("%d KB enabled\n", (l2cfg0 & 0x3fff) * 64);
654ea1f3 467 }
acf3f8da
KG
468
469skip_l2:
42d1f039 470#else
6beecfbb 471 puts("disabled\n");
42d1f039 472#endif
6aba33e9
KG
473
474 enable_cpc();
475
af025065
KG
476 /* needs to be in ram since code uses global static vars */
477 fsl_serdes_init();
af025065 478
a09b9b68
KG
479#ifdef CONFIG_SYS_SRIO
480 srio_init();
ff65f126
LG
481#ifdef CONFIG_FSL_CORENET
482 char *s = getenv("bootmaster");
483 if (s) {
484 if (!strcmp(s, "SRIO1")) {
485 srio_boot_master(1);
486 srio_boot_master_release_slave(1);
487 }
488 if (!strcmp(s, "SRIO2")) {
489 srio_boot_master(2);
490 srio_boot_master_release_slave(2);
491 }
492 }
5ffa88ec 493#endif
a09b9b68
KG
494#endif
495
ec2b74ff
KG
496#if defined(CONFIG_MP)
497 setup_mp();
498#endif
3f0202ed 499
4e0be34a 500#ifdef CONFIG_SYS_FSL_ERRATUM_ESDHC13
ae026ffd 501 {
4e0be34a
ZRR
502 if (SVR_MAJ(svr) < 3) {
503 void *p;
504 p = (void *)CONFIG_SYS_DCSRBAR + 0x20520;
505 setbits_be32(p, 1 << (31 - 14));
506 }
ae026ffd
RZ
507 }
508#endif
509
3f0202ed
LC
510#ifdef CONFIG_SYS_LBC_LCRR
511 /*
512 * Modify the CLKDIV field of LCRR register to improve the writing
513 * speed for NOR flash.
514 */
515 clrsetbits_be32(&lbc->lcrr, LCRR_CLKDIV, CONFIG_SYS_LBC_LCRR);
516 __raw_readl(&lbc->lcrr);
517 isync();
2b3a1cdd
KG
518#ifdef CONFIG_SYS_FSL_ERRATUM_NMG_LBC103
519 udelay(100);
520#endif
3f0202ed
LC
521#endif
522
86221f09
RZ
523#ifdef CONFIG_SYS_FSL_USB1_PHY_ENABLE
524 {
525 ccsr_usb_phy_t *usb_phy1 =
526 (void *)CONFIG_SYS_MPC85xx_USB1_PHY_ADDR;
527 out_be32(&usb_phy1->usb_enable_override,
528 CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
529 }
530#endif
531#ifdef CONFIG_SYS_FSL_USB2_PHY_ENABLE
532 {
533 ccsr_usb_phy_t *usb_phy2 =
534 (void *)CONFIG_SYS_MPC85xx_USB2_PHY_ADDR;
535 out_be32(&usb_phy2->usb_enable_override,
536 CONFIG_SYS_FSL_USB_ENABLE_OVERRIDE);
537 }
538#endif
539
c916d7c9
KG
540#ifdef CONFIG_FMAN_ENET
541 fman_enet_init();
542#endif
543
fbc20aab
TT
544#if defined(CONFIG_FSL_SATA_V2) && defined(CONFIG_FSL_SATA_ERRATUM_A001)
545 /*
546 * For P1022/1013 Rev1.0 silicon, after power on SATA host
547 * controller is configured in legacy mode instead of the
548 * expected enterprise mode. Software needs to clear bit[28]
549 * of HControl register to change to enterprise mode from
550 * legacy mode. We assume that the controller is offline.
551 */
552 if (IS_SVR_REV(svr, 1, 0) &&
553 ((SVR_SOC_VER(svr) == SVR_P1022) ||
48f6a5c3 554 (SVR_SOC_VER(svr) == SVR_P1013))) {
fbc20aab
TT
555 fsl_sata_reg_t *reg;
556
557 /* first SATA controller */
558 reg = (void *)CONFIG_SYS_MPC85xx_SATA1_ADDR;
559 clrbits_le32(&reg->hcontrol, HCONTROL_ENTERPRISE_EN);
560
561 /* second SATA controller */
562 reg = (void *)CONFIG_SYS_MPC85xx_SATA2_ADDR;
563 clrbits_le32(&reg->hcontrol, HCONTROL_ENTERPRISE_EN);
564 }
565#endif
566
567
42d1f039
WD
568 return 0;
569}
26f4cdba
KG
570
571extern void setup_ivors(void);
572
573void arch_preboot_os(void)
574{
15fba327
KG
575 u32 msr;
576
577 /*
578 * We are changing interrupt offsets and are about to boot the OS so
579 * we need to make sure we disable all async interrupts. EE is already
580 * disabled by the time we get called.
581 */
582 msr = mfmsr();
5344f7a2 583 msr &= ~(MSR_ME|MSR_CE);
15fba327
KG
584 mtmsr(msr);
585
26f4cdba
KG
586 setup_ivors();
587}
f54fe87a
KG
588
589#if defined(CONFIG_CMD_SATA) && defined(CONFIG_FSL_SATA)
590int sata_initialize(void)
591{
592 if (is_serdes_configured(SATA1) || is_serdes_configured(SATA2))
593 return __sata_initialize();
594
595 return 1;
596}
597#endif
f9a33f1c
KG
598
599void cpu_secondary_init_r(void)
600{
601#ifdef CONFIG_QE
602 uint qe_base = CONFIG_SYS_IMMR + 0x00080000; /* QE immr base */
f2717b47 603#ifdef CONFIG_SYS_QE_FMAN_FW_IN_NAND
a7b1e1b7 604 int ret;
f2717b47 605 size_t fw_length = CONFIG_SYS_QE_FMAN_FW_LENGTH;
a7b1e1b7
HW
606
607 /* load QE firmware from NAND flash to DDR first */
f2717b47
TT
608 ret = nand_read(&nand_info[0], (loff_t)CONFIG_SYS_QE_FMAN_FW_IN_NAND,
609 &fw_length, (u_char *)CONFIG_SYS_QE_FMAN_FW_ADDR);
a7b1e1b7
HW
610
611 if (ret && ret == -EUCLEAN) {
612 printf ("NAND read for QE firmware at offset %x failed %d\n",
f2717b47 613 CONFIG_SYS_QE_FMAN_FW_IN_NAND, ret);
a7b1e1b7
HW
614 }
615#endif
f9a33f1c
KG
616 qe_init(qe_base);
617 qe_reset();
618#endif
619}