From: Helge Deller <deller@gmx.de>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org,
linux-kernel@vger.kernel.org, Guo Ren <guoren@kernel.org>,
sparclinux@vger.kernel.org, linux-riscv@lists.infradead.org,
Vincent Chen <deanbo422@gmail.com>,
linux-arch@vger.kernel.org, linux-s390@vger.kernel.org,
linux-hexagon@vger.kernel.org, x86@kernel.org,
linux-snps-arc@lists.infradead.org, Arnd Bergmann <arnd@arndb.de>,
linux-m68k@lists.linux-m68k.org, openrisc@lists.librecores.org,
Greentime Hu <green.hu@gmail.com>,
nios2-dev@lists.rocketboards.org, Guan Xuetao <gxt@pku.edu.cn>,
linux-arm-kernel@lists.infradead.org,
Michal Simek <monstr@monstr.eu>,
linux-parisc@vger.kernel.org, linux-mips@vger.kernel.org,
linux-alpha@vger.kernel.org, linux-mtd@lists.infradead.org
Subject: Re: [PATCH 07/21] parisc: remove __ioremap
Date: Tue, 5 Nov 2019 15:29:05 +0100 [thread overview]
Message-ID: <23dd12c1-8af2-dd97-18f2-da3203d49a48@gmx.de> (raw)
In-Reply-To: <20191029064834.23438-8-hch@lst.de>
On 29.10.19 07:48, Christoph Hellwig wrote:
> __ioremap is always called with the _PAGE_NO_CACHE, so fold the whole
> thing and rename it to ioremap. This also allows to remove the special
> EISA quirk to force _PAGE_NO_CACHE.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Helge Deller <deller@gmx.de>
Helge
> ---
> arch/parisc/include/asm/io.h | 11 +----------
> arch/parisc/mm/ioremap.c | 10 ++++------
> 2 files changed, 5 insertions(+), 16 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 f29f682352f0..6e7c005aa09b 100644
> --- a/arch/parisc/mm/ioremap.c
> +++ b/arch/parisc/mm/ioremap.c
> @@ -25,7 +25,7 @@
> * 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;
> @@ -36,10 +36,8 @@ void __iomem * __ioremap(unsigned long phys_addr, unsigned long size, unsigned l
> unsigned long end = phys_addr + size - 1;
> /* Support EISA addresses */
> if ((phys_addr >= 0x00080000 && end < 0x000fffff) ||
> - (phys_addr >= 0x00500000 && end < 0x03bfffff)) {
> + (phys_addr >= 0x00500000 && end < 0x03bfffff))
> phys_addr |= F_EXTEND(0xfc000000);
> - flags |= _PAGE_NO_CACHE;
> - }
> #endif
>
> /* Don't allow wraparound or zero size */
> @@ -65,7 +63,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 +88,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 *io_addr)
> {
>
_______________________________________________
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-11-05 14:29 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-29 6:48 generic ioremap (and lots of cleanups) v3 Christoph Hellwig
2019-10-29 6:48 ` [PATCH 01/21] arm: remove ioremap_cached Christoph Hellwig
2019-11-11 10:33 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 02/21] unicore32: " Christoph Hellwig
2019-10-29 6:48 ` [PATCH 03/21] ia64: rename ioremap_nocache to ioremap_uc Christoph Hellwig
2019-11-11 10:36 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 04/21] hexagon: clean up ioremap Christoph Hellwig
2019-10-29 6:48 ` [PATCH 05/21] alpha: remove the unused __ioremap wrapper Christoph Hellwig
2019-10-29 6:48 ` [PATCH 06/21] nios2: remove __ioremap Christoph Hellwig
2019-10-29 6:48 ` [PATCH 07/21] parisc: " Christoph Hellwig
2019-11-05 14:29 ` Helge Deller [this message]
2019-10-29 6:48 ` [PATCH 08/21] x86: Clean up ioremap() Christoph Hellwig
2019-10-30 10:39 ` Thomas Gleixner
2019-10-29 6:48 ` [PATCH 09/21] xtensa: clean up ioremap Christoph Hellwig
2019-10-29 6:48 ` [PATCH 10/21] asm-generic: ioremap_uc should behave the same with and without MMU Christoph Hellwig
2019-11-06 17:56 ` Palmer Dabbelt
2019-11-11 10:09 ` Arnd Bergmann
2019-11-11 10:15 ` Christoph Hellwig
2019-11-11 10:27 ` Arnd Bergmann
2019-11-11 10:29 ` Christoph Hellwig
2019-11-11 19:33 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 11/21] asm-generic: don't provide ioremap for CONFIG_MMU Christoph Hellwig
2019-11-06 18:11 ` Palmer Dabbelt
2019-11-06 18:16 ` Geert Uytterhoeven
2019-11-06 18:28 ` Christoph Hellwig
2019-11-11 10:31 ` Arnd Bergmann
2019-11-11 10:29 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 12/21] arch: rely on asm-generic/io.h for default ioremap_* definitions Christoph Hellwig
2019-11-07 15:29 ` Palmer Dabbelt
2019-11-11 10:10 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 13/21] m68k: rename __iounmap and mark it static Christoph Hellwig
2019-10-30 8:51 ` Geert Uytterhoeven
2019-10-29 6:48 ` [PATCH 14/21] hexagon: remove __iounmap Christoph Hellwig
2019-10-29 6:48 ` [PATCH 15/21] nios2: " Christoph Hellwig
2019-10-29 6:48 ` [PATCH 16/21] sh: " Christoph Hellwig
2019-10-29 6:48 ` [PATCH 17/21] lib: provide a simple generic ioremap implementation Christoph Hellwig
2019-11-07 15:29 ` Palmer Dabbelt
2019-11-11 10:10 ` Arnd Bergmann
2019-10-29 6:48 ` [PATCH 18/21] riscv: use the generic ioremap code Christoph Hellwig
2019-10-29 6:48 ` [PATCH 19/21] nds32: use generic ioremap Christoph Hellwig
2019-11-12 8:51 ` Greentime Hu
2019-10-29 6:48 ` [PATCH 20/21] csky: remove ioremap_cache Christoph Hellwig
2019-10-29 6:48 ` [PATCH 21/21] csky: use generic ioremap Christoph Hellwig
2019-11-05 1:31 ` generic ioremap (and lots of cleanups) v3 Christoph Hellwig
[not found] ` <20191107204743.GA22863@lst.de>
2019-11-08 2:20 ` generic-iomap tree for linux-next Stephen Rothwell
2019-11-08 4:52 ` Stephen Rothwell
2019-11-08 5:14 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2019-10-17 17:45 generic ioremap (and lots of cleanups) v2 Christoph Hellwig
2019-10-17 17:45 ` [PATCH 07/21] parisc: remove __ioremap Christoph Hellwig
2019-10-17 21:35 ` Rolf Eike Beer
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=23dd12c1-8af2-dd97-18f2-da3203d49a48@gmx.de \
--to=deller@gmx.de \
--cc=arnd@arndb.de \
--cc=deanbo422@gmail.com \
--cc=green.hu@gmail.com \
--cc=guoren@kernel.org \
--cc=gxt@pku.edu.cn \
--cc=hch@lst.de \
--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=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).