p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc/64: __ioremap_at clean up in the error case 

__ioremap_at error handling is wonky, it requires caller to clean up
after it. Implement a helper that does the map and error cleanup and
remove the requirement from the caller.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Nicholas Piggin 2019-06-10 13:08:16 +10:00 committed by Michael Ellerman
parent 9c9f8fb71f
commit a72808a7ec
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/mm/pgtable_64.c
View File

@ -108,14 +108,30 @@ unsigned long ioremap_bot;
unsigned long ioremap_bot = IOREMAP_BASE; unsigned long ioremap_bot = IOREMAP_BASE;
#endif #endif
static int ioremap_range(unsigned long ea, phys_addr_t pa, unsigned long size, pgprot_t prot, int nid)
{
unsigned long i;
for (i = 0; i < size; i += PAGE_SIZE) {
int err = map_kernel_page(ea + i, pa + i, prot);
if (err) {
if (slab_is_available())
unmap_kernel_range(ea, size);
else
WARN_ON_ONCE(1); /* Should clean up */
return err;
}
}
return 0;
}
/** /**
* __ioremap_at - Low level function to establish the page tables * __ioremap_at - Low level function to establish the page tables
* for an IO mapping * for an IO mapping
*/ */
void __iomem *__ioremap_at(phys_addr_t pa, void *ea, unsigned long size, pgprot_t prot) void __iomem *__ioremap_at(phys_addr_t pa, void *ea, unsigned long size, pgprot_t prot)
{ {
unsigned long i;
/* We don't support the 4K PFN hack with ioremap */ /* We don't support the 4K PFN hack with ioremap */
if (pgprot_val(prot) & H_PAGE_4K_PFN) if (pgprot_val(prot) & H_PAGE_4K_PFN)
return NULL; return NULL;
@ -129,9 +145,8 @@ void __iomem *__ioremap_at(phys_addr_t pa, void *ea, unsigned long size, pgprot_
WARN_ON(((unsigned long)ea) & ~PAGE_MASK); WARN_ON(((unsigned long)ea) & ~PAGE_MASK);
WARN_ON(size & ~PAGE_MASK); WARN_ON(size & ~PAGE_MASK);
for (i = 0; i < size; i += PAGE_SIZE) if (ioremap_range((unsigned long)ea, pa, size, prot, NUMA_NO_NODE))
if (map_kernel_page((unsigned long)ea + i, pa + i, prot)) return NULL;
return NULL;
return (void __iomem *)ea; return (void __iomem *)ea;
} }
@ -182,8 +197,6 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size,
area->phys_addr = paligned; area->phys_addr = paligned;
ret = __ioremap_at(paligned, area->addr, size, prot); ret = __ioremap_at(paligned, area->addr, size, prot);
if (!ret)
vunmap(area->addr);
} else { } else {
ret = __ioremap_at(paligned, (void *)ioremap_bot, size, prot); ret = __ioremap_at(paligned, (void *)ioremap_bot, size, prot);
if (ret) if (ret)