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

Commit 16c564bb authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Linus Torvalds
Browse files

[PATCH] Generic ioremap_page_range: x86_64 conversion 



Convert x86_64 to use generic ioremap_page_range()

[akpm@osdl.org: build fix]
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9540fc42

arch/x86_64/mm/ioremap.c

+7 −104
Original line number Diff line number Diff line
@@ -12,117 +12,16 @@ 
#include <linux/init.h>

#include <linux/slab.h>

#include <linux/module.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/pgalloc.h>

#include <asm/fixmap.h>

#include <asm/cacheflush.h>

#include <asm/tlbflush.h>

#include <asm/cacheflush.h>

#include <asm/proto.h>



#define ISA_START_ADDRESS      0xa0000

#define ISA_END_ADDRESS                0x100000



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;



	address &= ~PMD_MASK;

	end = address + size;

	if (end > PMD_SIZE)

		end = PMD_SIZE;

	if (address >= end)

		BUG();

	pfn = phys_addr >> PAGE_SHIFT;

	do {

		if (!pte_none(*pte)) {

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

			BUG();

		}

		set_pte(pte, pfn_pte(pfn, __pgprot(_PAGE_PRESENT | _PAGE_RW | 

					_PAGE_GLOBAL | _PAGE_DIRTY | _PAGE_ACCESSED | flags)));

		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 &= ~PUD_MASK;

	end = address + size;

	if (end > PUD_SIZE)

		end = PUD_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 inline int remap_area_pud(pud_t * pud, 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 {

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

		if (!pmd)

			return -ENOMEM;

		remap_area_pmd(pmd, address, end - address, address + phys_addr, flags);

		address = (address + PUD_SIZE) & PUD_MASK;

		pud++;

	} 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 *pgd;

	unsigned long end = address + size;



	phys_addr -= address;

	pgd = pgd_offset_k(address);

	flush_cache_all();

	if (address >= end)

		BUG();

	do {

		pud_t *pud;

		pud = pud_alloc(&init_mm, pgd, address);

		error = -ENOMEM;

		if (!pud)

			break;

		if (remap_area_pud(pud, address, end - address,

					 phys_addr + address, flags))

			break;

		error = 0;

		address = (address + PGDIR_SIZE) & PGDIR_MASK;

		pgd++;

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

	flush_tlb_all();

	return error;

}



/*

 * Fix up the linear direct mapping of the kernel to avoid cache attribute

 * conflicts.
@@ -165,6 +64,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l 
	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;
@@ -194,6 +94,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l 
	}

#endif



	pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_GLOBAL

			  | _PAGE_DIRTY | _PAGE_ACCESSED | flags);

	/*

	 * Mappings have to be page-aligned

	 */
@@ -209,7 +111,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l 
		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)) {

		remove_vm_area((void *)(PAGE_MASK & (unsigned long) addr));

		return NULL;

	}