Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c9afc65 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] basic iomem annotations (ppc64) 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2fd9d74b

arch/ppc64/kernel/iomap.c

+6 −6
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ EXPORT_SYMBOL(iowrite32); 
 */

void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)

{

	_insb((u8 __force *) addr, dst, count);

	_insb((u8 __iomem *) addr, dst, count);

}

void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)

{

	_insw_ns((u16 __force *) addr, dst, count);

	_insw_ns((u16 __iomem *) addr, dst, count);

}

void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)

{

	_insl_ns((u32 __force *) addr, dst, count);

	_insl_ns((u32 __iomem *) addr, dst, count);

}

EXPORT_SYMBOL(ioread8_rep);

EXPORT_SYMBOL(ioread16_rep);
@@ -72,15 +72,15 @@ EXPORT_SYMBOL(ioread32_rep); 


void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)

{

	_outsb((u8 __force *) addr, src, count);

	_outsb((u8 __iomem *) addr, src, count);

}

void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)

{

	_outsw_ns((u16 __force *) addr, src, count);

	_outsw_ns((u16 __iomem *) addr, src, count);

}

void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)

{

	_outsl_ns((u32 __force *) addr, src, count);

	_outsl_ns((u32 __iomem *) addr, src, count);

}

EXPORT_SYMBOL(iowrite8_rep);

EXPORT_SYMBOL(iowrite16_rep);

include/asm-ppc64/eeh.h

+20 −19
Original line number Diff line number Diff line
@@ -219,23 +219,24 @@ static inline void eeh_raw_writeq(u64 val, volatile void __iomem *addr) 
static inline void eeh_memset_io(volatile void __iomem *addr, int c,

				 unsigned long n)

{

	void *p = (void __force *)addr;

	u32 lc = c;

	lc |= lc << 8;

	lc |= lc << 16;



	while(n && !EEH_CHECK_ALIGN(addr, 4)) {

		*((volatile u8 *)addr) = c;

		addr = (void *)((unsigned long)addr + 1);

	while(n && !EEH_CHECK_ALIGN(p, 4)) {

		*((volatile u8 *)p) = c;

		p++;

		n--;

	}

	while(n >= 4) {

		*((volatile u32 *)addr) = lc;

		addr = (void *)((unsigned long)addr + 4);

		*((volatile u32 *)p) = lc;

		p += 4;

		n -= 4;

	}

	while(n) {

		*((volatile u8 *)addr) = c;

		addr = (void *)((unsigned long)addr + 1);

		*((volatile u8 *)p) = c;

		p++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");
@@ -250,22 +251,22 @@ static inline void eeh_memcpy_fromio(void *dest, const volatile void __iomem *sr 
	while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) {

		*((u8 *)dest) = *((volatile u8 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc = (void *)((unsigned long)vsrc + 1);

		dest = (void *)((unsigned long)dest + 1);			

		vsrc++;

		dest++;

		n--;

	}

	while(n > 4) {

		*((u32 *)dest) = *((volatile u32 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc = (void *)((unsigned long)vsrc + 4);

		dest = (void *)((unsigned long)dest + 4);			

		vsrc += 4;

		dest += 4;

		n -= 4;

	}

	while(n) {

		*((u8 *)dest) = *((volatile u8 *)vsrc);

		__asm__ __volatile__ ("eieio" : : : "memory");

		vsrc = (void *)((unsigned long)vsrc + 1);

		dest = (void *)((unsigned long)dest + 1);			

		vsrc++;

		dest++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");
@@ -286,20 +287,20 @@ static inline void eeh_memcpy_toio(volatile void __iomem *dest, const void *src, 


	while(n && (!EEH_CHECK_ALIGN(vdest, 4) || !EEH_CHECK_ALIGN(src, 4))) {

		*((volatile u8 *)vdest) = *((u8 *)src);

		src = (void *)((unsigned long)src + 1);

		vdest = (void *)((unsigned long)vdest + 1);			

		src++;

		vdest++;

		n--;

	}

	while(n > 4) {

		*((volatile u32 *)vdest) = *((volatile u32 *)src);

		src = (void *)((unsigned long)src + 4);

		vdest = (void *)((unsigned long)vdest + 4);			

		src += 4;

		vdest += 4;

		n-=4;

	}

	while(n) {

		*((volatile u8 *)vdest) = *((u8 *)src);

		src = (void *)((unsigned long)src + 1);

		vdest = (void *)((unsigned long)vdest + 1);			

		src++;

		vdest++;

		n--;

	}

	__asm__ __volatile__ ("sync" : : : "memory");

include/asm-ppc64/io.h

+21 −21
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ 


#include <asm-generic/iomap.h>



#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 *)(p), (a), (c))

#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 *)(p), (a), (c))

#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 *)(p), (a), (c))

#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 *)(p), (a), (c))

#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 __iomem *)(p), (a), (c))

#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 __iomem *)(p), (a), (c))

#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 __iomem *)(p), (a), (c))

#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 __iomem *)(p), (a), (c))





#define SIO_CONFIG_RA	0x398
@@ -71,8 +71,8 @@ extern unsigned long io_page_mask; 
 * Neither do the standard versions now, these are just here

 * for older code.

 */

#define insw_ns(port, buf, ns)	_insw_ns((u16 *)((port)+pci_io_base), (buf), (ns))

#define insl_ns(port, buf, nl)	_insl_ns((u32 *)((port)+pci_io_base), (buf), (nl))

#define insw_ns(port, buf, ns)	_insw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))

#define insl_ns(port, buf, nl)	_insl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))

#else



static inline unsigned char __raw_readb(const volatile void __iomem *addr)
@@ -136,9 +136,9 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) 
#define insw_ns(port, buf, ns)	eeh_insw_ns((port), (buf), (ns))

#define insl_ns(port, buf, nl)	eeh_insl_ns((port), (buf), (nl))



#define outsb(port, buf, ns)  _outsb((u8 *)((port)+pci_io_base), (buf), (ns))

#define outsw(port, buf, ns)  _outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns))

#define outsl(port, buf, nl)  _outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl))

#define outsb(port, buf, ns)  _outsb((u8 __iomem *)((port)+pci_io_base), (buf), (ns))

#define outsw(port, buf, ns)  _outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))

#define outsl(port, buf, nl)  _outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))



#endif
@@ -147,16 +147,16 @@ static inline void __raw_writeq(unsigned long v, volatile void __iomem *addr) 
#define readl_relaxed(addr) readl(addr)

#define readq_relaxed(addr) readq(addr)



extern void _insb(volatile u8 *port, void *buf, int ns);

extern void _outsb(volatile u8 *port, const void *buf, int ns);

extern void _insw(volatile u16 *port, void *buf, int ns);

extern void _outsw(volatile u16 *port, const void *buf, int ns);

extern void _insl(volatile u32 *port, void *buf, int nl);

extern void _outsl(volatile u32 *port, const void *buf, int nl);

extern void _insw_ns(volatile u16 *port, void *buf, int ns);

extern void _outsw_ns(volatile u16 *port, const void *buf, int ns);

extern void _insl_ns(volatile u32 *port, void *buf, int nl);

extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);

extern void _insb(volatile u8 __iomem *port, void *buf, int ns);

extern void _outsb(volatile u8 __iomem *port, const void *buf, int ns);

extern void _insw(volatile u16 __iomem *port, void *buf, int ns);

extern void _outsw(volatile u16 __iomem *port, const void *buf, int ns);

extern void _insl(volatile u32 __iomem *port, void *buf, int nl);

extern void _outsl(volatile u32 __iomem *port, const void *buf, int nl);

extern void _insw_ns(volatile u16 __iomem *port, void *buf, int ns);

extern void _outsw_ns(volatile u16 __iomem *port, const void *buf, int ns);

extern void _insl_ns(volatile u32 __iomem *port, void *buf, int nl);

extern void _outsl_ns(volatile u32 __iomem *port, const void *buf, int nl);



#define mmiowb()
@@ -176,8 +176,8 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); 
 * Neither do the standard versions now, these are just here

 * for older code.

 */

#define outsw_ns(port, buf, ns)	_outsw_ns((u16 *)((port)+pci_io_base), (buf), (ns))

#define outsl_ns(port, buf, nl)	_outsl_ns((u32 *)((port)+pci_io_base), (buf), (nl))

#define outsw_ns(port, buf, ns)	_outsw_ns((u16 __iomem *)((port)+pci_io_base), (buf), (ns))

#define outsl_ns(port, buf, nl)	_outsl_ns((u32 __iomem *)((port)+pci_io_base), (buf), (nl))





#define IO_SPACE_LIMIT ~(0UL)