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

Commit 5336c179 authored by Guo Ren's avatar Guo Ren
Browse files

csky: Fixup ioremap function losing 



Implement the following apis to meet usage in different scenarios.

 - ioremap          (NonCache + StrongOrder)
 - ioremap_nocache  (NonCache + StrongOrder)
 - ioremap_wc       (NonCache + WeakOrder  )
 - ioremap_cache    (   Cache + WeakOrder  )

Also change flag VM_ALLOC to VM_IOREMAP in get_vm_area_caller.

Signed-off-by: default avatarGuo Ren <ren_guo@c-sky.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@infradead.org>
parent ae76f635

arch/csky/include/asm/io.h

+12 −11
Original line number Diff line number Diff line
@@ -4,17 +4,10 @@ 
#ifndef __ASM_CSKY_IO_H

#define __ASM_CSKY_IO_H



#include <abi/pgtable-bits.h>

#include <asm/pgtable.h>

#include <linux/types.h>

#include <linux/version.h>



extern void __iomem *ioremap(phys_addr_t offset, size_t size);



extern void iounmap(void *addr);



extern int remap_area_pages(unsigned long address, phys_addr_t phys_addr,

		size_t size, unsigned long flags);



/*

 * I/O memory access primitives. Reads are ordered relative to any

 * following Normal memory access. Writes are ordered relative to any prior
@@ -40,9 +33,17 @@ extern int remap_area_pages(unsigned long address, phys_addr_t phys_addr, 
#define writel(v,c)		({ wmb(); writel_relaxed((v),(c)); mb(); })

#endif



#define ioremap_nocache(phy, sz)	ioremap(phy, sz)

#define ioremap_wc ioremap_nocache

#define ioremap_wt ioremap_nocache

/*

 * I/O memory mapping functions.

 */

extern void __iomem *ioremap_cache(phys_addr_t addr, size_t size);

extern void __iomem *__ioremap(phys_addr_t addr, size_t size, pgprot_t prot);

extern void iounmap(void *addr);



#define ioremap(addr, size)		__ioremap((addr), (size), pgprot_noncached(PAGE_KERNEL))

#define ioremap_wc(addr, size)		__ioremap((addr), (size), pgprot_writecombine(PAGE_KERNEL))

#define ioremap_nocache(addr, size)	ioremap((addr), (size))

#define ioremap_cache			ioremap_cache



#include <asm-generic/io.h>

arch/csky/mm/ioremap.c

+17 −6
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@ 


#include <asm/pgtable.h>



void __iomem *ioremap(phys_addr_t addr, size_t size)

static void __iomem *__ioremap_caller(phys_addr_t addr, size_t size,

				      pgprot_t prot, void *caller)

{

	phys_addr_t last_addr;

	unsigned long offset, vaddr;

	struct vm_struct *area;

	pgprot_t prot;



	last_addr = addr + size - 1;

	if (!size || last_addr < addr)
@@ -23,14 +23,12 @@ void __iomem *ioremap(phys_addr_t addr, size_t size) 
	addr &= PAGE_MASK;

	size = PAGE_ALIGN(size + offset);



	area = get_vm_area_caller(size, VM_ALLOC, __builtin_return_address(0));

	area = get_vm_area_caller(size, VM_IOREMAP, caller);

	if (!area)

		return NULL;



	vaddr = (unsigned long)area->addr;



	prot = pgprot_noncached(PAGE_KERNEL);



	if (ioremap_page_range(vaddr, vaddr + size, addr, prot)) {

		free_vm_area(area);

		return NULL;
@@ -38,7 +36,20 @@ void __iomem *ioremap(phys_addr_t addr, size_t size) 


	return (void __iomem *)(vaddr + offset);

}

EXPORT_SYMBOL(ioremap);



void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot)

{

	return __ioremap_caller(phys_addr, size, prot,

				__builtin_return_address(0));

}

EXPORT_SYMBOL(__ioremap);



void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size)

{

	return __ioremap_caller(phys_addr, size, PAGE_KERNEL,

				__builtin_return_address(0));

}

EXPORT_SYMBOL(ioremap_cache);



void iounmap(void __iomem *addr)

{