diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2010-11-04 08:01:37 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-10 07:18:18 -0500 |
commit | 398834330cb07ba66fca5fb23a51075a67e4d4fa (patch) | |
tree | a659f8f7bf7266b848e0c103ee8956317f0a0820 /arch | |
parent | 36e11ab23e22243b9c608a08c8d68ca5686b6c9b (diff) | |
download | linux-3.10-398834330cb07ba66fca5fb23a51075a67e4d4fa.tar.gz linux-3.10-398834330cb07ba66fca5fb23a51075a67e4d4fa.tar.bz2 linux-3.10-398834330cb07ba66fca5fb23a51075a67e4d4fa.zip |
Blackfin: no-mpu: fix masking of small uncached dma region
When using an uncached DMA region less than 1 MiB, we try to mask off
the whole last 1 MiB for it. Unfortunately, this fails as we forgot
to subtract one from the calculated mask, leading to the region still
be marked as cacheable.
Reported-by: Andrew Rook <andrew.rook@speakerbus.co.uk>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/kernel/cplb-nompu/cplbinit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c index bfe75af4e8b..886e00014d7 100644 --- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c +++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c @@ -116,7 +116,7 @@ void __init generate_cplb_tables_all(void) ((_ramend - uncached_end) >= 1 * 1024 * 1024)) dcplb_bounds[i_d].eaddr = uncached_end; else - dcplb_bounds[i_d].eaddr = uncached_end & ~(1 * 1024 * 1024); + dcplb_bounds[i_d].eaddr = uncached_end & ~(1 * 1024 * 1024 - 1); dcplb_bounds[i_d++].data = SDRAM_DGENERIC; /* DMA uncached region. */ if (DMA_UNCACHED_REGION) { |