lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bounce: allow use of bounce pool via config option

Browse Source 
The tilegx USB OHCI support needs the bounce pool since we're not
using the IOMMU to handle 32-bit addresses.

Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
This commit is contained in:
Chris Metcalf
2012-06-16 16:41:05 -04:00
parent 47fc28bff8
commit f100625789
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/tile/Kconfig
View File

@@ -406,6 +406,12 @@ config TILE_USB
Provides USB host adapter support for the built-in EHCI and OHCI Provides USB host adapter support for the built-in EHCI and OHCI
interfaces on TILE-Gx chips. interfaces on TILE-Gx chips.
# USB OHCI needs the bounce pool since tilegx will often have more
# than 4GB of memory, but we don't currently use the IOTLB to present
# a 32-bit address to OHCI. So we need to use a bounce pool instead.
config NEED_BOUNCE_POOL
def_bool USB_OHCI_HCD
config HOTPLUG config HOTPLUG
bool "Support for hot-pluggable devices" bool "Support for hot-pluggable devices"
---help--- ---help---

8
mm/bounce.c
View File

@@ -24,23 +24,25 @@
static mempool_t *page_pool, *isa_page_pool; static mempool_t *page_pool, *isa_page_pool;
#ifdef CONFIG_HIGHMEM #if defined(CONFIG_HIGHMEM) || defined(CONFIG_NEED_BOUNCE_POOL)
static __init int init_emergency_pool(void) static __init int init_emergency_pool(void)
{ {
#ifndef CONFIG_MEMORY_HOTPLUG #if defined(CONFIG_HIGHMEM) && !defined(CONFIG_MEMORY_HOTPLUG)
if (max_pfn <= max_low_pfn) if (max_pfn <= max_low_pfn)
return 0; return 0;
#endif #endif
page_pool = mempool_create_page_pool(POOL_SIZE, 0); page_pool = mempool_create_page_pool(POOL_SIZE, 0);
BUG_ON(!page_pool); BUG_ON(!page_pool);
printk("highmem bounce pool size: %d pages\n", POOL_SIZE); printk("bounce pool size: %d pages\n", POOL_SIZE);
return 0; return 0;
} }
__initcall(init_emergency_pool); __initcall(init_emergency_pool);
#endif
#ifdef CONFIG_HIGHMEM
/* /*
* highmem version, map in to vec * highmem version, map in to vec
*/ */