Commit bf656998 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sparc32_generic_io_h' 



Sam Ravnborg says:

====================
sparc32: introduce asm-generic

Inspired by Michal Simek <monstr@monstr.eu> this patch-set
introduces asm-generic/io.h for sparc32.

As the diff-stat tells this was a nice code-reduction.

The changes are done on top of the previous sent sparse warning cleanup.
But I do not expect any difficult conflicts if applied alone.

leon_pci + pcic are touched because they had local
and identical implementations of functiones that are
static inline in asm-generic/io.h

leon_pci_grpci1 + leon_pci_grpci2 are touched becuse they
used a sparc spacific implmentation of swab32.
They have just been changed to use the global variant.

I also looked at sparc64 - but there were to many
sparc64 assembler implementations of the io
functons - and the generic io.h did not support this mix.

The last patch kills a few defines in io.h for sbus.
I assume they were introduced before the functions
were all shifted over to __iomem style pointers.
The same could be done for sparc64 - but then
there were even more of the same so I left
this for another time.

The patch-set has been build tested only.
My attempts to test this using qemu have failed as
the qemu version I have errors out.
And my fedora box are mssing some libs to build
qemu from source :-(
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8cf749a8 c3373da9

arch/sparc/include/asm/io_32.h

+48 −239
Original line number Diff line number Diff line
@@ -2,191 +2,94 @@ 
#define __SPARC_IO_H



#include <linux/kernel.h>

#include <linux/types.h>

#include <linux/ioport.h>  /* struct resource */



#include <asm/page.h>      /* IO address mapping routines need this */

#include <asm-generic/pci_iomap.h>



#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)



static inline u32 flip_dword (u32 l)

{

	return ((l&0xff)<<24) | (((l>>8)&0xff)<<16) | (((l>>16)&0xff)<<8)| ((l>>24)&0xff);

}



static inline u16 flip_word (u16 w)

{

	return ((w&0xff) << 8) | ((w>>8)&0xff);

}



#define mmiowb()



/*

 * Memory mapped I/O to PCI

 */

#define readb_relaxed(__addr)	readb(__addr)

#define readw_relaxed(__addr)	readw(__addr)

#define readl_relaxed(__addr)	readl(__addr)



static inline u8 __raw_readb(const volatile void __iomem *addr)

{

	return *(__force volatile u8 *)addr;

}

#define IO_SPACE_LIMIT 0xffffffff



static inline u16 __raw_readw(const volatile void __iomem *addr)

{

	return *(__force volatile u16 *)addr;

}

#define memset_io(d,c,sz)     _memset_io(d,c,sz)

#define memcpy_fromio(d,s,sz) _memcpy_fromio(d,s,sz)

#define memcpy_toio(d,s,sz)   _memcpy_toio(d,s,sz)



static inline u32 __raw_readl(const volatile void __iomem *addr)

{

	return *(__force volatile u32 *)addr;

}

#include <asm-generic/io.h>



static inline void __raw_writeb(u8 b, volatile void __iomem *addr)

static inline void _memset_io(volatile void __iomem *dst,

                              int c, __kernel_size_t n)

{

	*(__force volatile u8 *)addr = b;

}

	volatile void __iomem *d = dst;



static inline void __raw_writew(u16 w, volatile void __iomem *addr)

{

	*(__force volatile u16 *)addr = w;

	while (n--) {

		writeb(c, d);

		d++;

	}



static inline void __raw_writel(u32 l, volatile void __iomem *addr)

{

	*(__force volatile u32 *)addr = l;

}



static inline u8 __readb(const volatile void __iomem *addr)

static inline void _memcpy_fromio(void *dst, const volatile void __iomem *src,

                                  __kernel_size_t n)

{

	return *(__force volatile u8 *)addr;

}

	char *d = dst;



static inline u16 __readw(const volatile void __iomem *addr)

{

	return flip_word(*(__force volatile u16 *)addr);

	while (n--) {

		char tmp = readb(src);

		*d++ = tmp;

		src++;

	}



static inline u32 __readl(const volatile void __iomem *addr)

{

	return flip_dword(*(__force volatile u32 *)addr);

}



static inline void __writeb(u8 b, volatile void __iomem *addr)

static inline void _memcpy_toio(volatile void __iomem *dst, const void *src,

                                __kernel_size_t n)

{

	*(__force volatile u8 *)addr = b;

}

	const char *s = src;

	volatile void __iomem *d = dst;



static inline void __writew(u16 w, volatile void __iomem *addr)

{

	*(__force volatile u16 *)addr = flip_word(w);

	while (n--) {

		char tmp = *s++;

		writeb(tmp, d);

		d++;

	}



static inline void __writel(u32 l, volatile void __iomem *addr)

{

	*(__force volatile u32 *)addr = flip_dword(l);

}



#define readb(__addr)		__readb(__addr)

#define readw(__addr)		__readw(__addr)

#define readl(__addr)		__readl(__addr)

#define readb_relaxed(__addr)	readb(__addr)

#define readw_relaxed(__addr)	readw(__addr)

#define readl_relaxed(__addr)	readl(__addr)



#define writeb(__b, __addr)	__writeb((__b),(__addr))

#define writew(__w, __addr)	__writew((__w),(__addr))

#define writel(__l, __addr)	__writel((__l),(__addr))



/*

 * I/O space operations

 *

 * Arrangement on a Sun is somewhat complicated.

 *

 * First of all, we want to use standard Linux drivers

 * for keyboard, PC serial, etc. These drivers think

 * they access I/O space and use inb/outb.

 * On the other hand, EBus bridge accepts PCI *memory*

 * cycles and converts them into ISA *I/O* cycles.

 * Ergo, we want inb & outb to generate PCI memory cycles.

 *

 * If we want to issue PCI *I/O* cycles, we do this

 * with a low 64K fixed window in PCIC. This window gets

 * mapped somewhere into virtual kernel space and we

 * can use inb/outb again.

 */

#define inb_local(__addr)	__readb((void __iomem *)(unsigned long)(__addr))

#define inb(__addr)		__readb((void __iomem *)(unsigned long)(__addr))

#define inw(__addr)		__readw((void __iomem *)(unsigned long)(__addr))

#define inl(__addr)		__readl((void __iomem *)(unsigned long)(__addr))



#define outb_local(__b, __addr)	__writeb(__b, (void __iomem *)(unsigned long)(__addr))

#define outb(__b, __addr)	__writeb(__b, (void __iomem *)(unsigned long)(__addr))

#define outw(__w, __addr)	__writew(__w, (void __iomem *)(unsigned long)(__addr))

#define outl(__l, __addr)	__writel(__l, (void __iomem *)(unsigned long)(__addr))



#define inb_p(__addr)		inb(__addr)

#define outb_p(__b, __addr)	outb(__b, __addr)

#define inw_p(__addr)		inw(__addr)

#define outw_p(__w, __addr)	outw(__w, __addr)

#define inl_p(__addr)		inl(__addr)

#define outl_p(__l, __addr)	outl(__l, __addr)



void outsb(unsigned long addr, const void *src, unsigned long cnt);

void outsw(unsigned long addr, const void *src, unsigned long cnt);

void outsl(unsigned long addr, const void *src, unsigned long cnt);

void insb(unsigned long addr, void *dst, unsigned long count);

void insw(unsigned long addr, void *dst, unsigned long count);

void insl(unsigned long addr, void *dst, unsigned long count);



#define IO_SPACE_LIMIT 0xffffffff



/*

 * SBus accessors.

 *

 * SBus has only one, memory mapped, I/O space.

 * We do not need to flip bytes for SBus of course.

 */

static inline u8 _sbus_readb(const volatile void __iomem *addr)

static inline u8 sbus_readb(const volatile void __iomem *addr)

{

	return *(__force volatile u8 *)addr;

}



static inline u16 _sbus_readw(const volatile void __iomem *addr)

static inline u16 sbus_readw(const volatile void __iomem *addr)

{

	return *(__force volatile u16 *)addr;

}



static inline u32 _sbus_readl(const volatile void __iomem *addr)

static inline u32 sbus_readl(const volatile void __iomem *addr)

{

	return *(__force volatile u32 *)addr;

}



static inline void _sbus_writeb(u8 b, volatile void __iomem *addr)

static inline void sbus_writeb(u8 b, volatile void __iomem *addr)

{

	*(__force volatile u8 *)addr = b;

}



static inline void _sbus_writew(u16 w, volatile void __iomem *addr)

static inline void sbus_writew(u16 w, volatile void __iomem *addr)

{

	*(__force volatile u16 *)addr = w;

}



static inline void _sbus_writel(u32 l, volatile void __iomem *addr)

static inline void sbus_writel(u32 l, volatile void __iomem *addr)

{

	*(__force volatile u32 *)addr = l;

}



/*

 * The only reason for #define's is to hide casts to unsigned long.

 */

#define sbus_readb(__addr)		_sbus_readb(__addr)

#define sbus_readw(__addr)		_sbus_readw(__addr)

#define sbus_readl(__addr)		_sbus_readl(__addr)

#define sbus_writeb(__b, __addr)	_sbus_writeb(__b, __addr)

#define sbus_writew(__w, __addr)	_sbus_writew(__w, __addr)

#define sbus_writel(__l, __addr)	_sbus_writel(__l, __addr)



static inline void sbus_memset_io(volatile void __iomem *__dst, int c, __kernel_size_t n)

static inline void sbus_memset_io(volatile void __iomem *__dst, int c,

                                  __kernel_size_t n)

{

	while(n--) {

		sbus_writeb(c, __dst);
@@ -194,21 +97,8 @@ static inline void sbus_memset_io(volatile void __iomem *__dst, int c, __kernel_ 
	}

}



static inline void

_memset_io(volatile void __iomem *dst, int c, __kernel_size_t n)

{

	volatile void __iomem *d = dst;



	while (n--) {

		writeb(c, d);

		d++;

	}

}



#define memset_io(d,c,sz)	_memset_io(d,c,sz)



static inline void

_sbus_memcpy_fromio(void *dst, const volatile void __iomem *src,

static inline void sbus_memcpy_fromio(void *dst,

                                      const volatile void __iomem *src,

                                      __kernel_size_t n)

{

	char *d = dst;
@@ -220,24 +110,8 @@ _sbus_memcpy_fromio(void *dst, const volatile void __iomem *src, 
	}

}



#define sbus_memcpy_fromio(d, s, sz)	_sbus_memcpy_fromio(d, s, sz)



static inline void

_memcpy_fromio(void *dst, const volatile void __iomem *src, __kernel_size_t n)

{

	char *d = dst;



	while (n--) {

		char tmp = readb(src);

		*d++ = tmp;

		src++;

	}

}



#define memcpy_fromio(d,s,sz)	_memcpy_fromio(d,s,sz)



static inline void

_sbus_memcpy_toio(volatile void __iomem *dst, const void *src,

static inline void sbus_memcpy_toio(volatile void __iomem *dst,

                                    const void *src,

                                    __kernel_size_t n)

{

	const char *s = src;
@@ -250,23 +124,6 @@ _sbus_memcpy_toio(volatile void __iomem *dst, const void *src, 
	}

}



#define sbus_memcpy_toio(d, s, sz)	_sbus_memcpy_toio(d, s, sz)



static inline void

_memcpy_toio(volatile void __iomem *dst, const void *src, __kernel_size_t n)

{

	const char *s = src;

	volatile void __iomem *d = dst;



	while (n--) {

		char tmp = *s++;

		writeb(tmp, d);

		d++;

	}

}



#define memcpy_toio(d,s,sz)	_memcpy_toio(d,s,sz)



#ifdef __KERNEL__



/*
@@ -278,46 +135,6 @@ extern void __iomem *ioremap(unsigned long offset, unsigned long size); 
#define ioremap_wc(X,Y)		ioremap((X),(Y))

extern void iounmap(volatile void __iomem *addr);



#define ioread8(X)			readb(X)

#define ioread16(X)			readw(X)

#define ioread16be(X)			__raw_readw(X)

#define ioread32(X)			readl(X)

#define ioread32be(X)			__raw_readl(X)

#define iowrite8(val,X)			writeb(val,X)

#define iowrite16(val,X)		writew(val,X)

#define iowrite16be(val,X)		__raw_writew(val,X)

#define iowrite32(val,X)		writel(val,X)

#define iowrite32be(val,X)		__raw_writel(val,X)



static inline void ioread8_rep(void __iomem *port, void *buf, unsigned long count)

{

	insb((unsigned long __force)port, buf, count);

}

static inline void ioread16_rep(void __iomem *port, void *buf, unsigned long count)

{

	insw((unsigned long __force)port, buf, count);

}



static inline void ioread32_rep(void __iomem *port, void *buf, unsigned long count)

{

	insl((unsigned long __force)port, buf, count);

}



static inline void iowrite8_rep(void __iomem *port, const void *buf, unsigned long count)

{

	outsb((unsigned long __force)port, buf, count);

}



static inline void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count)

{

	outsw((unsigned long __force)port, buf, count);

}



static inline void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count)

{

	outsl((unsigned long __force)port, buf, count);

}



/* Create a virtual mapping cookie for an IO port range */

extern void __iomem *ioport_map(unsigned long port, unsigned int nr);

extern void ioport_unmap(void __iomem *);
@@ -326,6 +143,8 @@ extern void ioport_unmap(void __iomem *); 
struct pci_dev;

extern void pci_iounmap(struct pci_dev *dev, void __iomem *);







/*

 * At the moment, we do not use CMOS_READ anywhere outside of rtc.c,

 * so rtc_port is static in it. This should not change unless a new
@@ -349,15 +168,5 @@ extern void sbus_set_sbus64(struct device *, int); 


#define __ARCH_HAS_NO_PAGE_ZERO_MAPPED		1



/*

 * Convert a physical pointer to a virtual kernel pointer for /dev/mem

 * access

 */

#define xlate_dev_mem_ptr(p)	__va(p)



/*

 * Convert a virtual cached pointer to an uncached pointer

 */

#define xlate_dev_kmem_ptr(p)	p



#endif /* !(__SPARC_IO_H) */

arch/sparc/include/asm/io_64.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 


/* BIO layer definitions. */

extern unsigned long kern_base, kern_size;

#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)



static inline u8 _inb(unsigned long addr)

{

arch/sparc/include/asm/page.h

+3 −0
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_PAGE_H

#define ___ASM_SPARC_PAGE_H



#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)



#if defined(__sparc__) && defined(__arch64__)

#include <asm/page_64.h>

#else

arch/sparc/kernel/leon_pci.c

+0 −79
Original line number Diff line number Diff line
@@ -98,82 +98,3 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
{

	return res->start;

}
 


/* in/out routines taken from pcic.c

 *

 * This probably belongs here rather than ioport.c because

 * we do not want this crud linked into SBus kernels.

 * Also, think for a moment about likes of floppy.c that

 * include architecture specific parts. They may want to redefine ins/outs.

 *

 * We do not use horrible macros here because we want to

 * advance pointer by sizeof(size).

 */

void outsb(unsigned long addr, const void *src, unsigned long count)

{

	while (count) {

		count -= 1;

		outb(*(const char *)src, addr);

		src += 1;

		/* addr += 1; */

	}

}

EXPORT_SYMBOL(outsb);



void outsw(unsigned long addr, const void *src, unsigned long count)

{

	while (count) {

		count -= 2;

		outw(*(const short *)src, addr);

		src += 2;

		/* addr += 2; */

	}

}

EXPORT_SYMBOL(outsw);



void outsl(unsigned long addr, const void *src, unsigned long count)

{

	while (count) {

		count -= 4;

		outl(*(const long *)src, addr);

		src += 4;

		/* addr += 4; */

	}

}

EXPORT_SYMBOL(outsl);



void insb(unsigned long addr, void *dst, unsigned long count)

{

	while (count) {

		count -= 1;

		*(unsigned char *)dst = inb(addr);

		dst += 1;

		/* addr += 1; */

	}

}

EXPORT_SYMBOL(insb);



void insw(unsigned long addr, void *dst, unsigned long count)

{

	while (count) {

		count -= 2;

		*(unsigned short *)dst = inw(addr);

		dst += 2;

		/* addr += 2; */

	}

}

EXPORT_SYMBOL(insw);



void insl(unsigned long addr, void *dst, unsigned long count)

{

	while (count) {

		count -= 4;

		/*

		 * XXX I am sure we are in for an unaligned trap here.

		 */

		*(unsigned long *)dst = inl(addr);

		dst += 4;

		/* addr += 4; */

	}

}

EXPORT_SYMBOL(insl);

arch/sparc/kernel/leon_pci_grpci1.c

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ static int grpci1_cfg_r32(struct grpci1_priv *priv, unsigned int bus, 
		grpci1_cfg_w32(priv, TGT, 0, PCI_COMMAND, tmp);

	} else {

		/* Bus always little endian (unaffected by byte-swapping) */

		*val = flip_dword(tmp);

		*val = swab32(tmp);

	}



	return 0;
@@ -197,7 +197,7 @@ static int grpci1_cfg_w32(struct grpci1_priv *priv, unsigned int bus, 


	pci_conf = (unsigned int *) (priv->pci_conf |

						(devfn << 8) | (where & 0xfc));

	LEON3_BYPASS_STORE_PA(pci_conf, flip_dword(val));

	LEON3_BYPASS_STORE_PA(pci_conf, swab32(val));



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE