MIPS: use ioremap_page_range (c2591eb5) · Commits · 戴 / test

arch/mips/mm/ioremap.c

+11 −101

Original line number	Diff line number	Diff line
		@@ -14,99 +14,14 @@
		#include <linux/slab.h>
		#include <linux/vmalloc.h>
		#include <linux/mm_types.h>
		#include <linux/io.h>
		#include <asm/cacheflush.h>
		#include <asm/io.h>
		#include <asm/tlbflush.h>
		#include <ioremap.h>

		#define IS_LOW512(addr) (!((phys_addr_t)(addr) & (phys_addr_t) ~0x1fffffffULL))
		#define IS_KSEG1(addr) (((unsigned long)(addr) & ~0x1fffffffUL) == CKSEG1)

		static inline void remap_area_pte(pte_t * pte, unsigned long address,
		phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
		{
		phys_addr_t end;
		unsigned long pfn;
		pgprot_t pgprot = __pgprot(_PAGE_GLOBAL \| _PAGE_PRESENT \| __READABLE
		\| __WRITEABLE \| flags);

		address &= ~PMD_MASK;
		end = address + size;
		if (end > PMD_SIZE)
		end = PMD_SIZE;
		BUG_ON(address >= end);
		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));
		address += PAGE_SIZE;
		pfn++;
		pte++;
		} while (address && (address < end));
		}

		static inline int remap_area_pmd(pmd_t * pmd, unsigned long address,
		phys_addr_t size, phys_addr_t phys_addr, unsigned long flags)
		{
		phys_addr_t end;

		address &= ~PGDIR_MASK;
		end = address + size;
		if (end > PGDIR_SIZE)
		end = PGDIR_SIZE;
		phys_addr -= address;
		BUG_ON(address >= end);
		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, phys_addr_t phys_addr,
		phys_addr_t size, unsigned long flags)
		{
		int error;
		pgd_t * dir;
		unsigned long end = address + size;

		phys_addr -= address;
		dir = pgd_offset(&init_mm, address);
		flush_cache_all();
		BUG_ON(address >= end);
		do {
		p4d_t *p4d;
		pud_t *pud;
		pmd_t *pmd;

		error = -ENOMEM;
		p4d = p4d_alloc(&init_mm, dir, address);
		if (!p4d)
		break;
		pud = pud_alloc(&init_mm, p4d, address);
		if (!pud)
		break;
		pmd = pmd_alloc(&init_mm, pud, address);
		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 error;
		}

		static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
		void *arg)
		{
		@@ -135,7 +50,7 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, unsigned long size,
		unsigned long offset, pfn, last_pfn;
		struct vm_struct *area;
		phys_addr_t last_addr;
		void *addr;
		unsigned long vaddr;
		void __iomem *cpu_addr;

		cpu_addr = plat_ioremap(phys_addr, size, flags);
		@@ -183,27 +98,22 @@ void __iomem *ioremap_prot(phys_addr_t phys_addr, unsigned long size,
		area = get_vm_area(size, VM_IOREMAP);
		if (!area)
		return NULL;
		addr = area->addr;
		if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {
		vunmap(addr);
		vaddr = (unsigned long)area->addr;

		flags \|= _PAGE_GLOBAL \| _PAGE_PRESENT \| __READABLE \| __WRITEABLE;
		if (ioremap_page_range(vaddr, vaddr + size, phys_addr,
		__pgprot(flags))) {
		free_vm_area(area);
		return NULL;
		}

		return (void __iomem ) (offset + (char )addr);
		return (void __iomem *)(vaddr + offset);
		}
		EXPORT_SYMBOL(ioremap_prot);

		void iounmap(const volatile void __iomem *addr)
		{
		struct vm_struct *p;

		if (plat_iounmap(addr) \|\| IS_KSEG1(addr))
		return;

		p = remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr));
		if (!p)
		printk(KERN_ERR "iounmap: bad address %p\n", addr);

		kfree(p);
		if (!plat_iounmap(addr) && !IS_KSEG1(addr))
		vunmap((void *)((unsigned long)addr & PAGE_MASK));
		}
		EXPORT_SYMBOL(iounmap);

Admin message