Title: [7977] trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c: nompu: back out small dma uncached code for icplb regions as misses here shouldnt matter
- Revision
- 7977
- Author
- vapier
- Date
- 2009-12-12 09:25:06 -0500 (Sat, 12 Dec 2009)
Log Message
nompu: back out small dma uncached code for icplb regions as misses here shouldnt matter
Modified Paths
Diff
Modified: trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c (7976 => 7977)
--- trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c 2009-12-12 14:22:22 UTC (rev 7976)
+++ trunk/arch/blackfin/kernel/cplb-nompu/cplbinit.c 2009-12-12 14:25:06 UTC (rev 7977)
@@ -145,23 +145,7 @@
i_i = 0;
/* Normal RAM, including MTD FS. */
-#ifdef CONFIG_MTD_UCLINUX
- /*
- * While DMA uncache size is 128/256/512KB, we let icplb cover the whole 1MB from normal_memory_end & 0xfffff
- * A bad result is the 128/256/512KB becomes be able to fetch instrcutions. But in order to protect the area,
- * we have to manage the area by page size
- */
- if (unlikely((memory_mtd_start + mtd_size) & (1 * 1024 * 1024 - 1)))
- icplb_bounds[i_i].eaddr = ((memory_mtd_start + mtd_size) & ~(1 * 1024 * 1024 - 1)) + 1 * 1024 * 1024;
- else
- icplb_bounds[i_i].eaddr = memory_mtd_start + mtd_size;
-#else
- if (unlikely(memory_end & (1 * 1024 * 1024 - 1)))
- icplb_bounds[i_i].eaddr = (memory_end & ~(1 * 1024 * 1024 - 1)) + 1 * 1024 * 1024;
- else
- icplb_bounds[i_i].eaddr = memory_end;
-#endif
-
+ icplb_bounds[i_i].eaddr = uncached_end;
icplb_bounds[i_i++].data = ""
/* DMA uncached region. */
if (DMA_UNCACHED_REGION) {
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits