Commit a72808a7 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

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: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9c9f8fb7

arch/powerpc/mm/pgtable_64.c

+20 −7
Original line number Diff line number Diff line
@@ -108,14 +108,30 @@ unsigned long ioremap_bot; 
unsigned long ioremap_bot = IOREMAP_BASE;

#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

 *                for an IO mapping

 */

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 */

	if (pgprot_val(prot) & H_PAGE_4K_PFN)

		return NULL;
@@ -129,8 +145,7 @@ void __iomem *__ioremap_at(phys_addr_t pa, void *ea, unsigned long size, pgprot_ 
	WARN_ON(((unsigned long)ea) & ~PAGE_MASK);

	WARN_ON(size & ~PAGE_MASK);



	for (i = 0; i < size; i += PAGE_SIZE)

		if (map_kernel_page((unsigned long)ea + i, pa + i, prot))

	if (ioremap_range((unsigned long)ea, pa, size, prot, NUMA_NO_NODE))

		return NULL;



	return (void __iomem *)ea;
@@ -182,8 +197,6 @@ void __iomem * __ioremap_caller(phys_addr_t addr, unsigned long size, 


		area->phys_addr = paligned;

		ret = __ioremap_at(paligned, area->addr, size, prot);

		if (!ret)

			vunmap(area->addr);

	} else {

		ret = __ioremap_at(paligned, (void *)ioremap_bot, size, prot);

		if (ret)