diff options
author | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
---|---|---|
committer | Tom Rix <Tom.Rix@windriver.com> | 2010-01-23 07:22:23 -0600 |
commit | 790af6ed08cc3675267191eb60403bd4f0d9a03c (patch) | |
tree | ded9dced10adeea568982bf634b9dc7d3c00f537 /cpu | |
parent | 69df282a781dfe7a1bfc62acf0605992d3ea6c52 (diff) | |
parent | 57ae8a5cced612088104303777e71a3dc89c00ef (diff) | |
download | u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.zip u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.gz u-boot-imx-790af6ed08cc3675267191eb60403bd4f0d9a03c.tar.bz2 |
Merge branch 'r-ml-master' into t-master
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/blackfin/interrupt.S | 105 | ||||
-rw-r--r-- | cpu/blackfin/traps.c | 57 | ||||
-rw-r--r-- | cpu/mpc512x/cpu.c | 15 | ||||
-rw-r--r-- | cpu/mpc512x/diu.c | 8 | ||||
-rw-r--r-- | cpu/mpc512x/pci.c | 6 | ||||
-rw-r--r-- | cpu/mpc512x/serial.c | 8 | ||||
-rw-r--r-- | cpu/ppc4xx/44x_spd_ddr2.c | 2 | ||||
-rw-r--r-- | cpu/ppc4xx/cpu.c | 2 |
8 files changed, 178 insertions, 25 deletions
diff --git a/cpu/blackfin/interrupt.S b/cpu/blackfin/interrupt.S index 8c7a262..69bba3f 100644 --- a/cpu/blackfin/interrupt.S +++ b/cpu/blackfin/interrupt.S @@ -8,6 +8,9 @@ #include <config.h> #include <asm/blackfin.h> #include <asm/entry.h> +#include <asm/ptrace.h> +#include <asm/deferred.h> +#include <asm/mach-common/bits/core.h> .text @@ -19,10 +22,75 @@ ENTRY(_trap) SAVE_ALL_SYS r0 = sp; /* stack frame pt_regs pointer argument ==> r0 */ + r1 = 3; /* EVT3 space */ sp += -12; call _trap_c; sp += 12; +#ifdef CONFIG_EXCEPTION_DEFER + CC = R0 == 0; + IF CC JUMP .Lexit_trap; + + /* To avoid double faults, lower our priority to IRQ5 */ + p4.l = lo(COREMMR_BASE); + p4.h = hi(COREMMR_BASE); + + r7.h = _exception_to_level5; + r7.l = _exception_to_level5; + [p4 + (EVT5 - COREMMR_BASE)] = r7; + + /* + * Save these registers, as they are only valid in exception context + * (where we are now - as soon as we defer to IRQ5, they can change) + */ + p5.l = _deferred_regs; + p5.h = _deferred_regs; + r6 = [p4 + (DCPLB_FAULT_ADDR - COREMMR_BASE)]; + [p5 + (deferred_regs_DCPLB_FAULT_ADDR * 4)] = r6; + + r6 = [p4 + (ICPLB_FAULT_ADDR - COREMMR_BASE)]; + [p5 + (deferred_regs_ICPLB_FAULT_ADDR * 4)] = r6; + + /* Save the state of single stepping */ + r6 = SYSCFG; + [p5 + (deferred_regs_SYSCFG * 4)] = r6; + /* Clear it while we handle the exception in IRQ5 mode + * RESTORE_ALL_SYS will load it, so all we need to do is store it + * in the right place + */ + BITCLR(r6, SYSCFG_SSSTEP_P); + [SP + PT_SYSCFG] = r6; + + /* Since we are going to clobber RETX, we need to save it */ + r6 = retx; + [p5 + (deferred_regs_retx * 4)] = r6; + + /* Save the current IMASK, since we change in order to jump to level 5 */ + cli r6; + [p5 + (deferred_regs_IMASK * 4)] = r6; + + /* Disable all interrupts, but make sure level 5 is enabled so + * we can switch to that level. + */ + r6 = 0x3f; + sti r6; + + /* Clobber RETX so we don't end up back at a faulting instruction */ + [sp + PT_RETX] = r7; + + /* In case interrupts are disabled IPEND[4] (global interrupt disable bit) + * clear it (re-enabling interrupts again) by the special sequence of pushing + * RETI onto the stack. This way we can lower ourselves to IVG5 even if the + * exception was taken after the interrupt handler was called but before it + * got a chance to enable global interrupts itself. + */ + [--sp] = reti; + sp += 4; + + RAISE 5; +.Lexit_trap: +#endif + #if ANOMALY_05000257 R7 = LC0; LC0 = R7; @@ -35,6 +103,43 @@ ENTRY(_trap) rtx; ENDPROC(_trap) +#ifdef CONFIG_EXCEPTION_DEFER +/* Deferred (IRQ5) exceptions */ +ENTRY(_exception_to_level5) + SAVE_ALL_SYS + + /* Now we have to fix things up */ + p4.l = lo(EVT5); + p4.h = hi(EVT5); + r0.l = _evt_default; + r0.h = _evt_default; + [p4] = r0; + csync; + + p4.l = _deferred_regs; + p4.h = _deferred_regs; + r0 = [p4 + (deferred_regs_retx * 4)]; + [sp + PT_PC] = r0; + + r0 = [p4 + (deferred_regs_SYSCFG * 4)]; + [sp + PT_SYSCFG] = r0; + + r0 = sp; /* stack frame pt_regs pointer argument ==> r0 */ + r1 = 5; /* EVT5 space */ + sp += -12; + call _trap_c; + sp += 12; + + /* Restore IMASK */ + r0 = [p4 + (deferred_regs_IMASK * 4)]; + sti r0; + + RESTORE_ALL_SYS + + rti; +ENDPROC(_exception_to_level5) +#endif + /* default entry point for interrupts */ ENTRY(_evt_default) SAVE_ALL_SYS diff --git a/cpu/blackfin/traps.c b/cpu/blackfin/traps.c index becc36e..caaea94 100644 --- a/cpu/blackfin/traps.c +++ b/cpu/blackfin/traps.c @@ -18,6 +18,7 @@ */ #include <common.h> +#include <kgdb.h> #include <linux/types.h> #include <asm/traps.h> #include <asm/cplb.h> @@ -25,6 +26,7 @@ #include <asm/mach-common/bits/core.h> #include <asm/mach-common/bits/mpu.h> #include <asm/mach-common/bits/trace.h> +#include <asm/deferred.h> #include "cpu.h" #define trace_buffer_save(x) \ @@ -69,8 +71,16 @@ const struct memory_map const bfin_memory_map[] = { } }; -void trap_c(struct pt_regs *regs) +#ifdef CONFIG_EXCEPTION_DEFER +unsigned int deferred_regs[deferred_regs_last]; +#endif + +/* + * Handle all exceptions while running in EVT3 or EVT5 + */ +int trap_c(struct pt_regs *regs, uint32_t level) { + uint32_t ret = 0; uint32_t trapnr = (regs->seqstat & EXCAUSE); bool data = false; @@ -87,7 +97,7 @@ void trap_c(struct pt_regs *regs) */ if (last_cplb_fault_retx != regs->retx) { last_cplb_fault_retx = regs->retx; - return; + return ret; } } @@ -102,6 +112,12 @@ void trap_c(struct pt_regs *regs) size_t i; unsigned long tflags; +#ifdef CONFIG_EXCEPTION_DEFER + /* This should never happen */ + if (level == 5) + bfin_panic(regs); +#endif + /* * Keep the trace buffer so that a miss here points people * to the right place (their code). Crashes here rarely @@ -167,11 +183,40 @@ void trap_c(struct pt_regs *regs) trace_buffer_restore(tflags); break; } - +#ifdef CONFIG_CMD_KGDB + /* Single step + * if we are in IRQ5, just ignore, otherwise defer, and handle it in kgdb + */ + case VEC_STEP: + if (level == 3) { + /* If we just returned from an interrupt, the single step + * event is for the RTI instruction. + */ + if (regs->retx == regs->pc) + break; + /* we just return if we are single stepping through IRQ5 */ + if (regs->ipend & 0x20) + break; + /* Otherwise, turn single stepping off & fall through, + * which defers to IRQ5 + */ + regs->syscfg &= ~1; + } + /* fall through */ +#endif default: - /* All traps come here */ +#ifdef CONFIG_CMD_KGDB + if (level == 3) { + /* We need to handle this at EVT5, so try again */ + ret = 1; + break; + } + if (debugger_exception_handler && (*debugger_exception_handler)(regs)) + return 0; +#endif bfin_panic(regs); } + return ret; } #ifdef CONFIG_DEBUG_DUMP @@ -251,8 +296,10 @@ void dump(struct pt_regs *fp) if (!ENABLE_DUMP) return; - /* fp->ipend is garbage, so load it ourself */ +#ifndef CONFIG_CMD_KGDB + /* fp->ipend is normally garbage, so load it ourself */ fp->ipend = bfin_read_IPEND(); +#endif hwerrcause = (fp->seqstat & HWERRCAUSE) >> HWERRCAUSE_P; excause = (fp->seqstat & EXCAUSE) >> EXCAUSE_P; diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index dac48db..f96a4c8 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -1,6 +1,6 @@ /* + * (C) Copyright 2007-2010 DENX Software Engineering * Copyright (C) 2004-2006 Freescale Semiconductor, Inc. - * (C) Copyright 2007 DENX Software Engineering * * See file CREDITS for list of people who contributed to this * project. @@ -32,6 +32,7 @@ #include <net.h> #include <netdev.h> #include <asm/processor.h> +#include <asm/io.h> #if defined(CONFIG_OF_LIBFDT) #include <fdt_support.h> @@ -44,7 +45,7 @@ int checkcpu (void) volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; ulong clock = gd->cpu_clk; u32 pvr = get_pvr (); - u32 spridr = immr->sysconf.spridr; + u32 spridr = in_be32(&immr->sysconf.spridr); char buf1[32], buf2[32]; puts ("CPU: "); @@ -87,17 +88,17 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) /* * Enable Reset Control Reg - "RSTE" is the magic word that let us go */ - immap->reset.rpr = 0x52535445; + out_be32(&immap->reset.rpr, 0x52535445); /* Verify Reset Control Reg is enabled */ - while (!((immap->reset.rcer) & RCER_CRE)) + while (!(in_be32(&immap->reset.rcer) & RCER_CRE)) ; printf ("Resetting the board.\n"); udelay(200); /* Perform reset */ - immap->reset.rcr = RCR_SWHR; + out_be32(&immap->reset.rcr, RCR_SWHR); /* Unreached... */ return 1; @@ -124,8 +125,8 @@ void watchdog_reset (void) /* Reset watchdog */ volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; - immr->wdt.swsrr = 0x556c; - immr->wdt.swsrr = 0xaa39; + out_be32(&immr->wdt.swsrr, 0x556c); + out_be32(&immr->wdt.swsrr, 0xaa39); if (re_enable) enable_interrupts (); diff --git a/cpu/mpc512x/diu.c b/cpu/mpc512x/diu.c index 691451a..a24f395 100644 --- a/cpu/mpc512x/diu.c +++ b/cpu/mpc512x/diu.c @@ -57,10 +57,10 @@ void diu_set_pixel_clock(unsigned int pixclock) debug("DIU pixval = %lu\n", pixval); /* Modify PXCLK in GUTS CLKDVDR */ - debug("DIU: Current value of CLKDVDR = 0x%08x\n", *clkdvdr); - temp = *clkdvdr & 0xFFFFFF00; - *clkdvdr = temp | (pixval & 0xFF); - debug("DIU: Modified value of CLKDVDR = 0x%08x\n", *clkdvdr); + debug("DIU: Current value of CLKDVDR = 0x%08x\n", in_be32(clkdvdr)); + temp = in_be32(clkdvdr) & 0xFFFFFF00; + out_be32(clkdvdr, temp | (pixval & 0xFF)); + debug("DIU: Modified value of CLKDVDR = 0x%08x\n", in_be32(clkdvdr)); } char *valid_bmp(char *addr) diff --git a/cpu/mpc512x/pci.c b/cpu/mpc512x/pci.c index bbfab3e..141db8b 100644 --- a/cpu/mpc512x/pci.c +++ b/cpu/mpc512x/pci.c @@ -1,6 +1,6 @@ /* + * Copyright (C) 2009-2010 DENX Software Engineering <wd@denx.de> * Copyright (C) Freescale Semiconductor, Inc. 2006, 2007. - * Copyright (C) 2009 DENX Software Engineering <wd@denx.de> * * See file CREDITS for list of people who contributed to this * project. @@ -60,10 +60,10 @@ pci_init_board(void) struct pci_controller *hose; /* Set PCI divider for 33MHz */ - reg32 = im->clk.scfr[0]; + reg32 = in_be32(&im->clk.scfr[0]); reg32 &= ~(SCFR1_PCI_DIV_MASK); reg32 |= SCFR1_PCI_DIV << SCFR1_PCI_DIV_SHIFT; - im->clk.scfr[0] = reg32; + out_be32(&im->clk.scfr[0], reg32); clrsetbits_be32(&im->clk.scfr[0], SCFR1_PCI_DIV_MASK, diff --git a/cpu/mpc512x/serial.c b/cpu/mpc512x/serial.c index 4fc4693..ec2f41b 100644 --- a/cpu/mpc512x/serial.c +++ b/cpu/mpc512x/serial.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2000 - 2009 + * (C) Copyright 2000 - 2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * * See file CREDITS for list of people who contributed to this @@ -125,7 +125,7 @@ void serial_putc (const char c) while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP)) ; - psc->tfdata_8 = c; + out_8(&psc->tfdata_8, c); } void serial_putc_raw (const char c) @@ -137,7 +137,7 @@ void serial_putc_raw (const char c) while (!(in_be16(&psc->psc_status) & PSC_SR_TXEMP)) ; - psc->tfdata_8 = c; + out_8(&psc->tfdata_8, c); } @@ -157,7 +157,7 @@ int serial_getc (void) while (in_be32(&psc->rfstat) & PSC_FIFO_EMPTY) ; - return psc->rfdata_8; + return in_8(&psc->rfdata_8); } int serial_tstc (void) diff --git a/cpu/ppc4xx/44x_spd_ddr2.c b/cpu/ppc4xx/44x_spd_ddr2.c index f8aa14a..593a286 100644 --- a/cpu/ppc4xx/44x_spd_ddr2.c +++ b/cpu/ppc4xx/44x_spd_ddr2.c @@ -426,7 +426,7 @@ phys_size_t initdram(int board_type) unsigned char spd0[MAX_SPD_BYTES]; unsigned char spd1[MAX_SPD_BYTES]; unsigned char *dimm_spd[MAXDIMMS]; - unsigned long dimm_populated[MAXDIMMS]; + unsigned long dimm_populated[MAXDIMMS] = {SDRAM_NONE, SDRAM_NONE}; unsigned long num_dimm_banks; /* on board dimm banks */ unsigned long val; ddr_cas_id_t selected_cas = DDR_CAS_5; /* preset to silence compiler */ diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 73d4d06..e1a023b 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -196,7 +196,7 @@ static char *bootstrap_str[] = { "I2C (Addr 0x54)", /* A8 */ "I2C (Addr 0x52)", /* A4 */ }; -static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'G', 'F', 'H' }; +static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' }; #endif #if defined(CONFIG_460SX) |