Blackfin update for 2.6.23-rc4
Hi Linus,
Please pull from 'for-linus' branch of
master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git for-linus
to receive the following updates:
- Blackfin anomaly handling update
- bug fixing
arch/blackfin/kernel/bfin_gpio.c | 10 +- arch/blackfin/kernel/cplbinit.c | 4 +- arch/blackfin/kernel/setup.c | 20 +- arch/blackfin/lib/memcmp.S | 2 +- arch/blackfin/lib/memcpy.S | 2 +- arch/blackfin/lib/memmove.S | 4 +- arch/blackfin/mach-bf533/head.S | 22 +- arch/blackfin/mach-bf537/head.S | 30 +- arch/blackfin/mach-bf548/head.S | 14 +- arch/blackfin/mach-bf561/head.S | 23 +- arch/blackfin/mach-common/cache.S | 8 +- arch/blackfin/mach-common/cacheinit.S | 6 +- arch/blackfin/mach-common/cplbmgr.S | 54 ++-- arch/blackfin/mach-common/dpmc.S | 52 ++-- arch/blackfin/mach-common/entry.S | 10 +- arch/blackfin/mach-common/interrupt.S | 6 +- arch/blackfin/mach-common/lock.S | 20 +- arch/blackfin/mach-common/pm.c | 6 + arch/blackfin/oprofile/op_blackfin.h | 8 +- drivers/serial/bfin_5xx.c | 14 +- include/asm-blackfin/blackfin.h | 112 ++--- include/asm-blackfin/mach-bf527/anomaly.h | 39 ++ include/asm-blackfin/mach-bf533/anomaly.h | 467 ++++++++++---------- include/asm-blackfin/mach-bf533/bf533.h | 2 +- include/asm-blackfin/mach-bf533/cdefBF532.h | 10 +- include/asm-blackfin/mach-bf537/anomaly.h | 246 ++++++----- include/asm-blackfin/mach-bf537/bf537.h | 2 +- include/asm-blackfin/mach-bf537/cdefBF534.h | 4 +- include/asm-blackfin/mach-bf548/anomaly.h | 142 ++++--- include/asm-blackfin/mach-bf548/cdefBF54x_base.h | 4 +- include/asm-blackfin/mach-bf561/anomaly.h | 410 ++++++++++------- include/asm-blackfin/mach-bf561/bf561.h | 2 +- include/asm-blackfin/mach-bf561/cdefBF561.h | 9 +- include/asm-blackfin/mach-bf561/portmux.h | 2 +- include/asm-blackfin/mach-common/cdef_LPBlackfin.h | 4 +- include/asm-blackfin/mach-common/def_LPBlackfin.h | 132 +++--- include/asm-blackfin/system.h | 93 +++-- 37 files changed, 1057 insertions(+), 938 deletions(-) create mode 100644 include/asm-blackfin/mach-bf527/anomaly.h
Bryan Wu (1):
Blackfin arch: fix bugs report by Andy Liu <[email protected]>, AD1836 can't be probed in BF561-EZ
Michael Hennerich (1):
Blackfin arch: Update/Fix PM support add new pm_ops valid
Mike Frysinger (8):
Blackfin arch: cleanup and standardize anomaly.h file format -- no functional changes Blackfin arch: revise anomaly handling by basing things on the compiler not the kconfig defines Blackfin arch: update BF54x anomaly list
Blackfin arch: use the [CS]SYNC() macros which include anomaly workarounds rather than __builtin_bfin_[cs]sync() Blackfin arch: reorganize headers slightly so we can be sure things are defined early enough Blackfin arch: use HI/LO macros rather than masking the bit ranges ourselves
Blackfin arch: fix typo... we want csync in CSYNC(), not ssync
Blackfin arch: update to latest anomaly sheets
Robin Getz (1):
Blackfin arch: Fix Anomaly hanlding, as pointed out by Mike
arch/blackfin/kernel/bfin_gpio.c +5 -5
@@ -254,7 +254,7 @@ EXPORT_SYMBOL(set_gpio_ ## name); SET_GPIO_SC(maska) SET_GPIO_SC(maskb) -#if defined(ANOMALY_05000311 ) +#if ANOMALY_05000311 void set_gpio_data (unsigned short gpio,unsigned short arg) {unsigned long flags;
@@ -273,7 +273,7 @@ SET_GPIO_SC(data)#endif -#if defined(ANOMALY_05000311 ) +#if ANOMALY_05000311 void set_gpio_toggle (unsigned short gpio) {unsigned long flags;
@@ -311,7 +311,7 @@ SET_GPIO_P(maska) SET_GPIO_P(maskb) -#if defined(ANOMALY_05000311 ) +#if ANOMALY_05000311 void set_gpiop_data (unsigned short gpio,unsigned short arg) {unsigned long flags;
@@ -345,7 +345,7 @@ GET_GPIO(maska) GET_GPIO(maskb) -#if defined(ANOMALY_05000311 ) +#if ANOMALY_05000311 unsigned short get_gpio_data (unsigned short gpio) {unsigned long flags;
@@ -379,7 +379,7 @@ GET_GPIO_P(both) GET_GPIO_P(maska) GET_GPIO_P(maskb) -#if defined(ANOMALY_05000311 ) +#if ANOMALY_05000311 unsigned short get_gpiop_data(unsigned short gpio) { unsigned long flags;
arch/blackfin/kernel/cplbinit.c +2 -2
@@ -230,8 +230,8 @@ static void __fill_code_cplbtab(struct cplb_tab *t, int i, u32 a_start, u32 a_en cplb_data[i].psize, cplb_data[i].i_conf); } else { -#if (defined(CONFIG_BLKFIN_CACHE) && defined(ANOMALY_05000263)) - if (i == SDRAM_KERN) { +#if defined(CONFIG_BLKFIN_CACHE) + if (ANOMALY_05000263 && i == SDRAM_KERN) { fill_cplbtab(t, cplb_data[i].start, cplb_data[i].end,
arch/blackfin/kernel/setup.c +10 -10
@@ -179,14 +179,16 @@ void __init setup_arch(char **cmdline_p) cclk =get_cclk (); sclk =get_sclk (); -#if !defined(CONFIG_BFIN_KERNEL_CLOCK ) && defined(ANOMALY_05000273 ) -if (cclk == sclk) +#if !defined(CONFIG_BFIN_KERNEL_CLOCK ) +if (ANOMALY_05000273 && cclk == sclk)panic ("ANOMALY 05000273, SCLK can not be same as CCLK" );#endif -#if defined(ANOMALY_05000266 ) -bfin_read_IMDMA_D0_IRQ_STATUS (); -bfin_read_IMDMA_D1_IRQ_STATUS (); +#ifdef BF561_FAMILY +if (ANOMALY_05000266 ) { +bfin_read_IMDMA_D0_IRQ_STATUS (); +bfin_read_IMDMA_D1_IRQ_STATUS (); + }#endif #ifdef DEBUG_SERIAL_EARLY_INIT
@@ -260,7 +262,7 @@ void __init setup_arch(char **cmdline_p) && ((unsigned long *)mtd_phys)[1] == ROMSB_WORD1) mtd_size =PAGE_ALIGN (be32_to_cpu (((unsigned long *)mtd_phys)[2 ])); -# if (defined(CONFIG_BLKFIN_CACHE ) && defined(ANOMALY_05000263 )) +# if (defined(CONFIG_BLKFIN_CACHE ) &&ANOMALY_05000263 )/* Due to a Hardware Anomaly we need to limit the size of usable * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -289,7 +291,7 @@ void __init setup_arch(char **cmdline_p) _ebss = memory_mtd_start;/* define _ebss for compatible */ #endif /* CONFIG_MTD_UCLINUX */ -#if (defined(CONFIG_BLKFIN_CACHE ) && defined(ANOMALY_05000263 )) +#if (defined(CONFIG_BLKFIN_CACHE ) &&ANOMALY_05000263 )/* Due to a Hardware Anomaly we need to limit the size of usable * instruction memory to max 60MB, 56 if HUNT_FOR_ZERO is on * 05000263 - Hardware loop corrupted when taking an ICPLB exception
@@ -337,10 +339,8 @@ void __init setup_arch(char **cmdline_p)printk (KERN_INFO "Processor Speed: %lu MHz core clock and %lu Mhz System Clock\n" , cclk /1000000 , sclk /1000000 ); -#if defined(ANOMALY_05000273 ) -if ((cclk >>1 ) <= sclk) +if (ANOMALY_05000273 && (cclk >>1 ) <= sclk)printk ("\n\n\nANOMALY_05000273: CCLK must be >= 2*SCLK !!!\n\n\n" ); -#endif printk (KERN_INFO "Board Memory: %ldMB\n" , physical_mem_end >>20 );printk (KERN_INFO "Kernel Managed Memory: %ldMB\n" , _ramend >>20 );
arch/blackfin/lib/memcmp.S +1 -1
@@ -61,7 +61,7 @@ ENTRY(_memcmp) LSETUP (.Lquad_loop_s, .Lquad_loop_e) LC0=P1; .Lquad_loop_s: -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 R0 = [P0++]; R1 = [I0++]; #else
arch/blackfin/lib/memcpy.S +1 -1
@@ -98,7 +98,7 @@ ENTRY(_memcpy) R0 = R1; I1 = P1; R3 = [I1++]; -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 .Lword_loops: [P0++] = R3; .Lword_loope:
arch/blackfin/lib/memmove.S +2 -2
@@ -70,7 +70,7 @@ ENTRY(_memmove) R1 = [I0++]; LSETUP (.Lquad_loops, .Lquad_loope) LC0=P1; -#ifdef ANOMALY_05000202 +#if ANOMALY_05000202 .Lquad_loops: [P0++] = R1; .Lquad_loope:
@@ -102,7 +102,7 @@ ENTRY(_memmove) R1 = B[P3--] (Z); CC = P2 == 0; IF CC JUMP .Lno_loop; -#ifdef ANOMALY_05000245 +#if ANOMALY_05000245 NOP; NOP; #endif
arch/blackfin/mach-bf533/head.S +11 -11
@@ -144,38 +144,38 @@ ENTRY(__start) ssync; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -264,7 +264,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -417,8 +417,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf537/head.S +15 -15
@@ -100,38 +100,38 @@ ENTRY(__start) R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -141,12 +141,12 @@ ENTRY(__start) */ p0.h = hi(BFIN_PORT_MUX); p0.l = lo(BFIN_PORT_MUX); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 R0.L = W[P0]; /* Read */ SSYNC; #endif R0 = (PGDE_UART | PFTE_UART)(Z); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 W[P0] = R0.L; /* Write */ SSYNC; #endif
@@ -155,12 +155,12 @@ ENTRY(__start) p0.h = hi(PORTF_FER); p0.l = lo(PORTF_FER); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 R0.L = W[P0]; /* Read */ SSYNC; #endif R0 = 0x000F(Z); -#ifdef ANOMALY_05000212 +#if ANOMALY_05000212 W[P0] = R0.L; /* Write */ SSYNC; #endif
@@ -274,7 +274,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -436,8 +436,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf548/head.S +7 -7
@@ -97,8 +97,8 @@ ENTRY(__stext) R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1;
@@ -106,8 +106,8 @@ ENTRY(__stext) SSYNC; /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1;
@@ -172,7 +172,7 @@ ENTRY(__stext) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined (ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop;
@@ -335,8 +335,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-bf561/head.S +11 -12
@@ -100,38 +100,37 @@ ENTRY(__start) R0 = R1; /* Turn off the icache */ - p0.l = (IMEM_CONTROL & 0xFFFF); - p0.h = (IMEM_CONTROL >> 16); + p0.l = LO(IMEM_CONTROL); + p0.h = HI(IMEM_CONTROL); R1 = [p0]; R0 = ~ENICPLB; R0 = R0 & R1; - /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif /* Turn off the dcache */ - p0.l = (DMEM_CONTROL & 0xFFFF); - p0.h = (DMEM_CONTROL >> 16); + p0.l = LO(DMEM_CONTROL); + p0.h = HI(DMEM_CONTROL); R1 = [p0]; R0 = ~ENDCPLB; R0 = R0 & R1; /* Anomaly 05000125 */ -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 CLI R2; SSYNC; #endif [p0] = R0; SSYNC; -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 STI R2; #endif
@@ -220,7 +219,7 @@ ENTRY(__start) p0.l = .LWAIT_HERE; p0.h = .LWAIT_HERE; reti = p0; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 nop; nop; nop; #endif rti;
@@ -372,8 +371,8 @@ ENTRY(_start_dma_code) w[p0] = r0.l; ssync; - p0.l = (EBIU_SDBCTL & 0xFFFF); - p0.h = (EBIU_SDBCTL >> 16); /* SDRAM Memory Bank Control Register */ + p0.l = LO(EBIU_SDBCTL); + p0.h = HI(EBIU_SDBCTL); /* SDRAM Memory Bank Control Register */ r0 = mem_SDBCTL; w[p0] = r0.l; ssync;
arch/blackfin/mach-common/cache.S +4 -4
@@ -79,8 +79,8 @@ ENTRY(_icache_invalidate) ENTRY(_invalidate_entire_icache) [--SP] = ( R7:5); - P0.L = (IMEM_CONTROL & 0xFFFF); - P0.H = (IMEM_CONTROL >> 16); + P0.L = LO(IMEM_CONTROL); + P0.H = HI(IMEM_CONTROL); R7 = [P0]; /* Clear the IMC bit , All valid bits in the instruction
@@ -197,8 +197,8 @@ ENTRY(_invalidate_entire_dcache) ENTRY(_dcache_invalidate) [--SP] = ( R7:6); - P0.L = (DMEM_CONTROL & 0xFFFF); - P0.H = (DMEM_CONTROL >> 16); + P0.L = LO(DMEM_CONTROL); + P0.H = HI(DMEM_CONTROL); R7 = [P0]; /* Clear the DMC[1:0] bits, All valid bits in the data
arch/blackfin/mach-common/cacheinit.S +3 -3
@@ -38,13 +38,13 @@ .text -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 #if defined(CONFIG_BLKFIN_CACHE) ENTRY(_bfin_write_IMEM_CONTROL) /* Enable Instruction Cache */ - P0.l = (IMEM_CONTROL & 0xFFFF); - P0.h = (IMEM_CONTROL >> 16); + P0.l = LO(IMEM_CONTROL); + P0.h = HI(IMEM_CONTROL); /* Anomaly 05000125 */ CLI R1;
arch/blackfin/mach-common/cplbmgr.S +27 -27
123 lines not on this page · raw message
arch/blackfin/mach-common/dpmc.S +26 -26
99 lines not on this page · raw message
arch/blackfin/mach-common/entry.S +5 -5
@@ -69,7 +69,7 @@ * patch up CPLB misses on the kernel stack. */ ENTRY(_ex_dcplb) -#if defined(ANOMALY_05000261) +#if ANOMALY_05000261 /* * Work around an anomaly: if we see a new DCPLB fault, return * without doing anything. Then, if we get the same fault again,
@@ -137,7 +137,7 @@ ENTRY(_ex_single_step) _return_from_exception: DEBUG_START_HWTRACE(p5, r7) -#ifdef ANOMALY_05000257 +#if ANOMALY_05000257 R7=LC0; LC0=R7; R7=LC1;
@@ -634,7 +634,7 @@ ENTRY(_return_from_int) p1.h = _schedule_and_signal_from_int; [p0] = p1; csync; -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 r0.l = lo(CONFIG_BOOT_LOAD); r0.h = hi(CONFIG_BOOT_LOAD); reti = r0;
@@ -648,7 +648,7 @@ ENTRY(_return_from_int) ENDPROC(_return_from_int) ENTRY(_lower_to_irq14) -#if defined(ANOMALY_05000281) +#if ANOMALY_05000281 r0.l = lo(CONFIG_BOOT_LOAD); r0.h = hi(CONFIG_BOOT_LOAD); reti = r0;
@@ -1169,7 +1169,7 @@ _exception_stack: .endr _exception_stack_top: -#if defined(ANOMALY_05000261) +#if ANOMALY_05000261 /* Used by the assembly entry point to work around an anomaly. */ _last_cplb_fault_retx: .long 0;
arch/blackfin/mach-common/interrupt.S +3 -3
@@ -140,7 +140,7 @@ __common_int_entry: fp = 0; #endif -#if defined (ANOMALY_05000283) || defined (ANOMALY_05000315) +#if ANOMALY_05000283 || ANOMALY_05000315 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
@@ -163,7 +163,7 @@ ENTRY(_evt_ivhw) #ifdef CONFIG_FRAME_POINTER fp = 0; #endif -#ifdef ANOMALY_05000283 +#if ANOMALY_05000283 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
@@ -207,7 +207,7 @@ ENTRY(_evt_evt2) #ifdef CONFIG_FRAME_POINTER fp = 0; #endif -#ifdef ANOMALY_05000283 +#if ANOMALY_05000283 cc = r7 == r7; p5.h = 0xffc0; p5.l = 0x0014;
arch/blackfin/mach-common/lock.S +10 -10
@@ -43,12 +43,12 @@ ENTRY(_cache_grab_lock) [--SP]=( R7:0,P5:0 ); - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); - P5.H = (ICPLB_ADDR0 >> 16); - P5.L = (ICPLB_ADDR0 & 0xFFFF); - P4.H = (ICPLB_DATA0 >> 16); - P4.L = (ICPLB_DATA0 & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); + P5.H = HI(ICPLB_ADDR0); + P5.L = LO(ICPLB_ADDR0); + P4.H = HI(ICPLB_DATA0); + P4.L = LO(ICPLB_DATA0); R7 = R0; /* If the code of interest already resides in the cache
@@ -167,8 +167,8 @@ ENTRY(_cache_lock) [--SP]=( R7:0,P5:0 ); - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); /* Disable the Interrupts*/ CLI R3;
@@ -195,8 +195,8 @@ ENDPROC(_cache_lock) */ ENTRY(_read_iloc) - P1.H = (IMEM_CONTROL >> 16); - P1.L = (IMEM_CONTROL & 0xFFFF); + P1.H = HI(IMEM_CONTROL); + P1.L = LO(IMEM_CONTROL); R1 = 0xF; R0 = [P1]; R0 = R0 >> 3;
arch/blackfin/mach-common/pm.c +6 -0
@@ -158,10 +158,16 @@ static int bfin_pm_finish(suspend_state_t state)return 0 ; } +static int bfin_pm_valid (suspend_state_t state) +{ +return (state ==PM_SUSPEND_STANDBY ); +} +struct pm_ops bfin_pm_ops = { .prepare = bfin_pm_prepare, .enter = bfin_pm_enter, .finish = bfin_pm_finish, + .valid = bfin_pm_valid, };static int __init bfin_pm_init (void )
arch/blackfin/oprofile/op_blackfin.h +4 -4
@@ -68,7 +68,7 @@ static inline unsigned int ctr_read(void)unsigned int tmp; tmp =bfin_read_PFCTL (); -__builtin_bfin_csync (); +CSYNC ();return tmp; }
@@ -76,21 +76,21 @@ static inline unsigned int ctr_read(void)static inline void ctr_write (unsigned int val) {bfin_write_PFCTL (val); -__builtin_bfin_csync (); +CSYNC (); }static inline void count_read (unsigned int *count) { count[0 ] =bfin_read_PFCNTR0 (); count[1 ] =bfin_read_PFCNTR1 (); -__builtin_bfin_csync (); +CSYNC (); }static inline void count_write (unsigned int *count) {bfin_write_PFCNTR0 (count[0 ]);bfin_write_PFCNTR1 (count[1 ]); -__builtin_bfin_csync (); +CSYNC (); }extern int pm_overflow_handler (int irq,struct pt_regs *regs);
drivers/serial/bfin_5xx.c +7 -7
@@ -173,12 +173,12 @@ void kgdb_put_debug_char(int chr) uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ];while (!(UART_GET_LSR (uart) &THRE )) { -__builtin_bfin_ssync (); +SSYNC (); }UART_PUT_LCR (uart,UART_GET_LCR (uart)&(~DLAB )); -__builtin_bfin_ssync (); +SSYNC ();UART_PUT_CHAR (uart, (unsigned char )chr); -__builtin_bfin_ssync (); +SSYNC (); }int kgdb_get_debug_char (void )
@@ -192,12 +192,12 @@ int kgdb_get_debug_char(void) uart = &bfin_serial_ports[CONFIG_KGDB_UART_PORT ];while (!(UART_GET_LSR (uart) &DR )) { -__builtin_bfin_ssync (); +SSYNC (); }UART_PUT_LCR (uart,UART_GET_LCR (uart)&(~DLAB )); -__builtin_bfin_ssync (); +SSYNC (); chr =UART_GET_CHAR (uart); -__builtin_bfin_ssync (); +SSYNC ();return chr; }
@@ -1203,7 +1203,7 @@ static int __init bfin_serial_init(void) IRQF_DISABLED, "BFIN_UART_RX", uart);pr_info ("Request irq for kgdb uart port\n" );UART_PUT_IER (uart,UART_GET_IER (uart) |ERBFI ); -__builtin_bfin_ssync (); +SSYNC (); t.c_cflag =CS8 |B57600 ; t.c_iflag =0 ; t.c_oflag =0 ;
include/asm-blackfin/blackfin.h +45 -67
146 lines not on this page · raw message
include/asm-blackfin/mach-bf527/anomaly.h new file +39 -0
@@ -0,0 +1,39 @@ +/* +* File: include/asm-blackfin/mach-bf527/anomaly.h +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* Copyright (C) 2004-2007 Analog Devices Inc. +* Licensed under the GPL-2 or later. +*/ + +/* This file shoule be up to date with: +* - Revision A, May 30, 2007; ADSP-BF527 Blackfin Processor Anomaly List +*/ + +#ifndef _MACH_ANOMALY_H_ +#define _MACH_ANOMALY_H_ + +/* Multi-Issue Instruction with dsp32shiftimm in slot1 and P-reg Store in slot2 Not Supported */ +#define ANOMALY_05000074 (1) +/* DMA_RUN Bit Is Not Valid after a Peripheral Receive Channel DMA Stops */ +#define ANOMALY_05000119 (1) +/* Rx.H Cannot Be Used to Access 16-bit System MMR Registers */ +#define ANOMALY_05000122 (1) +/* Spurious Hardware Error from an Access in the Shadow of a Conditional Branch */ +#define ANOMALY_05000245 (1) +/* Sensitivity To Noise with Slow Input Edge Rates on External SPORT TX and RX Clocks */ +#define ANOMALY_05000265 (1) +/* Memory-To-Memory DMA Source/Destination Descriptors Must Be in Same Memory Space */ +#define ANOMALY_05000301 (1) +/* Errors When SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */ +#define ANOMALY_05000312 (1) +/* Incorrect Access of OTP_STATUS During otp_write() Function */ +#define ANOMALY_05000328 (1) +/* Disallowed Configuration Prevents Subsequent Allowed Configuration on Host DMA Port */ +#define ANOMALY_05000337 (1) +/* TWI Does Not Operate Correctly Under Certain Signal Termination Conditions */ +#define ANOMALY_05000342 (1) +/* Boot ROM Kernel Incorrectly Alters Reset Value of USB Register */ +#define ANOMALY_05000347 (1) + +#endif
include/asm-blackfin/mach-bf533/anomaly.h +239 -228
486 lines not on this page · raw message
include/asm-blackfin/mach-bf533/bf533.h +1 -1
@@ -226,7 +226,7 @@#define CONFIG_CCLK_ACT_DIV CONFIG_CCLK_DIV_not_defined_properly#endif -#if defined(ANOMALY_05000273 ) && (CONFIG_CCLK_DIV ==1 ) +#if ANOMALY_05000273 && (CONFIG_CCLK_DIV ==1 )#error ANOMALY 05000273, please make sure CCLK is at least 2x SCLK#endif
include/asm-blackfin/mach-bf533/cdefBF532.h +4 -6
@@ -30,11 +30,9 @@#ifndef _CDEF_BF532_H#define _CDEF_BF532_H -/* -#if !defined(__ADSPLPBLACKFIN__) -#warning cdefBF532.h should only be included for 532 compatible chips. -#endif -*/ + +#include <asm/blackfin.h> +/*include all Core registers and bit definitions*/ #include "defBF532.h"
@@ -65,7 +63,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)bfin_write32 (SIC_IWR ,IWR_ENABLE (0 ));bfin_write16 (VR_CTL , val); -__builtin_bfin_ssync (); +SSYNC ();local_irq_save (flags); asm("IDLE;" );
include/asm-blackfin/mach-bf537/anomaly.h +124 -122
263 lines not on this page · raw message
include/asm-blackfin/mach-bf537/bf537.h +1 -1
@@ -206,7 +206,7 @@#define CONFIG_CCLK_ACT_DIV CONFIG_CCLK_DIV_not_defined_properly#endif -#if defined(ANOMALY_05000273 ) && (CONFIG_CCLK_DIV ==1 ) +#if ANOMALY_05000273 && (CONFIG_CCLK_DIV ==1 )#error ANOMALY 05000273, please make sure CCLK is at least 2x SCLK#endif
include/asm-blackfin/mach-bf537/cdefBF534.h +3 -1
@@ -32,6 +32,8 @@#ifndef _CDEF_BF534_H#define _CDEF_BF534_H +#include <asm/blackfin.h> +/* Include all Core registers and bit definitions */ #include "defBF534.h"
@@ -57,7 +59,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)bfin_write32 (SIC_IWR ,IWR_ENABLE (0 ));bfin_write16 (VR_CTL , val); -__builtin_bfin_ssync (); +SSYNC ();local_irq_save (flags); asm("IDLE;" );
include/asm-blackfin/mach-bf548/anomaly.h +75 -67
149 lines not on this page · raw message
include/asm-blackfin/mach-bf548/cdefBF54x_base.h +3 -1
@@ -31,6 +31,8 @@#ifndef _CDEF_BF54X_H#define _CDEF_BF54X_H +#include <asm/blackfin.h> +#include "defBF54x_base.h" #include <asm/system.h>
@@ -60,7 +62,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)bfin_write32 (SIC_IWR2 ,0 );bfin_write16 (VR_CTL , val); -__builtin_bfin_ssync (); +SSYNC ();local_irq_save (flags); asm("IDLE;" );
include/asm-blackfin/mach-bf561/anomaly.h +241 -169
425 lines not on this page · raw message
include/asm-blackfin/mach-bf561/bf561.h +1 -1
@@ -311,7 +311,7 @@#define CONFIG_CCLK_ACT_DIV CONFIG_CCLK_DIV_not_defined_properly#endif -#if defined(ANOMALY_05000273 ) && (CONFIG_CCLK_DIV ==1 ) +#if ANOMALY_05000273 && (CONFIG_CCLK_DIV ==1 )#error ANOMALY 05000273, please make sure CCLK is at least 2x SCLK#endif
include/asm-blackfin/mach-bf561/cdefBF561.h +3 -6
@@ -31,11 +31,8 @@#ifndef _CDEF_BF561_H#define _CDEF_BF561_H -/* -#if !defined(__ADSPBF561__) -#warning cdefBF561.h should only be included for BF561 chip. -#endif -*/ +#include <asm/blackfin.h> +/* include all Core registers and bit definitions */ #include "defBF561.h"
@@ -67,7 +64,7 @@ static __inline__ void bfin_write_VR_CTL(unsigned int val)bfin_write32 (SICA_IWR1 ,0 );bfin_write16 (VR_CTL , val); -__builtin_bfin_ssync (); +SSYNC ();local_irq_save (flags); asm("IDLE;" );
include/asm-blackfin/mach-bf561/portmux.h +1 -1
@@ -81,7 +81,7 @@#define P_TMR1 (P_DEFINED | P_IDENT(GPIO_PF1))#define P_TMR0 (P_DEFINED | P_IDENT(GPIO_PF0))#define P_SPI0_MOSI (P_DONTCARE) -#define P_SPI0_MIS0 (P_DONTCARE) +#define P_SPI0_MISO (P_DONTCARE)#define P_SPI0_SCK (P_DONTCARE)#endif /* _MACH_PORTMUX_H_ */
include/asm-blackfin/mach-common/cdef_LPBlackfin.h +2 -2
@@ -39,7 +39,7 @@#define bfin_read_SRAM_BASE_ADDRESS () bfin_read32(SRAM_BASE_ADDRESS)#define bfin_write_SRAM_BASE_ADDRESS (val) bfin_write32(SRAM_BASE_ADDRESS,val)#define bfin_read_DMEM_CONTROL () bfin_read32(DMEM_CONTROL) -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 extern void bfin_write_DMEM_CONTROL (unsigned int val);#else #define bfin_write_DMEM_CONTROL (val) bfin_write32(DMEM_CONTROL,val)
@@ -129,7 +129,7 @@ extern void bfin_write_DMEM_CONTROL(unsigned int val);#define DTEST_DATA3 0xFFE0040C */ #define bfin_read_IMEM_CONTROL () bfin_read32(IMEM_CONTROL) -#ifdef ANOMALY_05000125 +#if ANOMALY_05000125 extern void bfin_write_IMEM_CONTROL (unsigned int val);#else #define bfin_write_IMEM_CONTROL (val) bfin_write32(IMEM_CONTROL,val)
include/asm-blackfin/mach-common/def_LPBlackfin.h +64 -68
145 lines not on this page · raw message
include/asm-blackfin/system.h +51 -42
120 lines not on this page · raw message