Blackfin arch updates for 2.6.31 (part 3)
cover Blackfin arch updates for 2.6.31 (part 3)
Should be the last major batch of Blackfin updates. Other than the standard bug fixes, we've got board updates to match the latest driver changes, irq updates to fix up the kstat fallout, some xenomai/ipipe updates on top of those irq fixes, and all the normal boring anomaly and defconfigs updates.
Graf Yang (3):
Blackfin: bf526-ezbrd: set SPI flash resources to SST device
Blackfin: fix typo in TRAS define in mem_init.h header
Blackfin: bf526-ezbrd: handle different SDRAM chips
Jie Zhang (1):
Blackfin: decouple unrelated cache settings to get exact behavior
Mike Frysinger (13):
Blackfin: unify memory region checks between kgdb and traps
Blackfin: bf518f-ezbrd: update DSA resources
Blackfin: bf533-ezkit: add resources for FISP devices
Blackfin: update anomaly lists
Blackfin: redo handling of bad irqs
Blackfin: only build show_interrupts() when procfs is enabled
Blackfin: simplify irq stack overflow checking
Blackfin: abstract irq14 lowering in do_irq
Blackfin: allow people to select BF51x-0.1 silicon rev
Blackfin: update defconfigs
Blackfin: unify memory map headers
Blackfin: drop unused ISP1760 port1_disable from board resources
Blackfin: fix GPTMR0_CLOCKSOURCE dependency on BFIN_GPTIMERS
Philippe Gerum (4):
Blackfin: convert interrupt pipeline to irqflags
Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline
Blackfin: remove obsolete mcount support from I-pipe code
Blackfin: update I-pipe patch level
Robin Getz (2):
Blackfin: stick the CPU name into boot image name
Blackfin: fix early crash when booting on wrong cpu
Sonic Zhang (1):
Blackfin: fix accidental reset in some boot modes
Yi Li (1):
Blackfin: drop BF535-specific text for exception 0x2A (unaligned
instruction)
arch/blackfin/Kconfig | 68 ++++-- arch/blackfin/boot/Makefile | 2 +- arch/blackfin/configs/BF518F-EZBRD_defconfig | 24 +- arch/blackfin/configs/BF526-EZBRD_defconfig | 22 +- arch/blackfin/configs/BF527-EZKIT_defconfig | 22 +- arch/blackfin/configs/BF533-EZKIT_defconfig | 25 ++- arch/blackfin/configs/BF533-STAMP_defconfig | 22 +- arch/blackfin/configs/BF537-STAMP_defconfig | 22 +- arch/blackfin/configs/BF538-EZKIT_defconfig | 22 +- arch/blackfin/configs/BF548-EZKIT_defconfig | 27 ++- arch/blackfin/configs/BF561-EZKIT_defconfig | 27 ++- arch/blackfin/configs/BlackStamp_defconfig | 12 +- arch/blackfin/configs/CM-BF527_defconfig | 22 +- arch/blackfin/configs/CM-BF533_defconfig | 23 +- arch/blackfin/configs/CM-BF537E_defconfig | 22 +- arch/blackfin/configs/CM-BF537U_defconfig | 23 +- arch/blackfin/configs/CM-BF548_defconfig | 25 ++- arch/blackfin/configs/CM-BF561_defconfig | 25 ++- arch/blackfin/configs/H8606_defconfig | 14 +- arch/blackfin/configs/PNAV-10_defconfig | 20 +- arch/blackfin/configs/SRV1_defconfig | 14 +- arch/blackfin/configs/TCM-BF537_defconfig | 14 +- arch/blackfin/include/asm/blackfin.h | 1 + arch/blackfin/include/asm/cache.h | 4 +- arch/blackfin/include/asm/cacheflush.h | 10 +- arch/blackfin/include/asm/cplb.h | 30 ++- arch/blackfin/include/asm/ipipe.h | 11 +- arch/blackfin/include/asm/ipipe_base.h | 30 +- arch/blackfin/include/asm/irq.h | 7 - arch/blackfin/include/asm/irqflags.h | 164 ++++++++++++- arch/blackfin/include/asm/mem_init.h | 88 +++++++- arch/blackfin/include/asm/mem_map.h | 97 ++++---- arch/blackfin/include/asm/system.h | 4 +- arch/blackfin/include/asm/traps.h | 4 +- arch/blackfin/include/asm/uaccess.h | 22 ++ arch/blackfin/kernel/Makefile | 1 - arch/blackfin/kernel/cplb-mpu/cplbinit.c | 10 +- arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 36 ++- arch/blackfin/kernel/ipipe.c | 7 +- arch/blackfin/kernel/irqchip.c | 114 ++++----- arch/blackfin/kernel/kgdb.c | 297 +++++++--------------- arch/blackfin/kernel/mcount.S | 70 ----- arch/blackfin/kernel/process.c | 151 +++++++++--- arch/blackfin/kernel/setup.c | 122 +++++++-- arch/blackfin/kernel/traps.c | 60 ++--- arch/blackfin/mach-bf518/boards/ezbrd.c | 16 +- arch/blackfin/mach-bf518/include/mach/anomaly.h | 37 ++- arch/blackfin/mach-bf518/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf518/include/mach/mem_map.h | 56 +---- arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 - arch/blackfin/mach-bf527/boards/ezbrd.c | 4 +- arch/blackfin/mach-bf527/boards/ezkit.c | 1 - arch/blackfin/mach-bf527/include/mach/anomaly.h | 15 +- arch/blackfin/mach-bf527/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf527/include/mach/mem_map.h | 56 +---- arch/blackfin/mach-bf533/boards/ezkit.c | 106 ++++++++ arch/blackfin/mach-bf533/include/mach/anomaly.h | 77 +++--- arch/blackfin/mach-bf533/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf533/include/mach/mem_map.h | 56 +---- arch/blackfin/mach-bf537/boards/stamp.c | 1 - arch/blackfin/mach-bf537/include/mach/anomaly.h | 41 ++-- arch/blackfin/mach-bf537/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf537/include/mach/mem_map.h | 56 +---- arch/blackfin/mach-bf538/include/mach/anomaly.h | 24 ++- arch/blackfin/mach-bf538/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf538/include/mach/mem_map.h | 57 +---- arch/blackfin/mach-bf548/boards/ezkit.c | 1 - arch/blackfin/mach-bf548/include/mach/anomaly.h | 20 +- arch/blackfin/mach-bf548/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf548/include/mach/mem_map.h | 51 +--- arch/blackfin/mach-bf561/boards/ezkit.c | 1 - arch/blackfin/mach-bf561/include/mach/anomaly.h | 89 ++++--- arch/blackfin/mach-bf561/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf561/include/mach/mem_map.h | 58 +++- arch/blackfin/mach-common/arch_checks.c | 4 +- arch/blackfin/mach-common/cpufreq.c | 2 +- arch/blackfin/mach-common/ints-priority.c | 47 ++-- arch/blackfin/mach-common/pm.c | 4 +- arch/blackfin/mm/init.c | 2 +- 79 files changed, 1512 insertions(+), 1215 deletions(-) delete mode 100644 arch/blackfin/kernel/mcount.S
PATCH 1/25 Blackfin: unify memory region checks between kgdb and traps
The kgdb (in multiple places) and traps code developed pretty much identical checks for how to access different regions of the Blackfin memory map, but each wasn't 100%, so unify them to avoid duplication, bitrot, and bugs with edge cases.
--- arch/blackfin/include/asm/uaccess.h | 22 +++ arch/blackfin/kernel/kgdb.c | 297 +++++++++++----------------------- arch/blackfin/kernel/process.c | 151 ++++++++++++++---- arch/blackfin/kernel/traps.c | 60 ++----- 4 files changed, 255 insertions(+), 275 deletions(-)
arch/blackfin/include/asm/uaccess.h +22 -0
@@ -265,4 +265,26 @@ __clear_user(void *to, unsigned long n)#define clear_user (to, n) __clear_user(to, n) +/* How to interpret these return values: +* CORE: can be accessed by core load or dma memcpy +* CORE_ONLY: can only be accessed by core load +* DMA: can only be accessed by dma memcpy +* IDMA: can only be accessed by interprocessor dma memcpy (BF561) +* ITEST: can be accessed by isram memcpy or dma memcpy +*/ +enum { +BFIN_MEM_ACCESS_CORE =0 , +BFIN_MEM_ACCESS_CORE_ONLY , +BFIN_MEM_ACCESS_DMA , +BFIN_MEM_ACCESS_IDMA , +BFIN_MEM_ACCESS_ITEST , +}; +/** +* bfin_mem_access_type() - what kind of memory access is required +* @addr: the address to check +* @size: number of bytes needed +* @return: <0 is error, >=0 is BFIN_MEM_ACCESS_xxx enum (see above) +*/ +int bfin_mem_access_type (unsigned long addr,unsigned long size); +#endif /* _BLACKFIN_UACCESS_H */
arch/blackfin/kernel/kgdb.c +96 -201
365 lines not on this page · raw message
arch/blackfin/kernel/process.c +120 -31
177 lines not on this page · raw message
arch/blackfin/kernel/traps.c +17 -43
80 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 2/25 Blackfin: bf518f-ezbrd: update DSA resources
In reply to Mike FrysingerThe common DSA code changed structure layout, so update the BF518F-EZBRD resources accordingly.
--- arch/blackfin/mach-bf518/boards/ezbrd.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-)
arch/blackfin/mach-bf518/boards/ezbrd.c +11 -5
@@ -119,13 +119,19 @@ static struct platform_device bfin_mac_device = { };#if defined(CONFIG_NET_DSA_KSZ8893M ) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE ) -static struct dsa_platform_data ksz8893m_switch_data = { +static struct dsa_chip_data ksz8893m_switch_chip_data = { .mii_bus = &bfin_mii_bus.dev, + .port_names = { +NULL , +"eth%d" , +"eth%d" , +"cpu" , + }, +}; +static struct dsa_platform_data ksz8893m_switch_data = { + .nr_chips =1 , .netdev = &bfin_mac_device.dev, - .port_names[0 ] =NULL , - .port_names[1 ] ="eth%d" , - .port_names[2 ] ="eth%d" , - .port_names[3 ] ="cpu" , + .chip = &ksz8893m_switch_chip_data, }; static struct platform_device ksz8893m_switch_device = {
Signature · 1 line
1.6.3.1
PATCH 3/25 Blackfin: bf533-ezkit: add resources for FISP devices
In reply to Mike FrysingerThe BF533-EZKIT has two Flash In-System Programming devices hooked up to the async memory bus, so add resources for the primary flashes and the SRAMs on the devices.
--- arch/blackfin/mach-bf533/boards/ezkit.c | 106 +++++++++++++++++++++++++++++++ 1 files changed, 106 insertions(+), 0 deletions(-)
arch/blackfin/mach-bf533/boards/ezkit.c +106 -0
@@ -32,6 +32,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/plat-ram.h> #include <linux/spi/spi.h> #include <linux/spi/flash.h> #if defined(CONFIG_USB_ISP1362_HCD ) || defined(CONFIG_USB_ISP1362_HCD_MODULE )
@@ -86,6 +87,101 @@ static struct platform_device smc91x_device = { };#endif +#if defined(CONFIG_MTD_PSD4256G ) || defined(CONFIG_MTD_PSD4256G_MODULE ) +static const char *map_probes[] = { +"stm_flash" , +NULL , +}; + +static struct platdata_mtd_ram stm_pri_data_a = { + .mapname ="Flash A Primary" , + .map_probes = map_probes, + .bankwidth =2 , +}; + +static struct resource stm_pri_resource_a = { + .start =0x20000000 , + .end =0x200fffff , + .flags =IORESOURCE_MEM , +}; + +static struct platform_device stm_pri_device_a = { + .name ="mtd-ram" , + .id =0 , + .dev = { + .platform_data = &stm_pri_data_a, + }, + .num_resources =1 , + .resource = &stm_pri_resource_a, +}; + +static struct platdata_mtd_ram stm_pri_data_b = { + .mapname ="Flash B Primary" , + .map_probes = map_probes, + .bankwidth =2 , +}; + +static struct resource stm_pri_resource_b = { + .start =0x20100000 , + .end =0x201fffff , + .flags =IORESOURCE_MEM , +}; + +static struct platform_device stm_pri_device_b = { + .name ="mtd-ram" , + .id =4 , + .dev = { + .platform_data = &stm_pri_data_b, + }, + .num_resources =1 , + .resource = &stm_pri_resource_b, +}; +#endif + +#if defined(CONFIG_MTD_PLATRAM ) || defined(CONFIG_MTD_PLATRAM_MODULE ) +static struct platdata_mtd_ram sram_data_a = { + .mapname ="Flash A SRAM" , + .bankwidth =2 , +}; + +static struct resource sram_resource_a = { + .start =0x20240000 , + .end =0x2024ffff , + .flags =IORESOURCE_MEM , +}; + +static struct platform_device sram_device_a = { + .name ="mtd-ram" , + .id =8 , + .dev = { + .platform_data = &sram_data_a, + }, + .num_resources =1 , + .resource = &sram_resource_a, +}; + +static struct platdata_mtd_ram sram_data_b = { + .mapname ="Flash B SRAM" , + .bankwidth =2 , +}; + +static struct resource sram_resource_b = { + .start =0x202c0000 , + .end =0x202cffff , + .flags =IORESOURCE_MEM , +}; + +static struct platform_device sram_device_b = { + .name ="mtd-ram" , + .id =9 , + .dev = { + .platform_data = &sram_data_b, + }, + .num_resources =1 , + .resource = &sram_resource_b, +}; +#endif + #if defined(CONFIG_MTD_M25P80) || defined(CONFIG_MTD_M25P80_MODULE) static struct mtd_partition bfin_spi_flash_partitions[] = { {
@@ -357,6 +453,16 @@ static struct platform_device *ezkit_devices[] __initdata = { &bfin_dpmc, +#if defined(CONFIG_MTD_PSD4256G ) || defined(CONFIG_MTD_PSD4256G_MODULE ) + &stm_pri_device_a, + &stm_pri_device_b, +#endif + +#if defined(CONFIG_MTD_PLATRAM ) || defined(CONFIG_MTD_PLATRAM_MODULE ) + &sram_device_a, + &sram_device_b, +#endif +#if defined(CONFIG_SMC91X ) || defined(CONFIG_SMC91X_MODULE ) &smc91x_device,#endif
Signature · 1 line
1.6.3.1
PATCH 4/25 Blackfin: update anomaly lists
In reply to Mike FrysingerUpdate anomaly headers to match latest released anomaly sheets.
--- arch/blackfin/mach-bf518/include/mach/anomaly.h | 37 +++++++--- arch/blackfin/mach-bf527/include/mach/anomaly.h | 15 ++++- arch/blackfin/mach-bf533/include/mach/anomaly.h | 77 ++++++++++---------- arch/blackfin/mach-bf537/include/mach/anomaly.h | 41 ++++++----- arch/blackfin/mach-bf538/include/mach/anomaly.h | 24 ++++-- arch/blackfin/mach-bf548/include/mach/anomaly.h | 20 ++++-- arch/blackfin/mach-bf561/include/mach/anomaly.h | 89 ++++++++++++----------- 7 files changed, 178 insertions(+), 125 deletions(-)
arch/blackfin/mach-bf518/include/mach/anomaly.h +25 -12
@@ -7,7 +7,7 @@*/ /* This file should be up to date with: -* - Revision B, 02/03/2009; ADSP-BF512/BF514/BF516/BF518 Blackfin Processor Anomaly List +* - Revision C, 06/12/2009; ADSP-BF512/BF514/BF516/BF518 Blackfin Processor Anomaly List */ /* We plan on not supporting 0.0 silicon, but 0.1 isn't out yet - sorry */
@@ -18,7 +18,7 @@#ifndef _MACH_ANOMALY_H_#define _MACH_ANOMALY_H_ -/* Multi-issue instruction with dsp32shiftimm in slot1 and P-reg store in slot 2 not supported */ +/* Multi-Issue Instruction with dsp32shiftimm in slot1 and P-reg Store in slot2 Not Supported */ #define ANOMALY_05000074 (1)/* Rx.H Cannot Be Used to Access 16-bit System MMR Registers */ #define ANOMALY_05000122 (1)
@@ -45,29 +45,31 @@/* Speculative Fetches of Indirect-Pointer Instructions Can Cause False Hardware Errors */ #define ANOMALY_05000426 (1)/* Software System Reset Corrupts PLL_LOCKCNT Register */ -#define ANOMALY_05000430 (1) +#define ANOMALY_05000430 (__SILICON_REVISION__ < 1)/* Incorrect Use of Stack in Lockbox Firmware During Authentication */ #define ANOMALY_05000431 (1)/* Certain SIC Registers are not Reset After Soft or Core Double Fault Reset */ -#define ANOMALY_05000435 (1) +#define ANOMALY_05000435 (__SILICON_REVISION__ < 1)/* PORTx_DRIVE and PORTx_HYSTERESIS Registers Read Back Incorrect Values */ -#define ANOMALY_05000438 (1) +#define ANOMALY_05000438 (__SILICON_REVISION__ < 1)/* Preboot Cannot be Used to Alter the PLL_DIV Register */ -#define ANOMALY_05000439 (1) +#define ANOMALY_05000439 (__SILICON_REVISION__ < 1)/* bfrom_SysControl() Cannot be Used to Write the PLL_DIV Register */ -#define ANOMALY_05000440 (1) +#define ANOMALY_05000440 (__SILICON_REVISION__ < 1)/* IFLUSH Instruction at End of Hardware Loop Causes Infinite Stall */ #define ANOMALY_05000443 (1)/* Incorrect L1 Instruction Bank B Memory Map Location */ -#define ANOMALY_05000444 (1) +#define ANOMALY_05000444 (__SILICON_REVISION__ < 1)/* Incorrect Default Hysteresis Setting for RESET, NMI, and BMODE Signals */ -#define ANOMALY_05000452 (1) +#define ANOMALY_05000452 (__SILICON_REVISION__ < 1)/* PWM_TRIPB Signal Not Available on PG10 */ -#define ANOMALY_05000453 (1) +#define ANOMALY_05000453 (__SILICON_REVISION__ < 1)/* PPI_FS3 is Driven One Half Cycle Later Than PPI Data */ -#define ANOMALY_05000455 (1) -/* False Hardware Error when RETI points to invalid memory */ +#define ANOMALY_05000455 (__SILICON_REVISION__ < 1) +/* False Hardware Error when RETI Points to Invalid Memory */ #define ANOMALY_05000461 (1) +/* Synchronization Problem at Startup May Cause SPORT Transmit Channels to Misalign */ +#define ANOMALY_05000462 (1)/* Anomalies that don't exist on this proc */ #define ANOMALY_05000099 (0)
@@ -78,24 +80,30 @@#define ANOMALY_05000158 (0)#define ANOMALY_05000171 (0)#define ANOMALY_05000179 (0) +#define ANOMALY_05000182 (0)#define ANOMALY_05000183 (0)#define ANOMALY_05000198 (0) +#define ANOMALY_05000202 (0)#define ANOMALY_05000215 (0)#define ANOMALY_05000220 (0)#define ANOMALY_05000227 (0)#define ANOMALY_05000230 (0)#define ANOMALY_05000231 (0)#define ANOMALY_05000233 (0) +#define ANOMALY_05000234 (0)#define ANOMALY_05000242 (0)#define ANOMALY_05000244 (0)#define ANOMALY_05000248 (0)#define ANOMALY_05000250 (0) +#define ANOMALY_05000257 (0)#define ANOMALY_05000261 (0)#define ANOMALY_05000263 (0)#define ANOMALY_05000266 (0)#define ANOMALY_05000273 (0)#define ANOMALY_05000274 (0)#define ANOMALY_05000278 (0) +#define ANOMALY_05000281 (0) +#define ANOMALY_05000283 (0)#define ANOMALY_05000285 (0)#define ANOMALY_05000287 (0)#define ANOMALY_05000301 (0)
@@ -103,10 +111,13 @@#define ANOMALY_05000307 (0)#define ANOMALY_05000311 (0)#define ANOMALY_05000312 (0) +#define ANOMALY_05000315 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000353 (0) +#define ANOMALY_05000357 (0)#define ANOMALY_05000362 (1)#define ANOMALY_05000363 (0) +#define ANOMALY_05000371 (0)#define ANOMALY_05000380 (0)#define ANOMALY_05000386 (0)#define ANOMALY_05000389 (0)
@@ -117,5 +128,7 @@#define ANOMALY_05000448 (0)#define ANOMALY_05000456 (0)#define ANOMALY_05000450 (0) +#define ANOMALY_05000465 (0) +#define ANOMALY_05000467 (0)#endif
arch/blackfin/mach-bf527/include/mach/anomaly.h +13 -2
@@ -34,7 +34,7 @@#define _ANOMALY_BF527 (rev527) (ANOMALY_BF527 && __SILICON_REVISION__ rev527)#define _ANOMALY_BF526_BF527 (rev526, rev527) (_ANOMALY_BF526(rev526) || _ANOMALY_BF527(rev527)) -/* Multi-issue instruction with dsp32shiftimm in slot1 and P-reg store in slot 2 not supported */ +/* 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)/* note: brokenness is noted in documentation, not anomaly sheet */
@@ -184,8 +184,12 @@#define ANOMALY_05000456 (1)/* Host DMA Port Responds to Certain Bus Activity Without HOST_CE Assertion */ #define ANOMALY_05000457 (1) -/* False Hardware Error when RETI points to invalid memory */ +/* False Hardware Error when RETI Points to Invalid Memory */ #define ANOMALY_05000461 (1) +/* USB Rx DMA hang */ +#define ANOMALY_05000465 (1) +/* Possible RX data corruption when control & data EP FIFOs are accessed via the core */ +#define ANOMALY_05000467 (1)/* Anomalies that don't exist on this proc */ #define ANOMALY_05000099 (0)
@@ -195,24 +199,30 @@#define ANOMALY_05000158 (0)#define ANOMALY_05000171 (0)#define ANOMALY_05000179 (0) +#define ANOMALY_05000182 (0)#define ANOMALY_05000183 (0)#define ANOMALY_05000198 (0) +#define ANOMALY_05000202 (0)#define ANOMALY_05000215 (0)#define ANOMALY_05000220 (0)#define ANOMALY_05000227 (0)#define ANOMALY_05000230 (0)#define ANOMALY_05000231 (0)#define ANOMALY_05000233 (0) +#define ANOMALY_05000234 (0)#define ANOMALY_05000242 (0)#define ANOMALY_05000244 (0)#define ANOMALY_05000248 (0)#define ANOMALY_05000250 (0) +#define ANOMALY_05000257 (0)#define ANOMALY_05000261 (0)#define ANOMALY_05000263 (0)#define ANOMALY_05000266 (0)#define ANOMALY_05000273 (0)#define ANOMALY_05000274 (0)#define ANOMALY_05000278 (0) +#define ANOMALY_05000281 (0) +#define ANOMALY_05000283 (0)#define ANOMALY_05000285 (0)#define ANOMALY_05000287 (0)#define ANOMALY_05000301 (0)
@@ -220,6 +230,7 @@#define ANOMALY_05000307 (0)#define ANOMALY_05000311 (0)#define ANOMALY_05000312 (0) +#define ANOMALY_05000315 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000362 (1)#define ANOMALY_05000363 (0)
arch/blackfin/mach-bf533/include/mach/anomaly.h +40 -37
228 lines not on this page · raw message
arch/blackfin/mach-bf537/include/mach/anomaly.h +23 -18
127 lines not on this page · raw message
arch/blackfin/mach-bf538/include/mach/anomaly.h +16 -8
@@ -30,13 +30,13 @@# define ANOMALY_BF539 0#endif -/* Multi-issue instruction with dsp32shiftimm in slot1 and P-reg store in slot 2 not supported */ +/* 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) -/* PPI Data Lengths Between 8 and 16 Do Not Zero Out Upper Bits */ +/* PPI Data Lengths between 8 and 16 Do Not Zero Out Upper Bits */ #define ANOMALY_05000166 (1)/* PPI_COUNT Cannot Be Programmed to 0 in General Purpose TX or RX Modes */ #define ANOMALY_05000179 (1)
@@ -70,11 +70,11 @@#define ANOMALY_05000277 (__SILICON_REVISION__ < 4)/* Disabling Peripherals with DMA Running May Cause DMA System Instability */ #define ANOMALY_05000278 (__SILICON_REVISION__ < 4) -/* False Hardware Error Exception When ISR Context Is Not Restored */ +/* False Hardware Error Exception when ISR Context Is Not Restored */ #define ANOMALY_05000281 (__SILICON_REVISION__ < 4)/* Memory DMA Corruption with 32-Bit Data and Traffic Control */ #define ANOMALY_05000282 (__SILICON_REVISION__ < 4) -/* System MMR Write Is Stalled Indefinitely When Killed in a Particular Stage */ +/* System MMR Write Is Stalled Indefinitely when Killed in a Particular Stage */ #define ANOMALY_05000283 (__SILICON_REVISION__ < 4)/* SPORTs May Receive Bad Data If FIFOs Fill Up */ #define ANOMALY_05000288 (__SILICON_REVISION__ < 4)
@@ -92,11 +92,11 @@#define ANOMALY_05000307 (__SILICON_REVISION__ < 4)/* False Hardware Errors Caused by Fetches at the Boundary of Reserved Memory */ #define ANOMALY_05000310 (1) -/* Errors When SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */ +/* Errors when SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */ #define ANOMALY_05000312 (__SILICON_REVISION__ < 5)/* PPI Is Level-Sensitive on First Transfer In Single Frame Sync Modes */ #define ANOMALY_05000313 (__SILICON_REVISION__ < 4) -/* Killed System MMR Write Completes Erroneously On Next System MMR Access */ +/* Killed System MMR Write Completes Erroneously on Next System MMR Access */ #define ANOMALY_05000315 (__SILICON_REVISION__ < 4)/* PFx Glitch on Write to FIO_FLAG_D or FIO_FLAG_T */ #define ANOMALY_05000318 (ANOMALY_BF539 && __SILICON_REVISION__ < 4)
@@ -110,7 +110,7 @@#define ANOMALY_05000371 (__SILICON_REVISION__ < 5)/* Entering Hibernate State with Peripheral Wakeups Enabled Draws Excess Current */ #define ANOMALY_05000374 (__SILICON_REVISION__ == 4) -/* New Feature: Open-Drain GPIO Outputs on PC1 and PC4 (Not Available on Older Silicon) */ +/* GPIO Pins PC1 and PC4 Can Function as Normal Outputs */ #define ANOMALY_05000375 (__SILICON_REVISION__ < 4)/* SSYNC Stalls Processor when Executed from Non-Cacheable Memory */ #define ANOMALY_05000402 (__SILICON_REVISION__ < 4)
@@ -126,26 +126,32 @@#define ANOMALY_05000436 (__SILICON_REVISION__ > 3)/* IFLUSH Instruction at End of Hardware Loop Causes Infinite Stall */ #define ANOMALY_05000443 (1) -/* False Hardware Error when RETI points to invalid memory */ +/* False Hardware Error when RETI Points to Invalid Memory */ #define ANOMALY_05000461 (1)/* Anomalies that don't exist on this proc */ #define ANOMALY_05000099 (0)#define ANOMALY_05000120 (0) +#define ANOMALY_05000125 (0)#define ANOMALY_05000149 (0)#define ANOMALY_05000158 (0)#define ANOMALY_05000171 (0) +#define ANOMALY_05000182 (0)#define ANOMALY_05000198 (0) +#define ANOMALY_05000202 (0)#define ANOMALY_05000215 (0)#define ANOMALY_05000220 (0)#define ANOMALY_05000227 (0)#define ANOMALY_05000230 (0)#define ANOMALY_05000231 (0) +#define ANOMALY_05000234 (0)#define ANOMALY_05000242 (0)#define ANOMALY_05000248 (0)#define ANOMALY_05000250 (0)#define ANOMALY_05000254 (0) +#define ANOMALY_05000257 (0)#define ANOMALY_05000263 (0) +#define ANOMALY_05000266 (0)#define ANOMALY_05000274 (0)#define ANOMALY_05000287 (0)#define ANOMALY_05000305 (0)
@@ -166,5 +172,7 @@#define ANOMALY_05000448 (0)#define ANOMALY_05000456 (0)#define ANOMALY_05000450 (0) +#define ANOMALY_05000465 (0) +#define ANOMALY_05000467 (0)#endif
arch/blackfin/mach-bf548/include/mach/anomaly.h +15 -5
@@ -18,7 +18,7 @@# error will not work on BF548 silicon version 0.0, or 0.1#endif -/* Multi-issue instruction with dsp32shiftimm in slot1 and P-reg store in slot 2 not supported */ +/* 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)
@@ -30,17 +30,17 @@#define ANOMALY_05000265 (1)/* Certain Data Cache Writethrough Modes Fail for Vddint <= 0.9V */ #define ANOMALY_05000272 (1) -/* False Hardware Error Exception When ISR Context Is Not Restored */ +/* False Hardware Error Exception when ISR Context Is Not Restored */ #define ANOMALY_05000281 (__SILICON_REVISION__ < 1)/* SSYNCs After Writes To CAN/DMA MMR Registers Are Not Always Handled Correctly */ #define ANOMALY_05000304 (__SILICON_REVISION__ < 1)/* False Hardware Errors Caused by Fetches at the Boundary of Reserved Memory */ #define ANOMALY_05000310 (1) -/* Errors When SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */ +/* Errors when SSYNC, CSYNC, or Loads to LT, LB and LC Registers Are Interrupted */ #define ANOMALY_05000312 (__SILICON_REVISION__ < 1)/* TWI Slave Boot Mode Is Not Functional */ #define ANOMALY_05000324 (__SILICON_REVISION__ < 1) -/* External FIFO Boot Mode Is Not Functional */ +/* FIFO Boot Mode Not Functional */ #define ANOMALY_05000325 (__SILICON_REVISION__ < 2)/* Data Lost When Core and DMA Accesses Are Made to the USB FIFO Simultaneously */ #define ANOMALY_05000327 (__SILICON_REVISION__ < 1)
@@ -178,8 +178,12 @@#define ANOMALY_05000450 (1)/* USB Receive Interrupt Is Not Generated in DMA Mode 1 */ #define ANOMALY_05000456 (__SILICON_REVISION__ < 3) -/* False Hardware Error when RETI points to invalid memory */ +/* False Hardware Error when RETI Points to Invalid Memory */ #define ANOMALY_05000461 (1) +/* USB Rx DMA hang */ +#define ANOMALY_05000465 (1) +/* Possible RX data corruption when control & data EP FIFOs are accessed via the core */ +#define ANOMALY_05000467 (1)/* Anomalies that don't exist on this proc */ #define ANOMALY_05000099 (0)
@@ -189,30 +193,36 @@#define ANOMALY_05000158 (0)#define ANOMALY_05000171 (0)#define ANOMALY_05000179 (0) +#define ANOMALY_05000182 (0)#define ANOMALY_05000183 (0)#define ANOMALY_05000198 (0) +#define ANOMALY_05000202 (0)#define ANOMALY_05000215 (0)#define ANOMALY_05000220 (0)#define ANOMALY_05000227 (0)#define ANOMALY_05000230 (0)#define ANOMALY_05000231 (0)#define ANOMALY_05000233 (0) +#define ANOMALY_05000234 (0)#define ANOMALY_05000242 (0)#define ANOMALY_05000244 (0)#define ANOMALY_05000248 (0)#define ANOMALY_05000250 (0)#define ANOMALY_05000254 (0) +#define ANOMALY_05000257 (0)#define ANOMALY_05000261 (0)#define ANOMALY_05000263 (0)#define ANOMALY_05000266 (0)#define ANOMALY_05000273 (0)#define ANOMALY_05000274 (0)#define ANOMALY_05000278 (0) +#define ANOMALY_05000283 (0)#define ANOMALY_05000287 (0)#define ANOMALY_05000301 (0)#define ANOMALY_05000305 (0)#define ANOMALY_05000307 (0)#define ANOMALY_05000311 (0) +#define ANOMALY_05000315 (0)#define ANOMALY_05000323 (0)#define ANOMALY_05000362 (1)#define ANOMALY_05000363 (0)
arch/blackfin/mach-bf561/include/mach/anomaly.h +46 -43
238 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 5/25 Blackfin: redo handling of bad irqs
In reply to Mike FrysingerWith the common IRQ code initializing much more of the irq_desc state, we can't blindly initialize it ourselves to the local bad_irq state. If we do, we end up wrongly clobbering many fields. So punt most of the bad irq code as the common layers will handle the default state, and simply call handle_bad_irq() directly when the IRQ we are processing is invalid.
--- arch/blackfin/kernel/irqchip.c | 53 ++++++++------------------------------- 1 files changed, 11 insertions(+), 42 deletions(-)
arch/blackfin/kernel/irqchip.c +11 -42
@@ -38,38 +38,15 @@#include <asm/pda.h> static atomic_t irq_err_count; -static spinlock_t irq_controller_lock; - -/* -* Dummy mask/unmask handler -*/ -void dummy_mask_unmask_irq (unsigned int irq) -{ -} -void ack_bad_irq (unsigned int irq) {atomic_inc (&irq_err_count);printk (KERN_ERR "IRQ: spurious interrupt %d\n" , irq); } -static struct irq_chip bad_chip = { - .ack = dummy_mask_unmask_irq, - .mask = dummy_mask_unmask_irq, - .unmask = dummy_mask_unmask_irq, -}; - -static int bad_stats;static struct irq_desc bad_irq_desc = { - .status =IRQ_DISABLED , - .chip = &bad_chip, .handle_irq = handle_bad_irq, - .depth =1 , .lock =__SPIN_LOCK_UNLOCKED (irq_desc->lock), - .kstat_irqs = &bad_stats, -#ifdef CONFIG_SMP - .affinity =CPU_MASK_ALL -#endif };#ifdef CONFIG_CPUMASK_OFFSTACK
@@ -119,21 +96,13 @@ __attribute__((l1_text))#endif asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) { -struct pt_regs *old_regs; -struct irq_desc *desc = irq_desc + irq;#ifndef CONFIG_IPIPE unsigned short pending, other_ints;#endif - old_regs =set_irq_regs (regs); - -/* -* Some hardware gives randomly wrong interrupts. Rather -* than crashing, do something sensible. -*/ -if (irq >=NR_IRQS ) - desc = &bad_irq_desc; +struct pt_regs *old_regs =set_irq_regs (regs);irq_enter (); +#ifdef CONFIG_DEBUG_STACKOVERFLOW /* Debugging check for stack overflow: is there less than STACK_WARN free? */ {
@@ -149,7 +118,15 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) } }#endif -generic_handle_irq (irq); + +/* +* Some hardware gives randomly wrong interrupts. Rather +* than crashing, do something sensible. +*/ +if (irq >=NR_IRQS ) +handle_bad_irq (irq, &bad_irq_desc); +else +generic_handle_irq (irq);#ifndef CONFIG_IPIPE /*
@@ -173,14 +150,6 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)void __init init_IRQ (void ) { -struct irq_desc *desc; -int irq; - -spin_lock_init (&irq_controller_lock); -for (irq =0 , desc = irq_desc; irq <NR_IRQS ; irq++, desc++) { - *desc = bad_irq_desc; - } -init_arch_irq ();#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND
Signature · 1 line
1.6.3.1
PATCH 6/25 Blackfin: only build show_interrupts() when procfs is enabled
In reply to Mike Frysinger--- arch/blackfin/kernel/irqchip.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/blackfin/kernel/irqchip.c +2 -0
@@ -54,6 +54,7 @@ static struct irq_desc bad_irq_desc = {#error "Blackfin architecture does not support CONFIG_CPUMASK_OFFSTACK."#endif +#ifdef CONFIG_PROC_FS int show_interrupts (struct seq_file *p,void *v) {int i = *(loff_t *) v, j;
@@ -85,6 +86,7 @@ int show_interrupts(struct seq_file *p, void *v) }return 0 ; } +#endif /* * do_IRQ handles all hardware IRQs. Decoded IRQs should not
Signature · 1 line
1.6.3.1
PATCH 7/25 Blackfin: simplify irq stack overflow checking
In reply to Mike FrysingerTake a page from x86 and abstract the stack checking out of the asm_do_IRQ() function so that the result is easier to digest.
--- arch/blackfin/kernel/irqchip.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-)
arch/blackfin/kernel/irqchip.c +17 -15
@@ -88,6 +88,22 @@ int show_interrupts(struct seq_file *p, void *v) }#endif +#ifdef CONFIG_DEBUG_STACKOVERFLOW +static void check_stack_overflow (int irq) +{ +/* Debugging check for stack overflow: is there less than STACK_WARN free? */ +long sp =__get_SP () & (THREAD_SIZE -1 ); + +if (unlikely (sp < (sizeof (struct thread_info ) +STACK_WARN ))) { +dump_stack (); +pr_emerg ("irq%i: possible stack overflow only %ld bytes free\n" , + irq, sp -sizeof (struct thread_info )); + } +} +#else +static inline void check_stack_overflow (int irq) { } +#endif +/* * do_IRQ handles all hardware IRQs. Decoded IRQs should not * come via this function. Instead, they should provide their
@@ -105,21 +121,7 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)irq_enter (); -#ifdef CONFIG_DEBUG_STACKOVERFLOW -/* Debugging check for stack overflow: is there less than STACK_WARN free? */ - { -long sp; - - sp =__get_SP () & (THREAD_SIZE -1 ); - -if (unlikely (sp < (sizeof (struct thread_info ) +STACK_WARN ))) { -dump_stack (); -printk (KERN_EMERG "%s: possible stack overflow while handling irq %i " -" only %ld bytes free\n" , - __func__, irq, sp -sizeof (struct thread_info )); - } - } -#endif +check_stack_overflow (irq);/* * Some hardware gives randomly wrong interrupts. Rather
Signature · 1 line
1.6.3.1
PATCH 8/25 Blackfin: abstract irq14 lowering in do_irq
In reply to Mike FrysingerSplit out the optional IRQ14 lowering code to further simplify the asm_do_IRQ() function and keep the ifdef nest under control.
--- arch/blackfin/kernel/irqchip.c | 43 +++++++++++++++++++++++---------------- 1 files changed, 25 insertions(+), 18 deletions(-)
arch/blackfin/kernel/irqchip.c +25 -18
@@ -104,6 +104,29 @@ static void check_stack_overflow(int irq)static inline void check_stack_overflow (int irq) { }#endif +#ifndef CONFIG_IPIPE +static void maybe_lower_to_irq14 (void ) +{ +unsigned short pending, other_ints; + +/* +* If we're the only interrupt running (ignoring IRQ15 which +* is for syscalls), lower our priority to IRQ14 so that +* softirqs run at that level. If there's another, +* lower-level interrupt, irq_exit will defer softirqs to +* that. If the interrupt pipeline is enabled, we are already +* running at IRQ14 priority, so we don't need this code. +*/ +CSYNC (); + pending =bfin_read_IPEND () & ~0x8000 ; + other_ints = pending & (pending -1 ); +if (other_ints ==0 ) +lower_to_irq14 (); +} +#else +static inline void maybe_lower_to_irq14 (void ) { } +#endif +/* * do_IRQ handles all hardware IRQs. Decoded IRQs should not * come via this function. Instead, they should provide their
@@ -114,9 +137,6 @@ __attribute__((l1_text))#endif asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs) { -#ifndef CONFIG_IPIPE -unsigned short pending, other_ints; -#endif struct pt_regs *old_regs =set_irq_regs (regs);irq_enter ();
@@ -132,21 +152,8 @@ asmlinkage void asm_do_IRQ(unsigned int irq, struct pt_regs *regs)else generic_handle_irq (irq); -#ifndef CONFIG_IPIPE -/* -* If we're the only interrupt running (ignoring IRQ15 which -* is for syscalls), lower our priority to IRQ14 so that -* softirqs run at that level. If there's another, -* lower-level interrupt, irq_exit will defer softirqs to -* that. If the interrupt pipeline is enabled, we are already -* running at IRQ14 priority, so we don't need this code. -*/ -CSYNC (); - pending =bfin_read_IPEND () & ~0x8000 ; - other_ints = pending & (pending -1 ); -if (other_ints ==0 ) -lower_to_irq14 (); -#endif /* !CONFIG_IPIPE */ +maybe_lower_to_irq14 (); +irq_exit ();set_irq_regs (old_regs);
Signature · 1 line
1.6.3.1
PATCH 9/25 Blackfin: fix accidental reset in some boot modes
In reply to Mike FrysingerFrom: Sonic Zhang <[email protected]>
We read the SWRST (Software Reset) register to get at the last reset state, and then we may configure the DOUBLE_FAULT bit to control behavior when a double fault occurs. But if the lower bits of the register is already set (like UART boot mode on a BF54x), we inadvertently make the system reset by writing to the SYSTEM_RESET field at the same time. So make sure the lower 4 bits are always cleared.
--- arch/blackfin/kernel/setup.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/blackfin/kernel/setup.c +2 -1
@@ -837,7 +837,8 @@ void __init setup_arch(char **cmdline_p) defined(CONFIG_BF538) || defined(CONFIG_BF539) _bfin_swrst =bfin_read_SWRST ();#else - _bfin_swrst =bfin_read_SYSCR (); +/* Clear boot mode field */ + _bfin_swrst =bfin_read_SYSCR () & ~0xf ;#endif #ifdef CONFIG_DEBUG_DOUBLEFAULT_PRINT
Signature · 1 line
1.6.3.1
PATCH 10/25 Blackfin: bf526-ezbrd: set SPI flash resources to SST device
In reply to Mike FrysingerFrom: Graf Yang <[email protected]>
The BF526-EZBRD has a SST SPI flash on it, not a ST Micro.
--- arch/blackfin/mach-bf527/boards/ezbrd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/blackfin/mach-bf527/boards/ezbrd.c +2 -2
@@ -237,10 +237,10 @@ static struct flash_platform_data bfin_spi_flash_data = { .name = "m25p80", .parts = bfin_spi_flash_partitions, .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions), - .type = "m25p16", + .type = "sst25wf040", }; -/* SPI flash chip (m25p64) */ +/* SPI flash chip (sst25wf040) */ static struct bfin5xx_spi_chip spi_flash_chip_info = { .enable_dma =0 ,/* use dma transfer with this chip*/ .bits_per_word =8 ,
Signature · 1 line
1.6.3.1
PATCH 11/25 Blackfin: allow people to select BF51x-0.1 silicon rev
In reply to Mike FrysingerNow that 0.1 of the BF51x is coming out, allow people to build for it.
--- arch/blackfin/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/Kconfig +1 -1
@@ -274,7 +274,7 @@ config BF_REV_0_0 config BF_REV_0_1 bool "0.1" - depends on (BF52x || (BF54x && !BF54xM)) + depends on (BF51x || BF52x || (BF54x && !BF54xM)) config BF_REV_0_2 bool "0.2"
Signature · 1 line
1.6.3.1
PATCH 12/25 Blackfin: convert interrupt pipeline to irqflags
In reply to Mike FrysingerFrom: Philippe Gerum <[email protected]>
--- arch/blackfin/include/asm/ipipe_base.h | 30 +++--- arch/blackfin/include/asm/irq.h | 7 -- arch/blackfin/include/asm/irqflags.h | 164 ++++++++++++++++++++++++++++++- arch/blackfin/include/asm/system.h | 4 +- arch/blackfin/kernel/ipipe.c | 2 +- 5 files changed, 177 insertions(+), 30 deletions(-)
arch/blackfin/include/asm/ipipe_base.h +15 -15
@@ -51,23 +51,23 @@extern unsigned long __ipipe_root_status;/* Alias to ipipe_root_cpudom_var(status) */ -static inline void __ipipe_stall_root (void ) -{ -volatile unsigned long *p = &__ipipe_root_status; -set_bit (0 , p); -} +#define __ipipe_stall_root () \ + do { \ + volatile unsigned long *p = &__ipipe_root_status; \ + set_bit(0, p); \ + } while (0) -static inline unsigned long __ipipe_test_and_stall_root (void ) -{ -volatile unsigned long *p = &__ipipe_root_status; -return test_and_set_bit (0 , p); -} +#define __ipipe_test_and_stall_root () \ + ({ \ + volatile unsigned long *p = &__ipipe_root_status; \ + test_and_set_bit(0, p); \ + }) -static inline unsigned long __ipipe_test_root (void ) -{ -const unsigned long *p = &__ipipe_root_status; -return test_bit (0 , p); -} +#define __ipipe_test_root () \ + ({ \ + const unsigned long *p = &__ipipe_root_status; \ + test_bit(0, p); \ + })#endif /* !__ASSEMBLY__ */
arch/blackfin/include/asm/irq.h +0 -7
@@ -22,13 +22,6 @@/* SYS_IRQS and NR_IRQS are defined in <mach-bf5xx/irq.h> */ #include <mach/irq.h> -/* Xenomai IPIPE helpers */ -#define local_irq_restore_hw (x) local_irq_restore(x) -#define local_irq_save_hw (x) local_irq_save(x) -#define local_irq_enable_hw (x) local_irq_enable(x) -#define local_irq_disable_hw (x) local_irq_disable(x) -#define irqs_disabled_hw (x) irqs_disabled(x) -#if ANOMALY_05000244 && defined(CONFIG_BFIN_ICACHE )# define NOP_PAD_ANOMALY_05000244 "nop; nop;"#else
arch/blackfin/include/asm/irqflags.h +158 -6
180 lines not on this page · raw message
arch/blackfin/include/asm/system.h +3 -1
@@ -135,11 +135,13 @@ struct __xchg_dummy { };#define __xg (x) ((volatile struct __xchg_dummy *)(x)) +#include <mach/blackfin.h> +static inline unsigned long __xchg (unsigned long x,volatile void *ptr,int size) {unsigned long tmp =0 ; -unsigned long flags =0 ; +unsigned long flags;local_irq_save_hw (flags);
arch/blackfin/kernel/ipipe.c +1 -1
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(__ipipe_freq_scale);atomic_t __ipipe_irq_lvdepth[IVG15 +1 ]; -unsigned long __ipipe_irq_lvmask = __all_masked_irq_flags; +unsigned long __ipipe_irq_lvmask = bfin_no_irqs;EXPORT_SYMBOL (__ipipe_irq_lvmask);static void __ipipe_ack_irq (unsigned irq,struct irq_desc *desc)
Signature · 1 line
1.6.3.1
PATCH 13/25 Blackfin: allow CONFIG_TICKSOURCE_GPTMR0 with interrupt pipeline
In reply to Mike FrysingerFrom: Philippe Gerum <[email protected]>
--- arch/blackfin/Kconfig | 1 - arch/blackfin/include/asm/ipipe.h | 7 ++++- arch/blackfin/mach-common/ints-priority.c | 47 +++++++++++++--------------- 3 files changed, 28 insertions(+), 27 deletions(-)
arch/blackfin/Kconfig +0 -1
@@ -623,7 +623,6 @@ choice config TICKSOURCE_GPTMR0 bool "Gptimer0 (SCLK domain)" select BFIN_GPTIMERS - depends on !IPIPE config TICKSOURCE_CORETMR bool "Core timer (CCLK domain)"
arch/blackfin/include/asm/ipipe.h +6 -1
@@ -207,7 +207,7 @@ void ipipe_init_irq_threads(void);int ipipe_start_irq_thread (unsigned irq,struct irq_desc *desc); -#ifdef CONFIG_GENERIC_CLOCKEVENTS +#ifdef CONFIG_TICKSOURCE_CORETMR #define IRQ_SYSTMR IRQ_CORETMR#define IRQ_PRIOTMR IRQ_CORETMR#else
@@ -240,8 +240,13 @@ int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc);#define ipipe_init_irq_threads () do { } while (0)#define ipipe_start_irq_thread (irq, desc) 0 +#ifndef CONFIG_TICKSOURCE_GPTMR0 #define IRQ_SYSTMR IRQ_CORETMR#define IRQ_PRIOTMR IRQ_CORETMR +#else +#define IRQ_SYSTMR IRQ_TIMER0 +#define IRQ_PRIOTMR CONFIG_IRQ_TIMER0 +#endif #define __ipipe_root_tick_p (regs) 1
arch/blackfin/mach-common/ints-priority.c +22 -25
84 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 14/25 Blackfin: remove obsolete mcount support from I-pipe code
In reply to Mike FrysingerFrom: Philippe Gerum <[email protected]>
--- arch/blackfin/kernel/Makefile | 1 - arch/blackfin/kernel/ipipe.c | 5 --- arch/blackfin/kernel/mcount.S | 70 ----------------------------------------- 3 files changed, 0 insertions(+), 76 deletions(-) delete mode 100644 arch/blackfin/kernel/mcount.S
arch/blackfin/kernel/Makefile +0 -1
@@ -20,7 +20,6 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o CFLAGS_REMOVE_ftrace.o = -pg obj-$(CONFIG_IPIPE) += ipipe.o -obj-$(CONFIG_IPIPE_TRACE_MCOUNT) += mcount.o obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o obj-$(CONFIG_CPLB_INFO) += cplbinfo.o obj-$(CONFIG_MODULES) += module.o
arch/blackfin/kernel/ipipe.c +0 -5
@@ -342,8 +342,3 @@ void ___ipipe_sync_pipeline(unsigned long syncmask) }EXPORT_SYMBOL (show_stack); - -#ifdef CONFIG_IPIPE_TRACE_MCOUNT -void notrace _mcount(void); -EXPORT_SYMBOL (_mcount); -#endif /* CONFIG_IPIPE_TRACE_MCOUNT */
arch/blackfin/kernel/mcount.S deleted +0 -70
70 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 15/25 Blackfin: update I-pipe patch level
In reply to Mike FrysingerFrom: Philippe Gerum <[email protected]>
--- arch/blackfin/include/asm/ipipe.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/blackfin/include/asm/ipipe.h +2 -2
@@ -35,9 +35,9 @@#include <asm/atomic.h> #include <asm/traps.h> -#define IPIPE_ARCH_STRING "1.10-00" +#define IPIPE_ARCH_STRING "1.11-00"#define IPIPE_MAJOR_NUMBER 1 -#define IPIPE_MINOR_NUMBER 10 +#define IPIPE_MINOR_NUMBER 11#define IPIPE_PATCH_NUMBER 0#ifdef CONFIG_SMP
Signature · 1 line
1.6.3.1
PATCH 16/25 Blackfin: decouple unrelated cache settings to get exact behavior
In reply to Mike FrysingerFrom: Jie Zhang <[email protected]>
The current cache options don't really represent the hardware features. They end up setting different aspects of the hardware so that the end result is to turn on/off the cache. Unfortunately, when we hit cache problems with the hardware, it's difficult to test different settings to root cause the problem. The current settings also don't cleanly allow for different caching behaviors with different regions of memory.
So split the configure options such that they properly reflect the settings that are applied to the hardware.
--- arch/blackfin/Kconfig | 57 ++++++++++++------ arch/blackfin/include/asm/cache.h | 4 +- arch/blackfin/include/asm/cacheflush.h | 10 ++-- arch/blackfin/include/asm/cplb.h | 30 +++++---- arch/blackfin/kernel/cplb-mpu/cplbinit.c | 10 ++-- arch/blackfin/kernel/cplb-mpu/cplbmgr.c | 36 ++++++++---- arch/blackfin/kernel/setup.c | 96 ++++++++++++++++++++++++------ arch/blackfin/mach-common/arch_checks.c | 4 +- arch/blackfin/mach-common/cpufreq.c | 2 +- arch/blackfin/mach-common/pm.c | 4 +- arch/blackfin/mm/init.c | 2 +- 11 files changed, 175 insertions(+), 80 deletions(-)
arch/blackfin/Kconfig +39 -18
@@ -907,23 +907,41 @@ endchoice comment "Cache Support" + config BFIN_ICACHE bool "Enable ICACHE" + default y +config BFIN_ICACHE_LOCK + bool "Enable Instruction Cache Locking" + depends on BFIN_ICACHE + default n +config BFIN_EXTMEM_ICACHEABLE + bool "Enable ICACHE for external memory" + depends on BFIN_ICACHE + default y +config BFIN_L2_ICACHEABLE + bool "Enable ICACHE for L2 SRAM" + depends on BFIN_ICACHE + depends on BF54x || BF561 + default n + config BFIN_DCACHE bool "Enable DCACHE" + default y config BFIN_DCACHE_BANKA bool "Enable only 16k BankA DCACHE - BankB is SRAM" depends on BFIN_DCACHE && !BF531 default n -config BFIN_ICACHE_LOCK - bool "Enable Instruction Cache Locking" - -choice - prompt "External memory cache policy" +config BFIN_EXTMEM_DCACHEABLE + bool "Enable DCACHE for external memory" depends on BFIN_DCACHE - default BFIN_WB if !SMP - default BFIN_WT if SMP -config BFIN_WB + default y +choice + prompt "External memory DCACHE policy" + depends on BFIN_EXTMEM_DCACHEABLE + default BFIN_EXTMEM_WRITEBACK if !SMP + default BFIN_EXTMEM_WRITETHROUGH if SMP +config BFIN_EXTMEM_WRITEBACK bool "Write back" depends on !SMP help
@@ -941,7 +959,7 @@ config BFIN_WB If you are unsure of the options and you want to be safe, then go with Write Through. -config BFIN_WT +config BFIN_EXTMEM_WRITETHROUGH bool "Write through" help Write Back Policy:
@@ -960,23 +978,26 @@ config BFIN_WT endchoice +config BFIN_L2_DCACHEABLE + bool "Enable DCACHE for L2 SRAM" + depends on BFIN_DCACHE + depends on BF54x || BF561 + default n choice - prompt "L2 SRAM cache policy" - depends on (BF54x || BF561) - default BFIN_L2_WT -config BFIN_L2_WB + prompt "L2 SRAM DCACHE policy" + depends on BFIN_L2_DCACHEABLE + default BFIN_L2_WRITEBACK +config BFIN_L2_WRITEBACK bool "Write back" depends on !SMP -config BFIN_L2_WT +config BFIN_L2_WRITETHROUGH bool "Write through" depends on !SMP - -config BFIN_L2_NOT_CACHED - bool "Not cached" - endchoice + +comment "Memory Protection Unit" config MPU bool "Enable the memory protection unit (EXPERIMENTAL)" default n
arch/blackfin/include/asm/cache.h +2 -2
@@ -35,10 +35,10 @@#if defined(CONFIG_SMP ) && \ !defined(CONFIG_BFIN_CACHE_COHERENT ) -# if defined(CONFIG_BFIN_ICACHE ) +# if defined(CONFIG_BFIN_ICACHEABLE ) || defined(CONFIG_BFIN_L2_ICACHEABLE )# define __ARCH_SYNC_CORE_ICACHE# endif -# if defined(CONFIG_BFIN_DCACHE ) +# if defined(CONFIG_BFIN_DCACHEABLE ) || defined(CONFIG_BFIN_L2_DCACHEABLE )# define __ARCH_SYNC_CORE_DCACHE# endif #ifndef __ASSEMBLY__
arch/blackfin/include/asm/cacheflush.h +5 -5
@@ -56,7 +56,7 @@ extern void blackfin_invalidate_entire_icache(void);static inline void flush_icache_range (unsigned start,unsigned end) { -#if defined(CONFIG_BFIN_WB ) +#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK ) || defined(CONFIG_BFIN_L2_WRITEBACK )blackfin_dcache_flush_range (start, end);#endif
@@ -87,9 +87,9 @@ do { memcpy(dst, src, len); \#else # define invalidate_dcache_range (start,end) do { } while (0)#endif -#if defined(CONFIG_BFIN_DCACHE ) && defined(CONFIG_BFIN_WB ) +#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK ) || defined(CONFIG_BFIN_L2_WRITEBACK )# define flush_dcache_range (start,end) blackfin_dcache_flush_range((start), (end)) -# define flush_dcache_page (page) blackfin_dflush_page(page_address(page)) +# define flush_dcache_page (page) blackfin_dflush_page(page_address(page))#else # define flush_dcache_range (start,end) do { } while (0)# define flush_dcache_page (page) do { } while (0)
@@ -100,7 +100,7 @@ extern unsigned long reserved_mem_icache_on;static inline int bfin_addr_dcacheable (unsigned long addr) { -#ifdef CONFIG_BFIN_DCACHE +#ifdef CONFIG_BFIN_EXTMEM_DCACHEABLE if (addr < (_ramend -DMA_UNCACHED_REGION ))return 1 ;#endif
@@ -109,7 +109,7 @@ static inline int bfin_addr_dcacheable(unsigned long addr) addr >= _ramend && addr < physical_mem_end)return 1 ; -#ifndef CONFIG_BFIN_L2_NOT_CACHED +#ifdef CONFIG_BFIN_L2_DCACHEABLE if (addr >=L2_START && addr <L2_START +L2_LENGTH )return 1 ;#endif
arch/blackfin/include/asm/cplb.h +17 -15
@@ -37,8 +37,6 @@#define L1_IMEMORY ( CPLB_USER_RD | CPLB_VALID | CPLB_LOCK)#define SDRAM_INON_CHBL ( CPLB_USER_RD | CPLB_VALID) -/*Use the menuconfig cache policy here - CONFIG_BFIN_WT/CONFIG_BFIN_WB*/ -#if ANOMALY_05000158 #define ANOMALY_05000158_WORKAROUND 0x200#else
@@ -47,10 +45,12 @@#define CPLB_COMMON (CPLB_DIRTY | CPLB_SUPV_WR | CPLB_USER_WR | CPLB_USER_RD | CPLB_VALID | ANOMALY_05000158_WORKAROUND) -#ifdef CONFIG_BFIN_WB /*Write Back Policy */ +#ifdef CONFIG_BFIN_EXTMEM_WRITEBACK #define SDRAM_DGENERIC (CPLB_L1_CHBL | CPLB_COMMON) -#else /*Write Through */ +#elif defined(CONFIG_BFIN_EXTMEM_WRITETHROUGH )#define SDRAM_DGENERIC (CPLB_L1_CHBL | CPLB_WT | CPLB_L1_AOW | CPLB_COMMON) +#else +#define SDRAM_DGENERIC (CPLB_COMMON)#endif #define SDRAM_DNON_CHBL (CPLB_COMMON)
@@ -61,21 +61,23 @@#ifdef CONFIG_SMP #define L2_ATTR (INITIAL_T | I_CPLB | D_CPLB) -#define L2_IMEMORY (CPLB_COMMON) -#define L2_DMEMORY (CPLB_LOCK | CPLB_COMMON) +#define L2_IMEMORY (CPLB_COMMON | PAGE_SIZE_1MB) +#define L2_DMEMORY (CPLB_LOCK | CPLB_COMMON | PAGE_SIZE_1MB)#else #define L2_ATTR (INITIAL_T | SWITCH_T | I_CPLB | D_CPLB) -#define L2_IMEMORY (SDRAM_IGENERIC) - -# if defined(CONFIG_BFIN_L2_WB ) -# define L2_DMEMORY (CPLB_L1_CHBL | CPLB_COMMON) -# elif defined(CONFIG_BFIN_L2_WT ) -# define L2_DMEMORY (CPLB_L1_CHBL | CPLB_WT | CPLB_L1_AOW | CPLB_COMMON) -# elif defined(CONFIG_BFIN_L2_NOT_CACHED ) -# define L2_DMEMORY (CPLB_COMMON) +# if defined(CONFIG_BFIN_L2_ICACHEABLE ) +# define L2_IMEMORY (CPLB_L1_CHBL | CPLB_USER_RD | CPLB_VALID | PAGE_SIZE_1MB) +# else +# define L2_IMEMORY ( CPLB_USER_RD | CPLB_VALID | PAGE_SIZE_1MB) +# endif + +# if defined(CONFIG_BFIN_L2_WRITEBACK ) +# define L2_DMEMORY (CPLB_L1_CHBL | CPLB_COMMON | PAGE_SIZE_1MB) +# elif defined(CONFIG_BFIN_L2_WRITETHROUGH ) +# define L2_DMEMORY (CPLB_L1_CHBL | CPLB_WT | CPLB_L1_AOW | CPLB_COMMON | PAGE_SIZE_1MB)# else -# define L2_DMEMORY (0) +# define L2_DMEMORY (CPLB_COMMON | PAGE_SIZE_1MB)# endif #endif /* CONFIG_SMP */
arch/blackfin/kernel/cplb-mpu/cplbinit.c +5 -5
@@ -46,13 +46,13 @@ void __init generate_cplb_tables_cpu(unsigned int cpu)printk (KERN_INFO "MPU: setting up cplb tables with memory protection\n" ); -#ifdef CONFIG_BFIN_ICACHE +#ifdef CONFIG_BFIN_EXTMEM_ICACHEABLE i_cache =CPLB_L1_CHBL |ANOMALY_05000158_WORKAROUND ;#endif -#ifdef CONFIG_BFIN_DCACHE +#ifdef CONFIG_BFIN_EXTMEM_DCACHEABLE d_cache =CPLB_L1_CHBL ; -#ifdef CONFIG_BFIN_WT +#ifdef CONFIG_BFIN_EXTMEM_WRITETROUGH d_cache |=CPLB_L1_AOW |CPLB_WT ;#endif #endif
@@ -91,9 +91,9 @@ void __init generate_cplb_tables_cpu(unsigned int cpu)/* Cover L2 memory */ #if L2_LENGTH >0 dcplb_tbl[cpu][i_d].addr =L2_START ; - dcplb_tbl[cpu][i_d++].data =L2_DMEMORY |PAGE_SIZE_1MB ; + dcplb_tbl[cpu][i_d++].data =L2_DMEMORY ; icplb_tbl[cpu][i_i].addr =L2_START ; - icplb_tbl[cpu][i_i++].data =L2_IMEMORY |PAGE_SIZE_1MB ; + icplb_tbl[cpu][i_i++].data =L2_IMEMORY ;#endif first_mask_dcplb = i_d;
arch/blackfin/kernel/cplb-mpu/cplbmgr.c +24 -12
@@ -150,15 +150,19 @@ static noinline int dcplb_miss(unsigned int cpu) nr_dcplb_miss[cpu]++; d_data =CPLB_SUPV_WR |CPLB_VALID |CPLB_DIRTY |PAGE_SIZE_4KB ; -#ifdef CONFIG_BFIN_DCACHE +#ifdef CONFIG_BFIN_EXTMEM_DCACHEABLE if (bfin_addr_dcacheable (addr)) { d_data |=CPLB_L1_CHBL |ANOMALY_05000158_WORKAROUND ; -#ifdef CONFIG_BFIN_WT +# ifdef CONFIG_BFIN_EXTMEM_WRITETHROUGH d_data |=CPLB_L1_AOW |CPLB_WT ; -#endif +# endif }#endif -if (addr >= physical_mem_end) { + +if (L2_LENGTH && addr >=L2_START && addr <L2_START +L2_LENGTH ) { + addr =L2_START ; + d_data =L2_DMEMORY ; + }else if (addr >= physical_mem_end) {if (addr >=ASYNC_BANK0_BASE && addr <ASYNC_BANK3_BASE +ASYNC_BANK3_SIZE && (status &FAULT_USERSUPV )) { addr &= ~0x3fffff ;
@@ -235,7 +239,7 @@ static noinline int icplb_miss(unsigned int cpu) i_data =CPLB_VALID |CPLB_PORTPRIO |PAGE_SIZE_4KB ; -#ifdef CONFIG_BFIN_ICACHE +#ifdef CONFIG_BFIN_EXTMEM_ICACHEABLE /* * Normal RAM, and possibly the reserved memory area, are * cacheable.
@@ -245,7 +249,10 @@ static noinline int icplb_miss(unsigned int cpu) i_data |=CPLB_L1_CHBL |ANOMALY_05000158_WORKAROUND ;#endif -if (addr >= physical_mem_end) { +if (L2_LENGTH && addr >=L2_START && addr <L2_START +L2_LENGTH ) { + addr =L2_START ; + i_data =L2_IMEMORY ; + }else if (addr >= physical_mem_end) {if (addr >=BOOT_ROM_START && addr <BOOT_ROM_START +BOOT_ROM_LENGTH && (status &FAULT_USERSUPV )) { addr &= ~(1 *1024 *1024 -1 );
@@ -365,13 +372,18 @@ void set_mask_dcplbs(unsigned long *masks, unsigned int cpu)local_irq_save_hw (flags); current_rwx_mask[cpu] = masks; - d_data =CPLB_SUPV_WR |CPLB_VALID |CPLB_DIRTY |PAGE_SIZE_4KB ; -#ifdef CONFIG_BFIN_DCACHE - d_data |=CPLB_L1_CHBL ; -#ifdef CONFIG_BFIN_WT - d_data |=CPLB_L1_AOW |CPLB_WT ; -#endif +if (L2_LENGTH && addr >=L2_START && addr <L2_START +L2_LENGTH ) { + addr =L2_START ; + d_data =L2_DMEMORY ; + }else { + d_data =CPLB_SUPV_WR |CPLB_VALID |CPLB_DIRTY |PAGE_SIZE_4KB ; +#ifdef CONFIG_BFIN_EXTMEM_DCACHEABLE + d_data |=CPLB_L1_CHBL ; +# ifdef CONFIG_BFIN_EXTMEM_WRITETHROUGH + d_data |=CPLB_L1_AOW |CPLB_WT ; +# endif #endif + }disable_dcplb ();for (i = first_mask_dcplb; i < first_switched_dcplb; i++) {
arch/blackfin/kernel/setup.c +78 -18
131 lines not on this page · raw message
arch/blackfin/mach-common/arch_checks.c +2 -2
@@ -74,7 +74,7 @@/* if 220 exists, can not set External Memory WB and L2 not_cached, either External Memory not_cached and L2 WB */ #if ANOMALY_05000220 && \ - ((defined(CONFIG_BFIN_WB ) && defined(CONFIG_BFIN_L2_NOT_CACHED )) || \ - (!defined(CONFIG_BFIN_DCACHE ) && defined(CONFIG_BFIN_L2_WB ))) + ((defined(CONFIG_BFIN_EXTMEM_WRITEBACK ) && !defined(CONFIG_BFIN_L2_DCACHEABLE )) || \ + (!defined(CONFIG_BFIN_EXTMEM_DCACHEABLE ) && defined(CONFIG_BFIN_L2_WRITEBACK )))# error You are exposing Anomaly 220 in this config, either config L2 as Write Through, or make External Memory WB.#endif
arch/blackfin/mach-common/cpufreq.c +1 -1
@@ -141,7 +141,7 @@ static int __init __bfin_cpu_init(struct cpufreq_policy *policy) sclk =get_sclk () /1000 ;#if ANOMALY_05000273 ||ANOMALY_05000274 || \ - (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_DCACHE )) + (!defined(CONFIG_BF54x) && defined(CONFIG_BFIN_EXTMEM_DCACHEABLE )) min_cclk = sclk *2 ;#else min_cclk = sclk;
arch/blackfin/mach-common/pm.c +2 -2
@@ -132,7 +132,7 @@ int bf53x_resume_l1_mem(unsigned char *memptr)return 0 ; } -#ifdef CONFIG_BFIN_WB +#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK ) || defined(CONFIG_BFIN_L2_WRITEBACK )static void flushinv_all_dcache (void ) {u32 way, bank, subbank, set;
@@ -175,7 +175,7 @@ static inline void dcache_disable(void)#ifdef CONFIG_BFIN_DCACHE unsigned long ctrl; -#ifdef CONFIG_BFIN_WB +#if defined(CONFIG_BFIN_EXTMEM_WRITEBACK ) || defined(CONFIG_BFIN_L2_WRITEBACK )flushinv_all_dcache ();#endif SSYNC ();
arch/blackfin/mm/init.c +1 -1
@@ -160,7 +160,7 @@ void __init mem_init(void)/* do not count in kernel image between _rambase and _ramstart */ reservedpages -= (_ramstart - _rambase) >>PAGE_SHIFT ; -#if (defined(CONFIG_BFIN_ICACHE ) &&ANOMALY_05000263 ) +#if (defined(CONFIG_BFIN_EXTMEM_ICACHEABLE ) &&ANOMALY_05000263 ) reservedpages += (_ramend - memory_end -DMA_UNCACHED_REGION ) >>PAGE_SHIFT ;#endif
Signature · 1 line
1.6.3.1
PATCH 17/25 Blackfin: update defconfigs
In reply to Mike Frysinger--- arch/blackfin/configs/BF518F-EZBRD_defconfig | 24 ++++++++++++++-------- arch/blackfin/configs/BF526-EZBRD_defconfig | 22 +++++++++++--------- arch/blackfin/configs/BF527-EZKIT_defconfig | 22 +++++++++++++------- arch/blackfin/configs/BF533-EZKIT_defconfig | 25 ++++++++++++++++------- arch/blackfin/configs/BF533-STAMP_defconfig | 22 +++++++++++++------- arch/blackfin/configs/BF537-STAMP_defconfig | 22 +++++++++++++------- arch/blackfin/configs/BF538-EZKIT_defconfig | 22 +++++++++++++------- arch/blackfin/configs/BF548-EZKIT_defconfig | 27 +++++++++++++++---------- arch/blackfin/configs/BF561-EZKIT_defconfig | 27 +++++++++++++++---------- arch/blackfin/configs/BlackStamp_defconfig | 12 ++++++++-- arch/blackfin/configs/CM-BF527_defconfig | 22 +++++++++++++------- arch/blackfin/configs/CM-BF533_defconfig | 23 +++++++++++++-------- arch/blackfin/configs/CM-BF537E_defconfig | 22 +++++++++++++------- arch/blackfin/configs/CM-BF537U_defconfig | 23 +++++++++++++-------- arch/blackfin/configs/CM-BF548_defconfig | 25 +++++++++++++++-------- arch/blackfin/configs/CM-BF561_defconfig | 25 +++++++++++++++-------- arch/blackfin/configs/H8606_defconfig | 14 +++++++++--- arch/blackfin/configs/PNAV-10_defconfig | 20 ++++++++++++------ arch/blackfin/configs/SRV1_defconfig | 14 +++++++++--- arch/blackfin/configs/TCM-BF537_defconfig | 14 +++++++++--- 20 files changed, 272 insertions(+), 155 deletions(-)
arch/blackfin/configs/BF518F-EZBRD_defconfig +15 -9
@@ -326,11 +326,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -413,11 +419,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -916,7 +922,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y # CONFIG_MMC_SDHCI is not set CONFIG_SDH_BFIN=m CONFIG_SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND=y -CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ=y +# CONFIG_SDH_BFIN_ENABLE_SDIO_IRQ is not set # CONFIG_MMC_SPI is not set # CONFIG_MEMSTICK is not set # CONFIG_NEW_LEDS is not set
@@ -1147,7 +1153,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF526-EZBRD_defconfig +12 -10
@@ -331,16 +331,18 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -# CONFIG_MPU is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set # -# Asynchonous Memory Configuration +# Memory Protection Unit # +# CONFIG_MPU is not set # # EBIU_AMGCTL Global Control
@@ -418,11 +420,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1424,7 +1426,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF527-EZKIT_defconfig +14 -8
@@ -331,11 +331,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -418,11 +424,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1505,7 +1511,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF533-EZKIT_defconfig +17 -8
@@ -292,12 +292,21 @@ CONFIG_DMA_UNCACHED_1M=y # # Cache Support # +# +# Cache Support +# CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -391,11 +400,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1052,7 +1061,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF533-STAMP_defconfig +14 -8
@@ -293,11 +293,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -391,11 +397,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1216,7 +1222,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF537-STAMP_defconfig +14 -8
@@ -300,11 +300,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -399,11 +405,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1269,7 +1275,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF538-EZKIT_defconfig +14 -8
@@ -311,11 +311,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -398,11 +404,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1203,7 +1209,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF548-EZKIT_defconfig +16 -11
@@ -366,14 +366,19 @@ CONFIG_DMA_UNCACHED_2M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -# CONFIG_BFIN_L2_WB is not set -CONFIG_BFIN_L2_WT=y -# CONFIG_BFIN_L2_NOT_CACHED is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set +# CONFIG_BFIN_L2_ICACHEABLE is not set +# CONFIG_BFIN_L2_DCACHEABLE is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -459,11 +464,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1606,7 +1611,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BF561-EZKIT_defconfig +16 -11
@@ -331,14 +331,19 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -# CONFIG_BFIN_L2_WB is not set -CONFIG_BFIN_L2_WT=y -# CONFIG_BFIN_L2_NOT_CACHED is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set +# CONFIG_BFIN_L2_ICACHEABLE is not set +# CONFIG_BFIN_L2_DCACHEABLE is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -425,11 +430,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1044,7 +1049,7 @@ CONFIG_SCHED_DEBUG=y # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/BlackStamp_defconfig +9 -3
@@ -285,11 +285,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
arch/blackfin/configs/CM-BF527_defconfig +14 -8
@@ -329,11 +329,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -417,11 +423,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1246,7 +1252,7 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 # CONFIG_DEBUG_SPINLOCK_SLEEP is not set # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set # CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_INFO is not set # CONFIG_DEBUG_VM is not set # CONFIG_DEBUG_WRITECOUNT is not set
arch/blackfin/configs/CM-BF533_defconfig +14 -9
@@ -262,12 +262,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -353,10 +358,10 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -873,7 +878,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MMRS=y CONFIG_DEBUG_HUNT_FOR_ZERO=y CONFIG_DEBUG_BFIN_HWTRACE_ON=y
arch/blackfin/configs/CM-BF537E_defconfig +14 -8
@@ -297,11 +297,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -383,11 +389,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -861,7 +867,7 @@ CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set
arch/blackfin/configs/CM-BF537U_defconfig +14 -9
@@ -270,12 +270,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -361,10 +366,10 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y -CONFIG_INET_DIAG=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -901,7 +906,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y CONFIG_DEBUG_MMRS=y CONFIG_DEBUG_HUNT_FOR_ZERO=y CONFIG_DEBUG_BFIN_HWTRACE_ON=y
arch/blackfin/configs/CM-BF548_defconfig +16 -9
@@ -333,12 +333,19 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set +# CONFIG_BFIN_L2_ICACHEABLE is not set +# CONFIG_BFIN_L2_DCACHEABLE is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -428,11 +435,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -1334,7 +1341,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_SAMPLES is not set CONFIG_DEBUG_MMRS=y CONFIG_DEBUG_HUNT_FOR_ZERO=y
arch/blackfin/configs/CM-BF561_defconfig +16 -9
@@ -308,12 +308,19 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set +# CONFIG_BFIN_L2_ICACHEABLE is not set +# CONFIG_BFIN_L2_DCACHEABLE is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -395,11 +402,11 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
@@ -837,7 +844,7 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_SAMPLES is not set CONFIG_DEBUG_MMRS=y CONFIG_DEBUG_HUNT_FOR_ZERO=y
arch/blackfin/configs/H8606_defconfig +10 -4
@@ -258,12 +258,18 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -CONFIG_BFIN_ICACHE_LOCK=y -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# +# CONFIG_MPU is not set # # Asynchonous Memory Configuration
arch/blackfin/configs/PNAV-10_defconfig +13 -7
@@ -295,11 +295,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -382,11 +388,11 @@ CONFIG_IP_PNP=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set -CONFIG_INET_XFRM_MODE_TRANSPORT=y -CONFIG_INET_XFRM_MODE_TUNNEL=y -CONFIG_INET_XFRM_MODE_BEET=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set # CONFIG_INET_LRO is not set -CONFIG_INET_DIAG=y +# CONFIG_INET_DIAG is not set CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y
arch/blackfin/configs/SRV1_defconfig +10 -4
@@ -279,12 +279,18 @@ CONFIG_DMA_UNCACHED_2M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set -CONFIG_L1_MAX_PIECE=16 +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# +# CONFIG_MPU is not set # # Asynchonous Memory Configuration
arch/blackfin/configs/TCM-BF537_defconfig +10 -4
@@ -287,11 +287,17 @@ CONFIG_DMA_UNCACHED_1M=y # Cache Support # CONFIG_BFIN_ICACHE=y +# CONFIG_BFIN_ICACHE_LOCK is not set CONFIG_BFIN_DCACHE=y # CONFIG_BFIN_DCACHE_BANKA is not set -# CONFIG_BFIN_ICACHE_LOCK is not set -CONFIG_BFIN_WB=y -# CONFIG_BFIN_WT is not set +CONFIG_BFIN_EXTMEM_ICACHEABLE=y +CONFIG_BFIN_EXTMEM_DCACHEABLE=y +CONFIG_BFIN_EXTMEM_WRITEBACK=y +# CONFIG_BFIN_EXTMEM_WRITETHROUGH is not set + +# +# Memory Protection Unit +# # CONFIG_MPU is not set #
@@ -709,7 +715,7 @@ CONFIG_FRAME_WARN=1024 CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_KERNEL is not set -# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_MEMORY_INIT is not set # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_SYSCTL_SYSCALL_CHECK is not set
Signature · 1 line
1.6.3.1
PATCH 18/25 Blackfin: stick the CPU name into boot image name
In reply to Mike FrysingerFrom: Robin Getz <[email protected]>
Rather than use "Linux" in the boot image name (as this is redundant -- the image type is already set to "linux"), use the CPU name. This makes it fairly obvious when a wrong image is accidentally booted. Otherwise there is no kernel output and you waste time scratching your head wondering wtf just happened.
--- arch/blackfin/boot/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/boot/Makefile +1 -1
@@ -13,7 +13,7 @@ extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma quiet_cmd_uimage = UIMAGE $@ cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \ - -C $(2) -n 'Linux-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \ + -C $(2) -n '$(MACHINE)-$(KERNELRELEASE)' -a $(CONFIG_BOOT_LOAD) \ -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \ -d $< $@
Signature · 1 line
1.6.3.1
PATCH 19/25 Blackfin: unify memory map headers
In reply to Mike FrysingerMany aspects of the Blackfin memory map is exactly the same across all variants. Rather than copy and paste all of these duplicated values in each header, unify all of these into the common Blackfin memory map header file. In the process, push down BF561 SMP specific stuff to the BF561 specific header to keep the noise down.
--- arch/blackfin/include/asm/blackfin.h | 1 + arch/blackfin/include/asm/mem_map.h | 97 +++++++++++----------- arch/blackfin/mach-bf518/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf518/include/mach/mem_map.h | 56 ++----------- arch/blackfin/mach-bf527/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf527/include/mach/mem_map.h | 56 ++----------- arch/blackfin/mach-bf533/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf533/include/mach/mem_map.h | 56 ++----------- arch/blackfin/mach-bf537/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf537/include/mach/mem_map.h | 56 ++----------- arch/blackfin/mach-bf538/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf538/include/mach/mem_map.h | 57 ++----------- arch/blackfin/mach-bf548/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf548/include/mach/mem_map.h | 51 ++--------- arch/blackfin/mach-bf561/include/mach/blackfin.h | 1 - arch/blackfin/mach-bf561/include/mach/mem_map.h | 58 ++++++++++---- 16 files changed, 145 insertions(+), 350 deletions(-)
arch/blackfin/include/asm/blackfin.h +1 -0
@@ -86,6 +86,7 @@ static inline void CSYNC(void)#endif /* __ASSEMBLY__ */ +#include <asm/mem_map.h> #include <mach/blackfin.h> #include <asm/bfin-global.h>
arch/blackfin/include/asm/mem_map.h +47 -50
134 lines not on this page · raw message
arch/blackfin/mach-bf518/include/mach/blackfin.h +0 -1
@@ -33,7 +33,6 @@#define _MACH_BLACKFIN_H_#include "bf518.h" -#include "mem_map.h" #include "defBF512.h" #include "anomaly.h"
arch/blackfin/mach-bf518/include/mach/mem_map.h +9 -47
67 lines not on this page · raw message
arch/blackfin/mach-bf527/include/mach/blackfin.h +0 -1
@@ -33,7 +33,6 @@#define _MACH_BLACKFIN_H_#include "bf527.h" -#include "mem_map.h" #include "defBF522.h" #include "anomaly.h"
arch/blackfin/mach-bf527/include/mach/mem_map.h +9 -47
67 lines not on this page · raw message
arch/blackfin/mach-bf533/include/mach/blackfin.h +0 -1
@@ -34,7 +34,6 @@#define BF533_FAMILY #include "bf533.h" -#include "mem_map.h" #include "defBF532.h" #include "anomaly.h"
arch/blackfin/mach-bf533/include/mach/mem_map.h +9 -47
67 lines not on this page · raw message
arch/blackfin/mach-bf537/include/mach/blackfin.h +0 -1
@@ -35,7 +35,6 @@#define BF537_FAMILY #include "bf537.h" -#include "mem_map.h" #include "defBF534.h" #include "anomaly.h"
arch/blackfin/mach-bf537/include/mach/mem_map.h +9 -47
67 lines not on this page · raw message
arch/blackfin/mach-bf538/include/mach/blackfin.h +0 -1
@@ -35,7 +35,6 @@#define BF538_FAMILY #include "bf538.h" -#include "mem_map.h" #include "defBF539.h" #include "anomaly.h"
arch/blackfin/mach-bf538/include/mach/mem_map.h +9 -48
68 lines not on this page · raw message
arch/blackfin/mach-bf548/include/mach/blackfin.h +0 -1
@@ -33,7 +33,6 @@#define _MACH_BLACKFIN_H_#include "bf548.h" -#include "mem_map.h" #include "anomaly.h" #ifdef CONFIG_BF542
arch/blackfin/mach-bf548/include/mach/mem_map.h +9 -42
62 lines not on this page · raw message
arch/blackfin/mach-bf561/include/mach/blackfin.h +0 -1
@@ -34,7 +34,6 @@#define BF561_FAMILY #include "bf561.h" -#include "mem_map.h" #include "defBF561.h" #include "anomaly.h"
arch/blackfin/mach-bf561/include/mach/mem_map.h +43 -15
79 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 20/25 Blackfin: fix typo in TRAS define in mem_init.h header
In reply to Mike FrysingerFrom: Graf Yang <[email protected]>
We defined SDRAM_tRAS to TRAS_4, but then wrongly defined SDRAM_tRAS_num to 3.
--- arch/blackfin/include/asm/mem_init.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/blackfin/include/asm/mem_init.h +1 -1
@@ -59,7 +59,7 @@#define SDRAM_tRP TRP_1#define SDRAM_tRP_num 1#define SDRAM_tRAS TRAS_4 -#define SDRAM_tRAS_num 3 +#define SDRAM_tRAS_num 4#define SDRAM_tRCD TRCD_1#define SDRAM_tWR TWR_2#endif
Signature · 1 line
1.6.3.1
PATCH 21/25 Blackfin: bf526-ezbrd: handle different SDRAM chips
In reply to Mike FrysingerFrom: Graf Yang <[email protected]>
The BF526-EZBRD changed SDRAM chips between board revisions, so create a timing table that can accommodate both.
--- arch/blackfin/Kconfig | 7 ++- arch/blackfin/include/asm/mem_init.h | 86 ++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 1 deletions(-)
arch/blackfin/Kconfig +6 -1
@@ -358,7 +358,7 @@ config MEM_MT48LC8M32B2B5_7 config MEM_MT48LC32M16A2TG_75 bool - depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP || BFIN526_EZBRD) + depends on (BFIN527_EZKIT || BFIN532_IP0X || BLACKSTAMP) default y config MEM_MT48LC32M8A2_75
@@ -366,6 +366,11 @@ config MEM_MT48LC32M8A2_75 depends on (BFIN518F_EZBRD) default y +config MEM_MT48H32M16LFCJ_75 + bool + depends on (BFIN526_EZBRD) + default y + source "arch/blackfin/mach-bf518/Kconfig" source "arch/blackfin/mach-bf527/Kconfig" source "arch/blackfin/mach-bf533/Kconfig"
arch/blackfin/include/asm/mem_init.h +86 -0
98 lines not on this page · raw message
Signature · 1 line
1.6.3.1
PATCH 22/25 Blackfin: drop unused ISP1760 port1_disable from board resources
In reply to Mike FrysingerThe port1 disable stuff was dropped from the USB ISP1760, so update the Blackfin boards accordingly.
--- arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 - arch/blackfin/mach-bf527/boards/ezkit.c | 1 - arch/blackfin/mach-bf537/boards/stamp.c | 1 - arch/blackfin/mach-bf548/boards/ezkit.c | 1 - arch/blackfin/mach-bf561/boards/ezkit.c | 1 - 5 files changed, 0 insertions(+), 5 deletions(-)
arch/blackfin/mach-bf527/boards/cm_bf527.c +0 -1
@@ -78,7 +78,6 @@ static struct resource bfin_isp1760_resources[] = {static struct isp1760_platform_data isp1760_priv = { .is_isp1761 =0 , - .port1_disable =0 , .bus_width_16 =1 , .port1_otg =0 , .analog_oc =0 ,
arch/blackfin/mach-bf527/boards/ezkit.c +0 -1
@@ -77,7 +77,6 @@ static struct resource bfin_isp1760_resources[] = {static struct isp1760_platform_data isp1760_priv = { .is_isp1761 =0 , - .port1_disable =0 , .bus_width_16 =1 , .port1_otg =0 , .analog_oc =0 ,
arch/blackfin/mach-bf537/boards/stamp.c +0 -1
@@ -79,7 +79,6 @@ static struct resource bfin_isp1760_resources[] = {static struct isp1760_platform_data isp1760_priv = { .is_isp1761 =0 , - .port1_disable =0 , .bus_width_16 =1 , .port1_otg =0 , .analog_oc =0 ,
arch/blackfin/mach-bf548/boards/ezkit.c +0 -1
@@ -76,7 +76,6 @@ static struct resource bfin_isp1760_resources[] = {static struct isp1760_platform_data isp1760_priv = { .is_isp1761 =0 , - .port1_disable =0 , .bus_width_16 =1 , .port1_otg =0 , .analog_oc =0 ,
arch/blackfin/mach-bf561/boards/ezkit.c +0 -1
@@ -62,7 +62,6 @@ static struct resource bfin_isp1760_resources[] = {static struct isp1760_platform_data isp1760_priv = { .is_isp1761 =0 , - .port1_disable =0 , .bus_width_16 =1 , .port1_otg =0 , .analog_oc =0 ,
Signature · 1 line
1.6.3.1
PATCH 23/25 Blackfin: fix GPTMR0_CLOCKSOURCE dependency on BFIN_GPTIMERS
In reply to Mike FrysingerThe GPTMR0_CLOCKSOURCE Kconfig option requires the gptimers framework, so make sure it is selected when this option is enabled.
--- arch/blackfin/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/blackfin/Kconfig +1 -0
@@ -648,6 +648,7 @@ config CYCLES_CLOCKSOURCE config GPTMR0_CLOCKSOURCE bool "Use GPTimer0 as a clocksource (higher rating)" + select BFIN_GPTIMERS depends on GENERIC_CLOCKEVENTS depends on !TICKSOURCE_GPTMR0
Signature · 1 line
1.6.3.1
PATCH 24/25 Blackfin: fix early crash when booting on wrong cpu
In reply to Mike FrysingerFrom: Robin Getz <[email protected]>
Make sure we process the kernel command line before poking the hardware, so that we can process early printk. This helps ensure that if you boot a kernel configured for a different processor, something will be left in the log buffer.
--- arch/blackfin/kernel/setup.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-)
arch/blackfin/kernel/setup.c +15 -8
@@ -477,9 +477,11 @@ static __init void parse_cmdline_early(char *cmdline_p) }else if (!memcmp (to,"clkin_hz=" ,9 )) { to +=9 ;early_init_clkin_hz (to); +#ifdef CONFIG_EARLY_PRINTK }else if (!memcmp (to,"earlyprintk=" ,12 )) { to +=12 ;setup_early_printk (to); +#endif }else if (!memcmp (to,"memmap=" ,7 )) { to +=7 ;parse_memmap (to);
@@ -798,6 +800,11 @@ void __init setup_arch(char **cmdline_p) {unsigned long sclk, cclk; +/* Check to make sure we are running on the right processor */ +if (unlikely (CPUID !=bfin_cpuid ())) +printk (KERN_ERR "ERROR: Not running on ADSP-%s: unknown CPUID 0x%04x Rev 0.%d\n" , +CPU ,bfin_cpuid (),bfin_revid ()); +#ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con;#endif
@@ -812,14 +819,17 @@ void __init setup_arch(char **cmdline_p)memcpy (boot_command_line, command_line,COMMAND_LINE_SIZE ); boot_command_line[COMMAND_LINE_SIZE -1 ] ='\0' ; -/* setup memory defaults from the user config */ - physical_mem_end =0 ; - _ramend =get_mem_size () *1024 *1024 ; -memset (&bfin_memmap,0 ,sizeof (bfin_memmap)); +/* If the user does not specify things on the command line, use +* what the bootloader set things up as +*/ + physical_mem_end =0 ;parse_cmdline_early (&command_line[0 ]); +if (_ramend ==0 ) + _ramend =get_mem_size () *1024 *1024 ; +if (physical_mem_end ==0 ) physical_mem_end = _ramend;
@@ -910,10 +920,7 @@ void __init setup_arch(char **cmdline_p)else printk (KERN_INFO "Compiled for ADSP-%s Rev 0.%d\n" ,CPU ,bfin_compiled_revid ()); -if (unlikely (CPUID !=bfin_cpuid ())) -printk (KERN_ERR "ERROR: Not running on ADSP-%s: unknown CPUID 0x%04x Rev 0.%d\n" , -CPU ,bfin_cpuid (),bfin_revid ()); -else { +if (likely (CPUID ==bfin_cpuid ())) {if (bfin_revid () !=bfin_compiled_revid ()) {if (bfin_compiled_revid () ==-1 ) printk(KERN_ERR "Warning: Compiled for Rev none, but running on Rev %d\n",
Signature · 1 line
1.6.3.1
PATCH 25/25 Blackfin: drop BF535-specific text for exception 0x2A (unaligned instruction)
In reply to Mike FrysingerFrom: Yi Li <[email protected]>
We don't support the BF535 at all, and the exception 0x2A text specific to it is pretty verbose and confusing (since the behavior is simply odd), so punt it to keep the noise down.
--- arch/blackfin/include/asm/traps.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
arch/blackfin/include/asm/traps.h +1 -3
@@ -111,9 +111,7 @@ level " bits in the Watchpoint Instruction Address Control register (WPIACTL) is set.\n"#define EXC_0x2A (level) \ "Instruction fetch misaligned address violation\n" \ - level " - Attempted misaligned instruction cache fetch. On a misaligned instruction fetch\n" \ - level " exception, the return address provided in RETX is the destination address which is\n" \ - level " misaligned, rather than the address of the offending instruction.\n" + level " - Attempted misaligned instruction cache fetch.\n"#define EXC_0x2B (level) \ "CPLB protection violation\n" \ level " - Illegal instruction fetch access (memory protection violation).\n"
Signature · 1 line
1.6.3.1