linux-snps-arc.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hch@lst.de (Christoph Hellwig)
To: linux-snps-arc@lists.infradead.org
Subject: [PATCH 25/26] csky: use generic ioremap
Date: Sat, 17 Aug 2019 09:32:52 +0200	[thread overview]
Message-ID: <20190817073253.27819-26-hch@lst.de> (raw)
In-Reply-To: <20190817073253.27819-1-hch@lst.de>

Use the generic ioremap_prot and iounmap helpers.

Signed-off-by: Christoph Hellwig <hch at 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

  parent reply	other threads:[~2019-08-17  7:32 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-17  7:32 generic ioremap (and lots of cleanups) Christoph Hellwig
2019-08-17  7:32 ` [PATCH 01/26] mtd/maps/pxa2xx: use ioremap_cache insted of ioremap_cached Christoph Hellwig
2019-08-17  7:32 ` [PATCH 02/26] arm, unicore32: remove ioremap_cached Christoph Hellwig
2019-08-17  7:32 ` [PATCH 03/26] m68k, microblaze: remove ioremap_fullcache Christoph Hellwig
2019-08-19  8:50   ` Geert Uytterhoeven
2019-09-02 14:16   ` Michal Simek
2019-08-17  7:32 ` [PATCH 04/26] mips: remove ioremap_cachable Christoph Hellwig
2019-08-19 20:57   ` Paul Burton
2019-08-30 16:06     ` Christoph Hellwig
2019-09-03  8:57   ` Paul Burton
2019-08-17  7:32 ` [PATCH 05/26] openrisc: map as uncached in ioremap Christoph Hellwig
2019-08-23 13:55   ` Stafford Horne
2019-08-30 16:07     ` Christoph Hellwig
2019-08-30 21:45       ` Stafford Horne
2019-08-17  7:32 ` [PATCH 06/26] ia64: rename ioremap_nocache to ioremap_uc Christoph Hellwig
2019-08-17 16:00   ` Sergei Shtylyov
2019-08-17  7:32 ` [PATCH 07/26] hexagon: clean up ioremap Christoph Hellwig
2019-08-17  7:32 ` [PATCH 08/26] m68k: simplify ioremap_nocache Christoph Hellwig
2019-08-19  8:56   ` Geert Uytterhoeven
2019-08-19  9:18     ` Christoph Hellwig
2019-08-30 16:06     ` Christoph Hellwig
2019-09-02  7:53       ` Geert Uytterhoeven
2019-08-17  7:32 ` [PATCH 09/26] alpha: remove the unused __ioremap wrapper Christoph Hellwig
2019-08-17  7:32 ` [PATCH 10/26] nios2: remove __ioremap Christoph Hellwig
2019-08-17  7:32 ` [PATCH 11/26] parisc: " Christoph Hellwig
2019-08-17  7:32 ` [PATCH 12/26] x86: clean up ioremap Christoph Hellwig
2019-08-17 10:34   ` Ingo Molnar
2019-08-30 16:04     ` Christoph Hellwig
2019-08-17  7:32 ` [PATCH 13/26] xtensa: " Christoph Hellwig
2019-08-17  7:32 ` [PATCH 14/26] asm-generic: don't provide __ioremap Christoph Hellwig
2019-08-17 20:58   ` Paul Walmsley
2019-08-17 21:27     ` Paul Walmsley
2019-08-17  7:32 ` [PATCH 15/26] asm-generic: ioremap_uc should behave the same with and without MMU Christoph Hellwig
2019-08-17 21:07   ` Paul Walmsley
2019-08-17  7:32 ` [PATCH 16/26] asm-generic: don't provide ioremap for CONFIG_MMU Christoph Hellwig
2019-08-17 21:15   ` Paul Walmsley
2019-08-17  7:32 ` [PATCH 17/26] arch: rely on asm-generic/io.h for default ioremap_* definitions Christoph Hellwig
2019-08-17 21:13   ` Paul Walmsley
2019-08-17  7:32 ` [PATCH 18/26] m68k: rename __iounmap and mark it static Christoph Hellwig
2019-08-19  9:00   ` Geert Uytterhoeven
2019-08-17  7:32 ` [PATCH 19/26] arm64: remove __iounmap Christoph Hellwig
2019-08-19  7:36   ` Will Deacon
2019-08-30 16:05     ` Christoph Hellwig
2019-08-31 16:29       ` Will Deacon
2019-08-17  7:32 ` [PATCH 20/26] hexagon: " Christoph Hellwig
2019-08-17  7:32 ` [PATCH 21/26] nios2: " Christoph Hellwig
2019-08-17  7:32 ` [PATCH 22/26] sh: " Christoph Hellwig
2019-08-17  7:32 ` [PATCH 23/26] lib: provide a simple generic ioremap implementation Christoph Hellwig
2019-08-17  7:32 ` [PATCH 24/26] riscv: use the generic ioremap code Christoph Hellwig
2019-08-17 21:22   ` Paul Walmsley
2019-09-01  8:02     ` Christoph Hellwig
2019-08-17  7:32 ` Christoph Hellwig [this message]
2019-08-17  7:32 ` [PATCH 26/26] nds32: use generic ioremap Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190817073253.27819-26-hch@lst.de \
    --to=hch@lst.de \
    --cc=linux-snps-arc@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).