netdev - Re: [PATCH v5 RESEND 01/17] asm-generic/iomap.h: remove ARCH_HAS_IOREMAP

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <ZGN9EZyoshL9cDE8@MiWiFi-R3L-srv>
Date: Tue, 16 May 2023 20:54:41 +0800
From: Baoquan He <bhe@...hat.com>
To: Mike Rapoport <rppt@...nel.org>
Cc: linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org,
	linux-mm@...ck.org, arnd@...db.de, christophe.leroy@...roup.eu,
	hch@...radead.org, agordeev@...ux.ibm.com,
	wangkefeng.wang@...wei.com, schnelle@...ux.ibm.com,
	David.Laight@...lab.com, shorne@...il.com, willy@...radead.org,
	deller@....de, loongarch@...ts.linux.dev,
	linux-m68k@...ts.linux-m68k.org, linux-mips@...r.kernel.org,
	linuxppc-dev@...ts.ozlabs.org, x86@...nel.org,
	netdev@...r.kernel.org
Subject: Re: [PATCH v5 RESEND 01/17] asm-generic/iomap.h: remove
 ARCH_HAS_IOREMAP_xx macros

On 05/16/23 at 09:15am, Mike Rapoport wrote:
> Hi,
> 
> On Mon, May 15, 2023 at 05:08:32PM +0800, Baoquan He wrote:
> > Let's use '#define ioremap_xx' and "#ifdef ioremap_xx" instead.
> > 
> > For each architecture to remove defined ARCH_HAS_IOREMAP_xx macros in
> 
> This sentence seems to be stale.

Right, will remove this, thanks a lot for careful reviewing.

> 
> > To remove defined ARCH_HAS_IOREMAP_xx macros in <asm/io.h> of each ARCH,
> > the ARCH's own ioremap_wc|wt|np definition need be above
> > "#include <asm-generic/iomap.h>. Otherwise the redefinition error would
> > be seen during compiling. So the relevant adjustments are made to avoid
> > compiling error:
> > 
> >   loongarch:
> >   - doesn't include <asm-generic/iomap.h>, defining ARCH_HAS_IOREMAP_WC
> >     is redundant, so simply remove it.
> > 
> >   m68k:
> >   - selected GENERIC_IOMAP, <asm-generic/iomap.h> has been added in
> >     <asm-generic/io.h>, and <asm/kmap.h> is included above
> >     <asm-generic/iomap.h>, so simply remove ARCH_HAS_IOREMAP_WT defining.
> > 
> >   mips:
> >   - move "#include <asm-generic/iomap.h>" below ioremap_wc definition
> >     in <asm/io.h>
> > 
> >   powerpc:
> >   - remove "#include <asm-generic/iomap.h>" in <asm/io.h> because it's
> >     duplicated with the one in <asm-generic/io.h>, let's rely on the
> >     latter.
> > 
> >   x86:
> >   - selected GENERIC_IOMAP, remove #include <asm-generic/iomap.h> in
> >     the middle of <asm/io.h>. Let's rely on <asm-generic/io.h>.
> > 
> > Signed-off-by: Baoquan He <bhe@...hat.com>
> > Cc: loongarch@...ts.linux.dev
> > Cc: linux-m68k@...ts.linux-m68k.org
> > Cc: linux-mips@...r.kernel.org
> > Cc: linuxppc-dev@...ts.ozlabs.org
> > Cc: x86@...nel.org
> > Cc: netdev@...r.kernel.org
> > Cc: linux-arch@...r.kernel.org
> 
> Reviewed-by: Mike Rapoport (IBM) <rppt@...nel.org>
> 
> > ---
> >  arch/loongarch/include/asm/io.h     | 2 --
> >  arch/m68k/include/asm/io_mm.h       | 2 --
> >  arch/m68k/include/asm/kmap.h        | 2 --
> >  arch/mips/include/asm/io.h          | 5 ++---
> >  arch/powerpc/include/asm/io.h       | 9 +--------
> >  arch/x86/include/asm/io.h           | 5 -----
> >  drivers/net/ethernet/sfc/io.h       | 2 +-
> >  drivers/net/ethernet/sfc/siena/io.h | 2 +-
> >  include/asm-generic/iomap.h         | 6 +++---
> >  9 files changed, 8 insertions(+), 27 deletions(-)
> > 
> > diff --git a/arch/loongarch/include/asm/io.h b/arch/loongarch/include/asm/io.h
> > index 545e2708fbf7..5fef1246c6fb 100644
> > --- a/arch/loongarch/include/asm/io.h
> > +++ b/arch/loongarch/include/asm/io.h
> > @@ -5,8 +5,6 @@
> >  #ifndef _ASM_IO_H
> >  #define _ASM_IO_H
> >  
> > -#define ARCH_HAS_IOREMAP_WC
> > -
> >  #include <linux/kernel.h>
> >  #include <linux/types.h>
> >  
> > diff --git a/arch/m68k/include/asm/io_mm.h b/arch/m68k/include/asm/io_mm.h
> > index d41fa488453b..6a0abd4846c6 100644
> > --- a/arch/m68k/include/asm/io_mm.h
> > +++ b/arch/m68k/include/asm/io_mm.h
> > @@ -26,8 +26,6 @@
> >  #include <asm/virtconvert.h>
> >  #include <asm/kmap.h>
> >  
> > -#include <asm-generic/iomap.h>
> > -
> >  #ifdef CONFIG_ATARI
> >  #define atari_readb   raw_inb
> >  #define atari_writeb  raw_outb
> > diff --git a/arch/m68k/include/asm/kmap.h b/arch/m68k/include/asm/kmap.h
> > index dec05743d426..4efb3efa593a 100644
> > --- a/arch/m68k/include/asm/kmap.h
> > +++ b/arch/m68k/include/asm/kmap.h
> > @@ -4,8 +4,6 @@
> >  
> >  #ifdef CONFIG_MMU
> >  
> > -#define ARCH_HAS_IOREMAP_WT
> > -
> >  /* Values for nocacheflag and cmode */
> >  #define IOMAP_FULL_CACHING		0
> >  #define IOMAP_NOCACHE_SER		1
> > diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h
> > index cc28d207a061..477773328a06 100644
> > --- a/arch/mips/include/asm/io.h
> > +++ b/arch/mips/include/asm/io.h
> > @@ -12,8 +12,6 @@
> >  #ifndef _ASM_IO_H
> >  #define _ASM_IO_H
> >  
> > -#define ARCH_HAS_IOREMAP_WC
> > -
> >  #include <linux/compiler.h>
> >  #include <linux/kernel.h>
> >  #include <linux/types.h>
> > @@ -25,7 +23,6 @@
> >  #include <asm/byteorder.h>
> >  #include <asm/cpu.h>
> >  #include <asm/cpu-features.h>
> > -#include <asm-generic/iomap.h>
> >  #include <asm/page.h>
> >  #include <asm/pgtable-bits.h>
> >  #include <asm/processor.h>
> > @@ -210,6 +207,8 @@ void iounmap(const volatile void __iomem *addr);
> >  #define ioremap_wc(offset, size)					\
> >  	ioremap_prot((offset), (size), boot_cpu_data.writecombine)
> >  
> > +#include <asm-generic/iomap.h>
> > +
> >  #if defined(CONFIG_CPU_CAVIUM_OCTEON)
> >  #define war_io_reorder_wmb()		wmb()
> >  #else
> > diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
> > index f1e657c9bbe8..67a3fb6de498 100644
> > --- a/arch/powerpc/include/asm/io.h
> > +++ b/arch/powerpc/include/asm/io.h
> > @@ -3,11 +3,6 @@
> >  #define _ASM_POWERPC_IO_H
> >  #ifdef __KERNEL__
> >  
> > -#define ARCH_HAS_IOREMAP_WC
> > -#ifdef CONFIG_PPC32
> > -#define ARCH_HAS_IOREMAP_WT
> > -#endif
> > -
> >  /*
> >   */
> >  
> > @@ -732,9 +727,7 @@ static inline void name at					\
> >  #define writel_relaxed(v, addr)	writel(v, addr)
> >  #define writeq_relaxed(v, addr)	writeq(v, addr)
> >  
> > -#ifdef CONFIG_GENERIC_IOMAP
> > -#include <asm-generic/iomap.h>
> > -#else
> > +#ifndef CONFIG_GENERIC_IOMAP
> >  /*
> >   * Here comes the implementation of the IOMAP interfaces.
> >   */
> > diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
> > index e9025640f634..76238842406a 100644
> > --- a/arch/x86/include/asm/io.h
> > +++ b/arch/x86/include/asm/io.h
> > @@ -35,9 +35,6 @@
> >    *  - Arnaldo Carvalho de Melo <acme@...ectiva.com.br>
> >    */
> >  
> > -#define ARCH_HAS_IOREMAP_WC
> > -#define ARCH_HAS_IOREMAP_WT
> > -
> >  #include <linux/string.h>
> >  #include <linux/compiler.h>
> >  #include <linux/cc_platform.h>
> > @@ -212,8 +209,6 @@ void memset_io(volatile void __iomem *, int, size_t);
> >  #define memcpy_toio memcpy_toio
> >  #define memset_io memset_io
> >  
> > -#include <asm-generic/iomap.h>
> > -
> >  /*
> >   * ISA space is 'always mapped' on a typical x86 system, no need to
> >   * explicitly ioremap() it. The fact that the ISA IO space is mapped
> > diff --git a/drivers/net/ethernet/sfc/io.h b/drivers/net/ethernet/sfc/io.h
> > index 30439cc83a89..07f99ad14bf3 100644
> > --- a/drivers/net/ethernet/sfc/io.h
> > +++ b/drivers/net/ethernet/sfc/io.h
> > @@ -70,7 +70,7 @@
> >   */
> >  #ifdef CONFIG_X86_64
> >  /* PIO is a win only if write-combining is possible */
> > -#ifdef ARCH_HAS_IOREMAP_WC
> > +#ifdef ioremap_wc
> >  #define EFX_USE_PIO 1
> >  #endif
> >  #endif
> > diff --git a/drivers/net/ethernet/sfc/siena/io.h b/drivers/net/ethernet/sfc/siena/io.h
> > index 30439cc83a89..07f99ad14bf3 100644
> > --- a/drivers/net/ethernet/sfc/siena/io.h
> > +++ b/drivers/net/ethernet/sfc/siena/io.h
> > @@ -70,7 +70,7 @@
> >   */
> >  #ifdef CONFIG_X86_64
> >  /* PIO is a win only if write-combining is possible */
> > -#ifdef ARCH_HAS_IOREMAP_WC
> > +#ifdef ioremap_wc
> >  #define EFX_USE_PIO 1
> >  #endif
> >  #endif
> > diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
> > index 08237ae8b840..196087a8126e 100644
> > --- a/include/asm-generic/iomap.h
> > +++ b/include/asm-generic/iomap.h
> > @@ -93,15 +93,15 @@ extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
> >  extern void ioport_unmap(void __iomem *);
> >  #endif
> >  
> > -#ifndef ARCH_HAS_IOREMAP_WC
> > +#ifndef ioremap_wc
> >  #define ioremap_wc ioremap
> >  #endif
> >  
> > -#ifndef ARCH_HAS_IOREMAP_WT
> > +#ifndef ioremap_wt
> >  #define ioremap_wt ioremap
> >  #endif
> >  
> > -#ifndef ARCH_HAS_IOREMAP_NP
> > +#ifndef ioremap_np
> >  /* See the comment in asm-generic/io.h about ioremap_np(). */
> >  #define ioremap_np ioremap_np
> >  static inline void __iomem *ioremap_np(phys_addr_t offset, size_t size)
> > -- 
> > 2.34.1
> > 
> > 
> 
> -- 
> Sincerely yours,
> Mike.
>