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-arch@vger.kernel.org, linux-s390@vger.kernel.org,
linux-ia64@vger.kernel.org, linux-parisc@vger.kernel.org,
linux-sh@vger.kernel.org, linux-hexagon@vger.kernel.org,
linux-xtensa@linux-xtensa.org, linux-mips@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org,
openrisc@lists.librecores.org, linux-mtd@lists.infradead.org,
linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org,
nios2-dev@lists.rocketboards.org,
linux-riscv@lists.infradead.org,
linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/26] parisc: remove __ioremap
Date: Sat, 17 Aug 2019 09:32:38 +0200 [thread overview]
Message-ID: <20190817073253.27819-12-hch@lst.de> (raw)
In-Reply-To: <20190817073253.27819-1-hch@lst.de>
__ioremap is always called with the _PAGE_NO_CACHE, so fold the whole
thing and rename it to ioremap. This allows allows to remove the
special EISA quirk to force _PAGE_NO_CACHE.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
arch/parisc/include/asm/io.h | 11 +----------
arch/parisc/mm/ioremap.c | 16 +++-------------
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/arch/parisc/include/asm/io.h b/arch/parisc/include/asm/io.h
index 93d37010b375..46212b52c23e 100644
--- a/arch/parisc/include/asm/io.h
+++ b/arch/parisc/include/asm/io.h
@@ -127,16 +127,7 @@ static inline void gsc_writeq(unsigned long long val, unsigned long addr)
/*
* The standard PCI ioremap interfaces
*/
-
-extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
-
-/* Most machines react poorly to I/O-space being cacheable... Instead let's
- * define ioremap() in terms of ioremap_nocache().
- */
-static inline void __iomem * ioremap(unsigned long offset, unsigned long size)
-{
- return __ioremap(offset, size, _PAGE_NO_CACHE);
-}
+void __iomem *ioremap(unsigned long offset, unsigned long size);
#define ioremap_nocache(off, sz) ioremap((off), (sz))
#define ioremap_wc ioremap_nocache
#define ioremap_uc ioremap_nocache
diff --git a/arch/parisc/mm/ioremap.c b/arch/parisc/mm/ioremap.c
index 92a9b5f12f98..fe65e27f882b 100644
--- a/arch/parisc/mm/ioremap.c
+++ b/arch/parisc/mm/ioremap.c
@@ -25,23 +25,13 @@
* have to convert them into an offset in a page-aligned mapping, but the
* caller shouldn't need to know that small detail.
*/
-void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)
+void __iomem *ioremap(unsigned long phys_addr, unsigned long size)
{
void __iomem *addr;
struct vm_struct *area;
unsigned long offset, last_addr;
pgprot_t pgprot;
-#ifdef CONFIG_EISA
- unsigned long end = phys_addr + size - 1;
- /* Support EISA addresses */
- if ((phys_addr >= 0x00080000 && end < 0x000fffff) ||
- (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
- phys_addr |= F_EXTEND(0xfc000000);
- flags |= _PAGE_NO_CACHE;
- }
-#endif
-
/* Don't allow wraparound or zero size */
last_addr = phys_addr + size - 1;
if (!size || last_addr < phys_addr)
@@ -65,7 +55,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
}
pgprot = __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY |
- _PAGE_ACCESSED | flags);
+ _PAGE_ACCESSED | _PAGE_NO_CACHE);
/*
* Mappings have to be page-aligned
@@ -90,7 +80,7 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
return (void __iomem *) (offset + (char __iomem *)addr);
}
-EXPORT_SYMBOL(__ioremap);
+EXPORT_SYMBOL(ioremap);
void iounmap(const volatile void __iomem *addr)
{
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-17 7:51 UTC|newest]
Thread overview: 55+ 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 ` Christoph Hellwig [this message]
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
[not found] ` <20190830160404.GA26887@lst.de>
2019-08-30 19:47 ` Arnd Bergmann
2019-09-02 8:01 ` Christoph Hellwig
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 ` [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-12-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).