diff options
| author | Guo Ren <ren_guo@c-sky.com> | 2019-08-15 16:24:56 +0800 |
|---|---|---|
| committer | Guo Ren <ren_guo@c-sky.com> | 2019-08-15 19:21:28 +0800 |
| commit | 5336c17928cc464845ff765ce45b368c22f848e0 (patch) | |
| tree | 867349276607a1584dd0480fa67beda89e0cc76f /arch/csky/mm | |
| parent | ae76f635d4e1cffa6870cc5472567ca9d6940a22 (diff) | |
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: Guo Ren <ren_guo@c-sky.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Christoph Hellwig <hch@infradead.org>
Diffstat (limited to 'arch/csky/mm')
| -rw-r--r-- | arch/csky/mm/ioremap.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/arch/csky/mm/ioremap.c b/arch/csky/mm/ioremap.c index 48531115fd9d..e13cd3497628 100644 --- a/arch/csky/mm/ioremap.c +++ b/arch/csky/mm/ioremap.c @@ -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) { |