summaryrefslogtreecommitdiffstats
path: root/arch/sh/mm/ioremap_fixed.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-20 18:10:30 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-20 18:10:30 +0900
commit920efaabcbd34e6b8dc05c5b777df3e936af5812 (patch)
tree34645e1ebe93a3a7365eb85b15d358e467e71f1b /arch/sh/mm/ioremap_fixed.c
parentb51989b8afe9409ee68c67ce2a5de4390693bd2b (diff)
downloadop-kernel-dev-920efaabcbd34e6b8dc05c5b777df3e936af5812.zip
op-kernel-dev-920efaabcbd34e6b8dc05c5b777df3e936af5812.tar.gz
sh: Correct iounmap fixmap teardown.
iounmap_fixed() had a couple of bugs in it that caused it to effectively fail at life. The total number of pages to unmap factored in the mapping offset and aligned up to the next page boundary, which doesn't match the ioremap_fixed() behaviour. When ioremap_fixed() pegs a slot, the address in the mapping data already contains the offset displacement, and the size is recorded verbatim given that we're only interested in total number of pages required. As such, we need to calculate the total number from the original size in the unmap path as well. At the same time, there was also an off-by-1 problem in the fixmap index calculation which has also been corrected. Previously subsequent remaps of an identical fixmap index would trigger the pte_ERROR() in set_pte_phys(): arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). arch/sh/mm/init.c:77: bad pte 8053ffb0(0000781003fff506). With this patch in place, the iounmap-driven fixmap teardown actually does what it's supposed to do. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/mm/ioremap_fixed.c')
-rw-r--r--arch/sh/mm/ioremap_fixed.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/sh/mm/ioremap_fixed.c b/arch/sh/mm/ioremap_fixed.c
index 551b513..0b78b1e 100644
--- a/arch/sh/mm/ioremap_fixed.c
+++ b/arch/sh/mm/ioremap_fixed.c
@@ -93,9 +93,7 @@ ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
int iounmap_fixed(void __iomem *addr)
{
enum fixed_addresses idx;
- unsigned long virt_addr;
struct ioremap_map *map;
- unsigned long offset;
unsigned int nrpages;
int i, slot;
@@ -114,12 +112,9 @@ int iounmap_fixed(void __iomem *addr)
if (slot < 0)
return -EINVAL;
- virt_addr = (unsigned long)addr;
+ nrpages = map->size >> PAGE_SHIFT;
- offset = virt_addr & ~PAGE_MASK;
- nrpages = PAGE_ALIGN(offset + map->size - 1) >> PAGE_SHIFT;
-
- idx = FIX_IOREMAP_BEGIN + slot + nrpages;
+ idx = FIX_IOREMAP_BEGIN + slot + nrpages - 1;
while (nrpages > 0) {
__clear_fixmap(idx, __pgprot(_PAGE_WIRED));
--idx;
OpenPOWER on IntegriCloud