Commit 8f28ca6b authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Linus Torvalds
Browse files

iomap: constify ioreadX() iomem argument (as in generic implementation) 

Patch series "iomap: Constify ioreadX() iomem argument", v3.

The ioread8/16/32() and others have inconsistent interface among the
architectures: some taking address as const, some not.

It seems there is nothing really stopping all of them to take pointer to
const.

This patch (of 4):

The ioreadX() and ioreadX_rep() helpers have inconsistent interface.  On
some architectures void *__iomem address argument is a pointer to const,
on some not.

Implementations of ioreadX() do not modify the memory under the address so
they can be converted to a "const" version for const-safety and
consistency among architectures.

[krzk@kernel.org: sh: clk: fix assignment from incompatible pointer type for ioreadX()]
  Link: http://lkml.kernel.org/r/20200723082017.24053-1-krzk@kernel.org
[akpm@linux-foundation.org: fix drivers/mailbox/bcm-pdc-mailbox.c]
  Link: http://lkml.kernel.org/r/202007132209.Rxmv4QyS%25lkp@intel.com



Suggested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Allen Hubbe <allenbh@gmail.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Link: http://lkml.kernel.org/r/20200709072837.5869-1-krzk@kernel.org
Link: http://lkml.kernel.org/r/20200709072837.5869-2-krzk@kernel.org


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f9e7ff9c

arch/alpha/include/asm/core_apecs.h

+3 −3
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ struct el_apecs_procdata 
		}						\

	} while (0)



__EXTERN_INLINE unsigned int apecs_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -420,7 +420,7 @@ __EXTERN_INLINE void apecs_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int apecs_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -456,7 +456,7 @@ __EXTERN_INLINE void apecs_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int apecs_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < APECS_DENSE_MEM)

arch/alpha/include/asm/core_cia.h

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ struct el_CIA_sysdata_mcheck { 
#define vuip	volatile unsigned int __force *

#define vulp	volatile unsigned long __force *



__EXTERN_INLINE unsigned int cia_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -374,7 +374,7 @@ __EXTERN_INLINE void cia_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int cia_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -404,7 +404,7 @@ __EXTERN_INLINE void cia_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int cia_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < CIA_DENSE_MEM)

arch/alpha/include/asm/core_lca.h

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ union el_lca { 
	} while (0)





__EXTERN_INLINE unsigned int lca_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -266,7 +266,7 @@ __EXTERN_INLINE void lca_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int lca_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -302,7 +302,7 @@ __EXTERN_INLINE void lca_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int lca_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < LCA_DENSE_MEM)

arch/alpha/include/asm/core_marvel.h

+2 −2
Original line number Diff line number Diff line
@@ -332,10 +332,10 @@ struct io7 { 
#define vucp	volatile unsigned char __force *

#define vusp	volatile unsigned short __force *



extern unsigned int marvel_ioread8(void __iomem *);

extern unsigned int marvel_ioread8(const void __iomem *);

extern void marvel_iowrite8(u8 b, void __iomem *);



__EXTERN_INLINE unsigned int marvel_ioread16(void __iomem *addr)

__EXTERN_INLINE unsigned int marvel_ioread16(const void __iomem *addr)

{

	return __kernel_ldwu(*(vusp)addr);

}

arch/alpha/include/asm/core_mcpcia.h

+3 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ extern inline int __mcpcia_is_mmio(unsigned long addr) 
	return (addr & 0x80000000UL) == 0;

}



__EXTERN_INLINE unsigned int mcpcia_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int mcpcia_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long)xaddr & MCPCIA_MEM_MASK;

	unsigned long hose = (unsigned long)xaddr & ~MCPCIA_MEM_MASK;
@@ -291,7 +291,7 @@ __EXTERN_INLINE void mcpcia_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + hose + 0x00) = w;

}



__EXTERN_INLINE unsigned int mcpcia_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int mcpcia_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long)xaddr & MCPCIA_MEM_MASK;

	unsigned long hose = (unsigned long)xaddr & ~MCPCIA_MEM_MASK;
@@ -315,7 +315,7 @@ __EXTERN_INLINE void mcpcia_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + hose + 0x08) = w;

}



__EXTERN_INLINE unsigned int mcpcia_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int mcpcia_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long)xaddr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE