From: Christoph Hellwig <hch@lst.de>
To: Arnd Bergmann <arnd@arndb.de>, Guo Ren <guoren@kernel.org>,
Michal Simek <monstr@monstr.eu>,
Greentime Hu <green.hu@gmail.com>,
Vincent Chen <deanbo422@gmail.com>, Guan Xuetao <gxt@pku.edu.cn>,
x86@kernel.org
Cc: linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org,
linux-parisc@vger.kernel.org, linux-riscv@lists.infradead.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org,
linux-mtd@lists.infradead.org, linux-arch@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 24/26] riscv: use the generic ioremap code
Date: Sat, 17 Aug 2019 09:32:51 +0200 [thread overview]
Message-ID: <20190817073253.27819-25-hch@lst.de> (raw)
In-Reply-To: <20190817073253.27819-1-hch@lst.de>
Use the generic ioremap code instead of providing a local version.
Note that this relies on the asm-generic no-op definition of
pgprot_noncached.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/riscv/Kconfig | 1 +
arch/riscv/include/asm/io.h | 3 --
arch/riscv/include/asm/pgtable.h | 6 +++
arch/riscv/mm/Makefile | 1 -
arch/riscv/mm/ioremap.c | 84 --------------------------------
5 files changed, 7 insertions(+), 88 deletions(-)
delete mode 100644 arch/riscv/mm/ioremap.c
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index 59a4727ecd6c..468e7eba8916 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -30,6 +30,7 @@ config RISCV
select GENERIC_STRNLEN_USER
select GENERIC_SMP_IDLE_THREAD
select GENERIC_ATOMIC64 if !64BIT
+ select GENERIC_IOREMAP
select HAVE_ARCH_AUDITSYSCALL
select HAVE_MEMBLOCK_NODE_MAP
select HAVE_DMA_CONTIGUOUS
diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h
index c1de6875cc77..df4c8812ff64 100644
--- a/arch/riscv/include/asm/io.h
+++ b/arch/riscv/include/asm/io.h
@@ -14,9 +14,6 @@
#include <linux/types.h>
#include <asm/mmiowb.h>
-extern void __iomem *ioremap(phys_addr_t offset, unsigned long size);
-extern void iounmap(volatile void __iomem *addr);
-
/* Generic IO read/write. These perform native-endian accesses. */
#define __raw_writeb __raw_writeb
static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h
index a364aba23d55..57be4723626c 100644
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@ -61,6 +61,12 @@
#define PAGE_TABLE __pgprot(_PAGE_TABLE)
+/*
+ * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't
+ * change the properties of memory regions.
+ */
+#define _PAGE_IOREMAP _PAGE_KERNEL
+
extern pgd_t swapper_pg_dir[];
/* MAP_PRIVATE permissions: xwr (copy-on-write) */
diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile
index 74055e1d6f21..3b3a161feaa0 100644
--- a/arch/riscv/mm/Makefile
+++ b/arch/riscv/mm/Makefile
@@ -8,7 +8,6 @@ endif
obj-y += init.o
obj-y += fault.o
obj-y += extable.o
-obj-y += ioremap.o
obj-y += cacheflush.o
obj-y += context.o
obj-y += sifive_l2_cache.o
diff --git a/arch/riscv/mm/ioremap.c b/arch/riscv/mm/ioremap.c
deleted file mode 100644
index ac621ddb45c0..000000000000
--- a/arch/riscv/mm/ioremap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * (C) Copyright 1995 1996 Linus Torvalds
- * (C) Copyright 2012 Regents of the University of California
- */
-
-#include <linux/export.h>
-#include <linux/mm.h>
-#include <linux/vmalloc.h>
-#include <linux/io.h>
-
-#include <asm/pgtable.h>
-
-/*
- * Remap an arbitrary physical address space into the kernel virtual
- * address space. Needed when the kernel wants to access high addresses
- * directly.
- *
- * NOTE! We need to allow non-page-aligned mappings too: we will obviously
- * have to convert them into an offset in a page-aligned mapping, but the
- * caller shouldn't need to know that small detail.
- */
-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;
-
- /* Disallow wrap-around or zero size */
- last_addr = addr + size - 1;
- if (!size || last_addr < addr)
- return NULL;
-
- /* Page-align mappings */
- offset = addr & (~PAGE_MASK);
- addr -= offset;
- size = PAGE_ALIGN(size + offset);
-
- area = get_vm_area_caller(size, VM_IOREMAP, caller);
- if (!area)
- return NULL;
- vaddr = (unsigned long)area->addr;
-
- if (ioremap_page_range(vaddr, vaddr + size, addr, prot)) {
- free_vm_area(area);
- return NULL;
- }
-
- return (void __iomem *)(vaddr + offset);
-}
-
-/*
- * ioremap - map bus memory into CPU space
- * @offset: bus address of the memory
- * @size: size of the resource to map
- *
- * ioremap performs a platform specific sequence of operations to
- * make bus memory CPU accessible via the readb/readw/readl/writeb/
- * writew/writel functions and the other mmio helpers. The returned
- * address is not guaranteed to be usable directly as a virtual
- * address.
- *
- * Must be freed with iounmap.
- */
-void __iomem *ioremap(phys_addr_t offset, unsigned long size)
-{
- return __ioremap_caller(offset, size, PAGE_KERNEL,
- __builtin_return_address(0));
-}
-EXPORT_SYMBOL(ioremap);
-
-
-/**
- * iounmap - Free a IO remapping
- * @addr: virtual address from ioremap_*
- *
- * Caller must ensure there is only one unmapping for the same pointer.
- */
-void iounmap(volatile void __iomem *addr)
-{
- vunmap((void *)((unsigned long)addr & PAGE_MASK));
-}
-EXPORT_SYMBOL(iounmap);
--
2.20.1
next prev parent reply other threads:[~2019-08-17 7:49 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 ` Christoph Hellwig [this message]
2019-08-17 21:22 ` [PATCH 24/26] riscv: use the generic ioremap code Paul Walmsley
2019-09-01 8:02 ` Christoph Hellwig
2019-08-17 7:32 ` [PATCH 25/26] csky: use generic ioremap Christoph Hellwig
2019-08-17 7:32 ` [PATCH 26/26] nds32: " 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-25-hch@lst.de \
--to=hch@lst.de \
--cc=arnd@arndb.de \
--cc=deanbo422@gmail.com \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=monstr@monstr.eu \
--cc=nios2-dev@lists.rocketboards.org \
--cc=openrisc@lists.librecores.org \
--cc=sparclinux@vger.kernel.org \
--cc=x86@kernel.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).