lkml.org 
[lkml]   [2019]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 25/26] csky: use generic ioremap
    Date
    Use the generic ioremap_prot and iounmap helpers.

    Signed-off-by: Christoph Hellwig <hch@lst.de>
    ---
    arch/csky/Kconfig | 1 +
    arch/csky/include/asm/io.h | 7 ------
    arch/csky/include/asm/pgtable.h | 4 ++++
    arch/csky/mm/ioremap.c | 42 ---------------------------------
    4 files changed, 5 insertions(+), 49 deletions(-)

    diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig
    index 3973847b5f42..da09c884cc30 100644
    --- a/arch/csky/Kconfig
    +++ b/arch/csky/Kconfig
    @@ -17,6 +17,7 @@ config CSKY
    select IRQ_DOMAIN
    select HANDLE_DOMAIN_IRQ
    select DW_APB_TIMER_OF
    + select GENERIC_IOREMAP
    select GENERIC_LIB_ASHLDI3
    select GENERIC_LIB_ASHRDI3
    select GENERIC_LIB_LSHRDI3
    diff --git a/arch/csky/include/asm/io.h b/arch/csky/include/asm/io.h
    index 800985af1c44..10e09299c912 100644
    --- a/arch/csky/include/asm/io.h
    +++ b/arch/csky/include/asm/io.h
    @@ -8,13 +8,6 @@
    #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
    diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h
    index c429a6f347de..b5f605b9810c 100644
    --- a/arch/csky/include/asm/pgtable.h
    +++ b/arch/csky/include/asm/pgtable.h
    @@ -86,6 +86,10 @@
    #define PAGE_USERIO __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
    _CACHE_CACHED)

    +#define _PAGE_IOREMAP \
    + (_PAGE_PRESENT | __READABLE | __WRITEABLE | _PAGE_GLOBAL | \
    + _CACHE_UNCACHED | _PAGE_SO)
    +
    #define __P000 PAGE_NONE
    #define __P001 PAGE_READONLY
    #define __P010 PAGE_COPY
    diff --git a/arch/csky/mm/ioremap.c b/arch/csky/mm/ioremap.c
    index 8473b6bdf512..65614f65ce48 100644
    --- a/arch/csky/mm/ioremap.c
    +++ b/arch/csky/mm/ioremap.c
    @@ -3,50 +3,8 @@

    #include <linux/export.h>
    #include <linux/mm.h>
    -#include <linux/vmalloc.h>
    #include <linux/io.h>

    -#include <asm/pgtable.h>
    -
    -void __iomem *ioremap(phys_addr_t addr, size_t size)
    -{
    - 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)
    - return NULL;
    -
    - offset = addr & (~PAGE_MASK);
    - addr &= PAGE_MASK;
    - size = PAGE_ALIGN(size + offset);
    -
    - area = get_vm_area_caller(size, VM_ALLOC, __builtin_return_address(0));
    - if (!area)
    - return NULL;
    -
    - vaddr = (unsigned long)area->addr;
    -
    - prot = __pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE |
    - _PAGE_GLOBAL | _CACHE_UNCACHED | _PAGE_SO);
    -
    - if (ioremap_page_range(vaddr, vaddr + size, addr, prot)) {
    - free_vm_area(area);
    - return NULL;
    - }
    -
    - return (void __iomem *)(vaddr + offset);
    -}
    -EXPORT_SYMBOL(ioremap);
    -
    -void iounmap(void __iomem *addr)
    -{
    - vunmap((void *)((unsigned long)addr & PAGE_MASK));
    -}
    -EXPORT_SYMBOL(iounmap);
    -
    pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
    unsigned long size, pgprot_t vma_prot)
    {
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-17 09:56    [W:4.216 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site