From 0aa817f078b655d0ae36669169d73a5c8a388016 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Wed, 16 May 2007 22:11:01 -0700 Subject: Slab allocators: define common size limitations Currently we have a maze of configuration variables that determine the maximum slab size. Worst of all it seems to vary between SLAB and SLUB. So define a common maximum size for kmalloc. For conveniences sake we use the maximum size ever supported which is 32 MB. We limit the maximum size to a lower limit if MAX_ORDER does not allow such large allocations. For many architectures this patch will have the effect of adding large kmalloc sizes. x86_64 adds 5 new kmalloc sizes. So a small amount of memory will be needed for these caches (contemporary SLAB has dynamically sizeable node and cpu structure so the waste is less than in the past) Most architectures will then be able to allocate object with sizes up to MAX_ORDER. We have had repeated breakage (in fact whenever we doubled the number of supported processors) on IA64 because one or the other struct grew beyond what the slab allocators supported. This will avoid future issues and f.e. avoid fixes for 2k and 4k cpu support. CONFIG_LARGE_ALLOCS is no longer necessary so drop it. It fixes sparc64 with SLAB. Signed-off-by: Christoph Lameter Signed-off-by: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/blackfin/Kconfig | 8 -------- 1 file changed, 8 deletions(-) (limited to 'arch/blackfin/Kconfig') diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 1a4930509325..d80e5b1d686e 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -560,14 +560,6 @@ endchoice source "mm/Kconfig" -config LARGE_ALLOCS - bool "Allow allocating large blocks (> 1MB) of memory" - help - Allow the slab memory allocator to keep chains for very large - memory sizes - upto 32MB. You may need this if your system has - a lot of RAM, and you need to able to allocate very large - contiguous chunks. If unsure, say N. - config BFIN_DMA_5XX bool "Enable DMA Support" depends on (BF533 || BF532 || BF531 || BF537 || BF536 || BF534 || BF561) -- cgit v1.2.3 From e3defffe915961cf9c6e1f16486ae83fb7212f29 Mon Sep 17 00:00:00 2001 From: Aubrey Li Date: Mon, 21 May 2007 18:09:11 +0800 Subject: Blackfin arch: ISP1761 doesn't work for USB flash disk ZONE_DMA is required for some drivers subsystem, such as USB/SCSI. Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds --- arch/blackfin/Kconfig | 4 ++++ arch/blackfin/mm/init.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'arch/blackfin/Kconfig') diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index d80e5b1d686e..35b33a44677b 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -25,6 +25,10 @@ config BLACKFIN bool default y +config ZONE_DMA + bool + default y + config BFIN bool default y diff --git a/arch/blackfin/mm/init.c b/arch/blackfin/mm/init.c index 73f72abed432..d6cf1059560d 100644 --- a/arch/blackfin/mm/init.c +++ b/arch/blackfin/mm/init.c @@ -116,7 +116,8 @@ void paging_init(void) { unsigned long zones_size[MAX_NR_ZONES] = { 0, }; - zones_size[ZONE_NORMAL] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; + zones_size[ZONE_DMA] = (end_mem - PAGE_OFFSET) >> PAGE_SHIFT; + zones_size[ZONE_NORMAL] = 0; #ifdef CONFIG_HIGHMEM zones_size[ZONE_HIGHMEM] = 0; #endif -- cgit v1.2.3 From 0a290593a053752d9629fb1276392ce35c26b348 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 21 May 2007 18:09:21 +0800 Subject: Blackfin arch: initial tepla-bf561 board support Signed-off-by: Mike Frysinger Signed-off-by: Bryan Wu Signed-off-by: Linus Torvalds --- arch/blackfin/Kconfig | 8 ++++- arch/blackfin/mach-bf561/boards/Makefile | 3 +- arch/blackfin/mach-bf561/boards/tepla.c | 61 ++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 arch/blackfin/mach-bf561/boards/tepla.c (limited to 'arch/blackfin/Kconfig') diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig index 35b33a44677b..b1b111bb2f3a 100644 --- a/arch/blackfin/Kconfig +++ b/arch/blackfin/Kconfig @@ -193,7 +193,7 @@ config BFIN537_BLUETECHNIX_CM CM-BF537 support for EVAL- and DEV-Board. config BFIN561_BLUETECHNIX_CM - bool "BF561-CM" + bool "Bluetechnix CM-BF561" depends on (BF561) help CM-BF561 support for EVAL- and DEV-Board. @@ -204,6 +204,12 @@ config BFIN561_EZKIT help BF561-EZKIT-LITE board Support. +config BFIN561_TEPLA + bool "BF561-TEPLA" + depends on (BF561) + help + BF561-TEPLA board Support. + config PNAV10 bool "PNAV 1.0 board" depends on (BF537) diff --git a/arch/blackfin/mach-bf561/boards/Makefile b/arch/blackfin/mach-bf561/boards/Makefile index 886edc739ab4..495a1cf9d452 100644 --- a/arch/blackfin/mach-bf561/boards/Makefile +++ b/arch/blackfin/mach-bf561/boards/Makefile @@ -3,5 +3,6 @@ # obj-$(CONFIG_GENERIC_BOARD) += generic_board.o -obj-$(CONFIG_BFIN561_EZKIT) += ezkit.o obj-$(CONFIG_BFIN561_BLUETECHNIX_CM) += cm_bf561.o +obj-$(CONFIG_BFIN561_EZKIT) += ezkit.o +obj-$(CONFIG_BFIN561_TEPLA) += tepla.o diff --git a/arch/blackfin/mach-bf561/boards/tepla.c b/arch/blackfin/mach-bf561/boards/tepla.c new file mode 100644 index 000000000000..db308c7ccabb --- /dev/null +++ b/arch/blackfin/mach-bf561/boards/tepla.c @@ -0,0 +1,61 @@ +/* + * File: arch/blackfin/mach-bf561/tepla.c + * + * Copyright 2004-2007 Analog Devices Inc. + * Only SMSC91C1111 was registered, may do more later. + * + * Copyright 2005 National ICT Australia (NICTA), Aidan Williams + * Thanks to Jamey Hicks. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include + +char *bfin_board_name = "Tepla-BF561"; + +/* + * Driver needs to know address, irq and flag pin. + */ +static struct resource smc91x_resources[] = { + { + .start = 0x2C000300, + .end = 0x2C000320, + .flags = IORESOURCE_MEM, + },{ + .start = IRQ_PROG_INTB, + .end = IRQ_PROG_INTB, + .flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL, + },{ + /* + * denotes the flag pin and is used directly if + * CONFIG_IRQCHIP_DEMUX_GPIO is defined. + */ + .start = IRQ_PF7, + .end = IRQ_PF7, + .flags = IORESOURCE_IRQ|IORESOURCE_IRQ_HIGHLEVEL, + }, +}; + +static struct platform_device smc91x_device = { + .name = "smc91x", + .id = 0, + .num_resources = ARRAY_SIZE(smc91x_resources), + .resource = smc91x_resources, +}; + +static struct platform_device *tepla_devices[] __initdata = { + &smc91x_device, +}; + +static int __init tepla_init(void) +{ + printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__); + return platform_add_devices(tepla_devices, ARRAY_SIZE(tepla_devices)); +} + +arch_initcall(tepla_init); -- cgit v1.2.3