Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10731b88 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds
Browse files

[PATCH] Generic ioremap_page_range: sh64 conversion 



Convert SH64 to use generic ioremap_page_range()

Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b3e1a85

arch/sh64/mm/ioremap.c

+8 −92
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/vmalloc.h>

#include <linux/sched.h>

#include <linux/string.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/pgalloc.h>

#include <asm/tlbflush.h>

#include <linux/ioport.h>
@@ -28,96 +28,6 @@ 
static void shmedia_mapioaddr(unsigned long, unsigned long);

static unsigned long shmedia_ioremap(struct resource *, u32, int);



static inline void remap_area_pte(pte_t * pte, unsigned long address, unsigned long size,

	unsigned long phys_addr, unsigned long flags)

{

	unsigned long end;

	unsigned long pfn;

	pgprot_t pgprot = __pgprot(_PAGE_PRESENT  | _PAGE_READ   |

				   _PAGE_WRITE    | _PAGE_DIRTY  |

				   _PAGE_ACCESSED | _PAGE_SHARED | flags);



	address &= ~PMD_MASK;

	end = address + size;

	if (end > PMD_SIZE)

		end = PMD_SIZE;

	if (address >= end)

		BUG();



	pfn = phys_addr >> PAGE_SHIFT;



	pr_debug("    %s: pte %p address %lx size %lx phys_addr %lx\n",

		 __FUNCTION__,pte,address,size,phys_addr);



	do {

		if (!pte_none(*pte)) {

			printk("remap_area_pte: page already exists\n");

			BUG();

		}



		set_pte(pte, pfn_pte(pfn, pgprot));

		address += PAGE_SIZE;

		pfn++;

		pte++;

	} while (address && (address < end));

}



static inline int remap_area_pmd(pmd_t * pmd, unsigned long address, unsigned long size,

	unsigned long phys_addr, unsigned long flags)

{

	unsigned long end;



	address &= ~PGDIR_MASK;

	end = address + size;



	if (end > PGDIR_SIZE)

		end = PGDIR_SIZE;



	phys_addr -= address;



	if (address >= end)

		BUG();



	do {

		pte_t * pte = pte_alloc_kernel(pmd, address);

		if (!pte)

			return -ENOMEM;

		remap_area_pte(pte, address, end - address, address + phys_addr, flags);

		address = (address + PMD_SIZE) & PMD_MASK;

		pmd++;

	} while (address && (address < end));

	return 0;

}



static int remap_area_pages(unsigned long address, unsigned long phys_addr,

				 unsigned long size, unsigned long flags)

{

	int error;

	pgd_t * dir;

	unsigned long end = address + size;



	phys_addr -= address;

	dir = pgd_offset_k(address);

	flush_cache_all();

	if (address >= end)

		BUG();

	do {

		pmd_t *pmd = pmd_alloc(&init_mm, dir, address);

		error = -ENOMEM;

		if (!pmd)

			break;

		if (remap_area_pmd(pmd, address, end - address,

				   phys_addr + address, flags)) {

			 break;

		}

		error = 0;

		address = (address + PGDIR_SIZE) & PGDIR_MASK;

		dir++;

	} while (address && (address < end));

	flush_tlb_all();

	return 0;

}



/*

 * Generic mapping function (not visible outside):

 */
@@ -136,12 +46,17 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag 
	void * addr;

	struct vm_struct * area;

	unsigned long offset, last_addr;

	pgprot_t pgprot;



	/* Don't allow wraparound or zero size */

	last_addr = phys_addr + size - 1;

	if (!size || last_addr < phys_addr)

		return NULL;



	pgprot = __pgprot(_PAGE_PRESENT  | _PAGE_READ   |

			  _PAGE_WRITE    | _PAGE_DIRTY  |

			  _PAGE_ACCESSED | _PAGE_SHARED | flags);



	/*

	 * Mappings have to be page-aligned

	 */
@@ -158,7 +73,8 @@ void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flag 
		return NULL;

	area->phys_addr = phys_addr;

	addr = area->addr;

	if (remap_area_pages((unsigned long)addr, phys_addr, size, flags)) {

	if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,

			       phys_addr, pgprot)) {

		vunmap(addr);

		return NULL;

	}