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

Commit b66c1a39 authored by Paul Mundt's avatar Paul Mundt Committed by Linus Torvalds
Browse files

[PATCH] sh: I/O routine cleanups and ioremap() overhaul 



This introduces a few changes in the way that the I/O routines are defined on
SH, specifically so that things like the iomap API properly wrap through the
machvec for board-specific quirks.

In addition to this, the old p3_ioremap() work is converted to a more generic
__ioremap() that will map through the PMB if it's available, or fall back on
page tables for everything else.

An alpha-like IO_CONCAT is also added so we can start to clean up the
board-specific io.h mess, which will be handled in board update patches..

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent bf3a00f8

arch/sh/kernel/io.c

+28 −13
Original line number Diff line number Diff line
@@ -2,58 +2,73 @@ 
 * linux/arch/sh/kernel/io.c

 *

 * Copyright (C) 2000  Stuart Menefy

 * Copyright (C) 2005  Paul Mundt

 *

 * Provide real functions which expand to whatever the header file defined.

 * Also definitions of machine independent IO functions.

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */



#include <asm/io.h>

#include <linux/module.h>

#include <asm/machvec.h>

#include <asm/io.h>



/*

 * Copy data from IO memory space to "real" memory space.

 * This needs to be optimized.

 */

void  memcpy_fromio(void * to, unsigned long from, unsigned long count)

void memcpy_fromio(void *to, volatile void __iomem *from, unsigned long count)

{

	char *p = to;

        while (count) {

                count--;

                *p = readb(from);

                *p = readb((void __iomem *)from);

                p++;

                from++;

        }

}

EXPORT_SYMBOL(memcpy_fromio);



/*

 * Copy data from "real" memory space to IO memory space.

 * This needs to be optimized.

 */

void  memcpy_toio(unsigned long to, const void * from, unsigned long count)

void memcpy_toio(volatile void __iomem *to, const void *from, unsigned long count)

{

	const char *p = from;

        while (count) {

                count--;

                writeb(*p, to);

                writeb(*p, (void __iomem *)to);

                p++;

                to++;

        }

}

EXPORT_SYMBOL(memcpy_toio);



/*

 * "memset" on IO memory space.

 * This needs to be optimized.

 */

void  memset_io(unsigned long dst, int c, unsigned long count)

void memset_io(volatile void __iomem *dst, int c, unsigned long count)

{

        while (count) {

                count--;

                writeb(c, dst);

                writeb(c, (void __iomem *)dst);

                dst++;

        }

}



EXPORT_SYMBOL(memcpy_fromio);

EXPORT_SYMBOL(memcpy_toio);

EXPORT_SYMBOL(memset_io);



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

{

	return sh_mv.mv_ioport_map(port, nr);

}

EXPORT_SYMBOL(ioport_map);



void ioport_unmap(void __iomem *addr)

{

	sh_mv.mv_ioport_unmap(addr);

}

EXPORT_SYMBOL(ioport_unmap);

arch/sh/kernel/io_generic.c

+87 −105
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
 * linux/arch/sh/kernel/io_generic.c

 *

 * Copyright (C) 2000  Niibe Yutaka

 * Copyright (C) 2005  Paul Mundt

 *

 * Generic I/O routine. These can be used where a machine specific version

 * is not required.
@@ -10,21 +11,20 @@ 
 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 */



#include <linux/module.h>

#include <asm/io.h>

#include <asm/machvec.h>

#include <linux/module.h>



#if defined(CONFIG_CPU_SH3)

#ifdef CONFIG_CPU_SH3

/* SH3 has a PCMCIA bug that needs a dummy read from area 6 for a

 * workaround. */

/* I'm not sure SH7709 has this kind of bug */

#define SH3_PCMCIA_BUG_WORKAROUND 1

#define DUMMY_READ_AREA6	  0xba000000

#define dummy_read()	ctrl_inb(0xba000000)

#else

#define dummy_read()

#endif



#define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x))



unsigned long generic_io_base;



static inline void delay(void)
@@ -32,40 +32,40 @@ static inline void delay(void) 
	ctrl_inw(0xa0000000);

}



unsigned char generic_inb(unsigned long port)

u8 generic_inb(unsigned long port)

{

	return *(volatile unsigned char*)PORT2ADDR(port);

	return ctrl_inb((unsigned long __force)ioport_map(port, 1));

}



unsigned short generic_inw(unsigned long port)

u16 generic_inw(unsigned long port)

{

	return *(volatile unsigned short*)PORT2ADDR(port);

	return ctrl_inw((unsigned long __force)ioport_map(port, 2));

}



unsigned int generic_inl(unsigned long port)

u32 generic_inl(unsigned long port)

{

	return *(volatile unsigned long*)PORT2ADDR(port);

	return ctrl_inl((unsigned long __force)ioport_map(port, 4));

}



unsigned char generic_inb_p(unsigned long port)

u8 generic_inb_p(unsigned long port)

{

	unsigned long v = *(volatile unsigned char*)PORT2ADDR(port);

	unsigned long v = generic_inb(port);



	delay();

	return v;

}



unsigned short generic_inw_p(unsigned long port)

u16 generic_inw_p(unsigned long port)

{

	unsigned long v = *(volatile unsigned short*)PORT2ADDR(port);

	unsigned long v = generic_inw(port);



	delay();

	return v;

}



unsigned int generic_inl_p(unsigned long port)

u32 generic_inl_p(unsigned long port)

{

	unsigned long v = *(volatile unsigned long*)PORT2ADDR(port);

	unsigned long v = generic_inl(port);



	delay();

	return v;
@@ -77,75 +77,70 @@ unsigned int generic_inl_p(unsigned long port) 
 * convert the port address to real address once.

 */



void generic_insb(unsigned long port, void *buffer, unsigned long count)

void generic_insb(unsigned long port, void *dst, unsigned long count)

{

	volatile unsigned char *port_addr;

	unsigned char *buf=buffer;



	port_addr = (volatile unsigned char *)PORT2ADDR(port);

	volatile u8 *port_addr;

	u8 *buf = dst;



	port_addr = (volatile u8 *)ioport_map(port, 1);

	while (count--)

		*buf++ = *port_addr;

}



void generic_insw(unsigned long port, void *buffer, unsigned long count)

void generic_insw(unsigned long port, void *dst, unsigned long count)

{

	volatile unsigned short *port_addr;

	unsigned short *buf=buffer;



	port_addr = (volatile unsigned short *)PORT2ADDR(port);

	volatile u16 *port_addr;

	u16 *buf = dst;



	port_addr = (volatile u16 *)ioport_map(port, 2);

	while (count--)

		*buf++ = *port_addr;

#ifdef SH3_PCMCIA_BUG_WORKAROUND

	ctrl_inb (DUMMY_READ_AREA6);

#endif



	dummy_read();

}



void generic_insl(unsigned long port, void *buffer, unsigned long count)

void generic_insl(unsigned long port, void *dst, unsigned long count)

{

	volatile unsigned long *port_addr;

	unsigned long *buf=buffer;



	port_addr = (volatile unsigned long *)PORT2ADDR(port);

	volatile u32 *port_addr;

	u32 *buf = dst;



	port_addr = (volatile u32 *)ioport_map(port, 4);

	while (count--)

		*buf++ = *port_addr;

#ifdef SH3_PCMCIA_BUG_WORKAROUND

	ctrl_inb (DUMMY_READ_AREA6);

#endif



	dummy_read();

}



void generic_outb(unsigned char b, unsigned long port)

void generic_outb(u8 b, unsigned long port)

{

	*(volatile unsigned char*)PORT2ADDR(port) = b;

	ctrl_outb(b, (unsigned long __force)ioport_map(port, 1));

}



void generic_outw(unsigned short b, unsigned long port)

void generic_outw(u16 b, unsigned long port)

{

	*(volatile unsigned short*)PORT2ADDR(port) = b;

	ctrl_outw(b, (unsigned long __force)ioport_map(port, 2));

}



void generic_outl(unsigned int b, unsigned long port)

void generic_outl(u32 b, unsigned long port)

{

        *(volatile unsigned long*)PORT2ADDR(port) = b;

	ctrl_outl(b, (unsigned long __force)ioport_map(port, 4));

}



void generic_outb_p(unsigned char b, unsigned long port)

void generic_outb_p(u8 b, unsigned long port)

{

	*(volatile unsigned char*)PORT2ADDR(port) = b;

	generic_outb(b, port);

	delay();

}



void generic_outw_p(unsigned short b, unsigned long port)

void generic_outw_p(u16 b, unsigned long port)

{

	*(volatile unsigned short*)PORT2ADDR(port) = b;

	generic_outw(b, port);

	delay();

}



void generic_outl_p(unsigned int b, unsigned long port)

void generic_outl_p(u32 b, unsigned long port)

{

	*(volatile unsigned long*)PORT2ADDR(port) = b;

	generic_outl(b, port);

	delay();

}
@@ -154,90 +149,77 @@ void generic_outl_p(unsigned int b, unsigned long port) 
 * address. However as the port address doesn't change we only need to

 * convert the port address to real address once.

 */



void generic_outsb(unsigned long port, const void *buffer, unsigned long count)

void generic_outsb(unsigned long port, const void *src, unsigned long count)

{

	volatile unsigned char *port_addr;

	const unsigned char *buf=buffer;

	volatile u8 *port_addr;

	const u8 *buf = src;



	port_addr = (volatile unsigned char *)PORT2ADDR(port);

	port_addr = (volatile u8 __force *)ioport_map(port, 1);



	while (count--)

		*port_addr = *buf++;

}



void generic_outsw(unsigned long port, const void *buffer, unsigned long count)

void generic_outsw(unsigned long port, const void *src, unsigned long count)

{

	volatile unsigned short *port_addr;

	const unsigned short *buf=buffer;

	volatile u16 *port_addr;

	const u16 *buf = src;



	port_addr = (volatile unsigned short *)PORT2ADDR(port);

	port_addr = (volatile u16 __force *)ioport_map(port, 2);



	while (count--)

		*port_addr = *buf++;



#ifdef SH3_PCMCIA_BUG_WORKAROUND

	ctrl_inb (DUMMY_READ_AREA6);

#endif

	dummy_read();

}



void generic_outsl(unsigned long port, const void *buffer, unsigned long count)

void generic_outsl(unsigned long port, const void *src, unsigned long count)

{

	volatile unsigned long *port_addr;

	const unsigned long *buf=buffer;



	port_addr = (volatile unsigned long *)PORT2ADDR(port);

	volatile u32 *port_addr;

	const u32 *buf = src;



	port_addr = (volatile u32 __force *)ioport_map(port, 4);

	while (count--)

		*port_addr = *buf++;



#ifdef SH3_PCMCIA_BUG_WORKAROUND

	ctrl_inb (DUMMY_READ_AREA6);

#endif

}



unsigned char generic_readb(unsigned long addr)

{

	return *(volatile unsigned char*)addr;

	dummy_read();

}



unsigned short generic_readw(unsigned long addr)

u8 generic_readb(void __iomem *addr)

{

	return *(volatile unsigned short*)addr;

	return ctrl_inb((unsigned long __force)addr);

}



unsigned int generic_readl(unsigned long addr)

u16 generic_readw(void __iomem *addr)

{

	return *(volatile unsigned long*)addr;

	return ctrl_inw((unsigned long __force)addr);

}



void generic_writeb(unsigned char b, unsigned long addr)

u32 generic_readl(void __iomem *addr)

{

	*(volatile unsigned char*)addr = b;

	return ctrl_inl((unsigned long __force)addr);

}



void generic_writew(unsigned short b, unsigned long addr)

void generic_writeb(u8 b, void __iomem *addr)

{

	*(volatile unsigned short*)addr = b;

	ctrl_outb(b, (unsigned long __force)addr);

}



void generic_writel(unsigned int b, unsigned long addr)

void generic_writew(u16 b, void __iomem *addr)

{

        *(volatile unsigned long*)addr = b;

	ctrl_outw(b, (unsigned long __force)addr);

}



void * generic_ioremap(unsigned long offset, unsigned long size)

void generic_writel(u32 b, void __iomem *addr)

{

	return (void *) P2SEGADDR(offset);

	ctrl_outl(b, (unsigned long __force)addr);

}

EXPORT_SYMBOL(generic_ioremap);



void generic_iounmap(void *addr)

void __iomem *generic_ioport_map(unsigned long addr, unsigned int size)

{

	return (void __iomem *)(addr + generic_io_base);

}

EXPORT_SYMBOL(generic_iounmap);



unsigned long generic_isa_port2addr(unsigned long offset)

void generic_ioport_unmap(void __iomem *addr)

{

	return offset + generic_io_base;

}

arch/sh/mm/ioremap.c

+81 −18
Original line number Diff line number Diff line
@@ -6,13 +6,19 @@ 
 * 640k-1MB IO memory area on PC's

 *

 * (C) Copyright 1995 1996 Linus Torvalds

 * (C) Copyright 2005, 2006 Paul Mundt

 *

 * This file is subject to the terms and conditions of the GNU General

 * Public License. See the file "COPYING" in the main directory of this

 * archive for more details.

 */



#include <linux/vmalloc.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <asm/io.h>

#include <asm/page.h>

#include <asm/pgalloc.h>

#include <asm/addrspace.h>

#include <asm/cacheflush.h>

#include <asm/tlbflush.h>
@@ -80,9 +86,15 @@ int remap_area_pages(unsigned long address, unsigned long phys_addr, 
	if (address >= end)

		BUG();

	do {

		pud_t *pud;

		pmd_t *pmd;

		pmd = pmd_alloc(&init_mm, dir, address);



		error = -ENOMEM;



		pud = pud_alloc(&init_mm, dir, address);

		if (!pud)

			break;

		pmd = pmd_alloc(&init_mm, pud, address);

		if (!pmd)

			break;

		if (remap_area_pmd(pmd, address, end - address,
@@ -96,10 +108,6 @@ int remap_area_pages(unsigned long address, unsigned long phys_addr, 
	return error;

}



/*

 * Generic mapping function (not visible outside):

 */



/*

 * Remap an arbitrary physical address space into the kernel virtual

 * address space. Needed when the kernel wants to access high addresses
@@ -109,11 +117,11 @@ int remap_area_pages(unsigned long address, unsigned long phys_addr, 
 * have to convert them into an offset in a page-aligned mapping, but the

 * caller shouldn't need to know that small detail.

 */

void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags)

void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,

			unsigned long flags)

{

	void * addr;

	struct vm_struct * area;

	unsigned long offset, last_addr;

	unsigned long offset, last_addr, addr, orig_addr;



	/* Don't allow wraparound or zero size */

	last_addr = phys_addr + size - 1;
@@ -124,7 +132,7 @@ void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long fla 
	 * Don't remap the low PCI/ISA area, it's always mapped..

	 */

	if (phys_addr >= 0xA0000 && last_addr < 0x100000)

		return phys_to_virt(phys_addr);

		return (void __iomem *)phys_to_virt(phys_addr);



	/*

	 * Don't allow anybody to remap normal RAM that we're using..
@@ -146,16 +154,71 @@ void * p3_ioremap(unsigned long phys_addr, unsigned long size, unsigned long fla 
	if (!area)

		return NULL;

	area->phys_addr = phys_addr;

	addr = area->addr;

	if (remap_area_pages((unsigned long) addr, phys_addr, size, flags)) {

		vunmap(addr);

	orig_addr = addr = (unsigned long)area->addr;



#ifdef CONFIG_32BIT

	/*

	 * First try to remap through the PMB once a valid VMA has been

	 * established. Smaller allocations (or the rest of the size

	 * remaining after a PMB mapping due to the size not being

	 * perfectly aligned on a PMB size boundary) are then mapped

	 * through the UTLB using conventional page tables.

	 *

	 * PMB entries are all pre-faulted.

	 */

	if (unlikely(size >= 0x1000000)) {

		unsigned long mapped = pmb_remap(addr, phys_addr, size, flags);



		if (likely(mapped)) {

			addr		+= mapped;

			phys_addr	+= mapped;

			size		-= mapped;

		}

	}

#endif



	if (likely(size))

		if (remap_area_pages(addr, phys_addr, size, flags)) {

			vunmap((void *)orig_addr);

			return NULL;

		}

	return (void *) (offset + (char *)addr);



	return (void __iomem *)(offset + (char *)orig_addr);

}

EXPORT_SYMBOL(__ioremap);



void p3_iounmap(void *addr)

void __iounmap(void __iomem *addr)

{

	if (addr > high_memory)

		vfree((void *)(PAGE_MASK & (unsigned long)addr));

	unsigned long vaddr = (unsigned long __force)addr;

	struct vm_struct *p;



	if (PXSEG(vaddr) < P3SEG)

		return;



#ifdef CONFIG_32BIT

	/*

	 * Purge any PMB entries that may have been established for this

	 * mapping, then proceed with conventional VMA teardown.

	 *

	 * XXX: Note that due to the way that remove_vm_area() does

	 * matching of the resultant VMA, we aren't able to fast-forward

	 * the address past the PMB space until the end of the VMA where

	 * the page tables reside. As such, unmap_vm_area() will be

	 * forced to linearly scan over the area until it finds the page

	 * tables where PTEs that need to be unmapped actually reside,

	 * which is far from optimal. Perhaps we need to use a separate

	 * VMA for the PMB mappings?

	 *					-- PFM.

	 */

	pmb_unmap(vaddr);

#endif



	p = remove_vm_area((void *)(vaddr & PAGE_MASK));

	if (!p) {

		printk(KERN_ERR "%s: bad address %p\n", __FUNCTION__, addr);

		return;

	}



	kfree(p);

}

EXPORT_SYMBOL(__iounmap);

include/asm-sh/io.h

+166 −117
Original line number Diff line number Diff line
@@ -23,19 +23,27 @@ 
 *  inb   by default expands to _inb, but the machine specific code may

 *        define it to __inb if it chooses.

 */



#include <linux/config.h>

#include <asm/cache.h>

#include <asm/system.h>

#include <asm/addrspace.h>

#include <asm/machvec.h>

#include <linux/config.h>

#include <asm/pgtable.h>

#include <asm-generic/iomap.h>



#ifdef __KERNEL__



/*

 * Depending on which platform we are running on, we need different

 * I/O functions.

 */

#define __IO_PREFIX	generic

#include <asm/io_generic.h>



#define maybebadio(port) \

  printk(KERN_ERR "bad PC-like io %s:%u for port 0x%lx at 0x%08x\n", \

	 __FUNCTION__, __LINE__, (port), (u32)__builtin_return_address(0))



#ifdef __KERNEL__

/*

 * Since boards are able to define their own set of I/O routines through

 * their respective machine vector, we always wrap through the mv.
@@ -72,11 +80,6 @@ 
#define __writew(v,a)	sh_mv.mv_writew((v),(a))

#define __writel(v,a)	sh_mv.mv_writel((v),(a))



# define __ioremap(a,s)	sh_mv.mv_ioremap((a), (s))

# define __iounmap(a)	sh_mv.mv_iounmap((a))



# define __isa_port2addr(a)	sh_mv.mv_isa_port2addr(a)



#define inb		__inb

#define inw		__inw

#define inl		__inl
@@ -98,59 +101,71 @@ 
#define outsw		__outsw

#define outsl		__outsl



# define __raw_readb	__readb

# define __raw_readw	__readw

# define __raw_readl	__readl

# define __raw_writeb	__writeb

# define __raw_writew	__writew

# define __raw_writel	__writel

#define __raw_readb(a)		__readb((void __iomem *)(a))

#define __raw_readw(a)		__readw((void __iomem *)(a))

#define __raw_readl(a)		__readl((void __iomem *)(a))

#define __raw_writeb(v, a)	__writeb(v, (void __iomem *)(a))

#define __raw_writew(v, a)	__writew(v, (void __iomem *)(a))

#define __raw_writel(v, a)	__writel(v, (void __iomem *)(a))



/*

 * The platform header files may define some of these macros to use

 * the inlined versions where appropriate.  These macros may also be

 * redefined by userlevel programs.

 */

#ifdef __raw_readb

# define readb(a)	({ unsigned long r_ = __raw_readb((unsigned long)a); mb(); r_; })

#ifdef __readb

# define readb(a)	({ unsigned long r_ = __raw_readb(a); mb(); r_; })

#endif

#ifdef __raw_readw

# define readw(a)	({ unsigned long r_ = __raw_readw((unsigned long)a); mb(); r_; })

# define readw(a)	({ unsigned long r_ = __raw_readw(a); mb(); r_; })

#endif

#ifdef __raw_readl

# define readl(a)	({ unsigned long r_ = __raw_readl((unsigned long)a); mb(); r_; })

# define readl(a)	({ unsigned long r_ = __raw_readl(a); mb(); r_; })

#endif



#ifdef __raw_writeb

# define writeb(v,a)	({ __raw_writeb((v),(unsigned long)(a)); mb(); })

# define writeb(v,a)	({ __raw_writeb((v),(a)); mb(); })

#endif

#ifdef __raw_writew

# define writew(v,a)	({ __raw_writew((v),(unsigned long)(a)); mb(); })

# define writew(v,a)	({ __raw_writew((v),(a)); mb(); })

#endif

#ifdef __raw_writel

# define writel(v,a)	({ __raw_writel((v),(unsigned long)(a)); mb(); })

# define writel(v,a)	({ __raw_writel((v),(a)); mb(); })

#endif



#define readb_relaxed(a) readb(a)

#define readw_relaxed(a) readw(a)

#define readl_relaxed(a) readl(a)



#define mmiowb()

/* Simple MMIO */

#define ioread8(a)		readb(a)

#define ioread16(a)		readw(a)

#define ioread16be(a)		be16_to_cpu(__raw_readw((a)))

#define ioread32(a)		readl(a)

#define ioread32be(a)		be32_to_cpu(__raw_readl((a)))



/*

 * If the platform has PC-like I/O, this function converts the offset into

 * an address.

 */

static __inline__ unsigned long isa_port2addr(unsigned long offset)

{

	return __isa_port2addr(offset);

}

#define iowrite8(v,a)		writeb((v),(a))

#define iowrite16(v,a)		writew((v),(a))

#define iowrite16be(v,a)	__raw_writew(cpu_to_be16((v)),(a))

#define iowrite32(v,a)		writel((v),(a))

#define iowrite32be(v,a)	__raw_writel(cpu_to_be32((v)),(a))



#define ioread8_rep(a,d,c)	insb((a),(d),(c))

#define ioread16_rep(a,d,c)	insw((a),(d),(c))

#define ioread32_rep(a,d,c)	insl((a),(d),(c))



#define iowrite8_rep(a,s,c)	outsb((a),(s),(c))

#define iowrite16_rep(a,s,c)	outsw((a),(s),(c))

#define iowrite32_rep(a,s,c)	outsl((a),(s),(c))



#define mmiowb()	wmb()	/* synco on SH-4A, otherwise a nop */



/*

 * This function provides a method for the generic case where a board-specific

 * isa_port2addr simply needs to return the port + some arbitrary port base.

 * ioport_map simply needs to return the port + some arbitrary port base.

 *

 * We use this at board setup time to implicitly set the port base, and

 * as a result, we can use the generic isa_port2addr.

 * as a result, we can use the generic ioport_map.

 */

static inline void __set_io_port_base(unsigned long pbase)

{
@@ -159,51 +174,52 @@ static inline void __set_io_port_base(unsigned long pbase) 
	generic_io_base = pbase;

}



#define isa_readb(a) readb(isa_port2addr(a))

#define isa_readw(a) readw(isa_port2addr(a))

#define isa_readl(a) readl(isa_port2addr(a))

#define isa_writeb(b,a) writeb(b,isa_port2addr(a))

#define isa_writew(w,a) writew(w,isa_port2addr(a))

#define isa_writel(l,a) writel(l,isa_port2addr(a))

#define isa_readb(a) readb(ioport_map(a, 1))

#define isa_readw(a) readw(ioport_map(a, 2))

#define isa_readl(a) readl(ioport_map(a, 4))

#define isa_writeb(b,a) writeb(b,ioport_map(a, 1))

#define isa_writew(w,a) writew(w,ioport_map(a, 2))

#define isa_writel(l,a) writel(l,ioport_map(a, 4))



#define isa_memset_io(a,b,c) \

  memset((void *)(isa_port2addr((unsigned long)a)),(b),(c))

  memset((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))

#define isa_memcpy_fromio(a,b,c) \

  memcpy((a),(void *)(isa_port2addr((unsigned long)(b))),(c))

  memcpy((a),(void *)(ioport_map((unsigned long)(b), 1)),(c))

#define isa_memcpy_toio(a,b,c) \

  memcpy((void *)(isa_port2addr((unsigned long)(a))),(b),(c))

  memcpy((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))



/* We really want to try and get these to memcpy etc */

extern void memcpy_fromio(void *, unsigned long, unsigned long);

extern void memcpy_toio(unsigned long, const void *, unsigned long);

extern void memset_io(unsigned long, int, unsigned long);

extern void memcpy_fromio(void *, volatile void __iomem *, unsigned long);

extern void memcpy_toio(volatile void __iomem *, const void *, unsigned long);

extern void memset_io(volatile void __iomem *, int, unsigned long);



/* SuperH on-chip I/O functions */

static __inline__ unsigned char ctrl_inb(unsigned long addr)

static inline unsigned char ctrl_inb(unsigned long addr)

{

	return *(volatile unsigned char*)addr;

}



static __inline__ unsigned short ctrl_inw(unsigned long addr)

static inline unsigned short ctrl_inw(unsigned long addr)

{

	return *(volatile unsigned short*)addr;

}



static __inline__ unsigned int ctrl_inl(unsigned long addr)

static inline unsigned int ctrl_inl(unsigned long addr)

{

	return *(volatile unsigned long*)addr;

}



static __inline__ void ctrl_outb(unsigned char b, unsigned long addr)

static inline void ctrl_outb(unsigned char b, unsigned long addr)

{

	*(volatile unsigned char*)addr = b;

}



static __inline__ void ctrl_outw(unsigned short b, unsigned long addr)

static inline void ctrl_outw(unsigned short b, unsigned long addr)

{

	*(volatile unsigned short*)addr = b;

}



static __inline__ void ctrl_outl(unsigned int b, unsigned long addr)

static inline void ctrl_outl(unsigned int b, unsigned long addr)

{

        *(volatile unsigned long*)addr = b;

}
@@ -214,12 +230,12 @@ static __inline__ void ctrl_outl(unsigned int b, unsigned long addr) 
 * Change virtual addresses to physical addresses and vv.

 * These are trivial on the 1:1 Linux/SuperH mapping

 */

static __inline__ unsigned long virt_to_phys(volatile void * address)

static inline unsigned long virt_to_phys(volatile void *address)

{

	return PHYSADDR(address);

}



static __inline__ void * phys_to_virt(unsigned long address)

static inline void *phys_to_virt(unsigned long address)

{

	return (void *)P1SEGADDR(address);

}
@@ -234,27 +250,60 @@ static __inline__ void * phys_to_virt(unsigned long address) 
 * differently. On the x86 architecture, we just read/write the

 * memory location directly.

 *

 * On SH, we have the whole physical address space mapped at all times

 * (as MIPS does), so "ioremap()" and "iounmap()" do not need to do

 * anything.  (This isn't true for all machines but we still handle

 * these cases with wired TLB entries anyway ...)

 * On SH, we traditionally have the whole physical address space mapped

 * at all times (as MIPS does), so "ioremap()" and "iounmap()" do not

 * need to do anything but place the address in the proper segment. This

 * is true for P1 and P2 addresses, as well as some P3 ones. However,

 * most of the P3 addresses and newer cores using extended addressing

 * need to map through page tables, so the ioremap() implementation

 * becomes a bit more complicated. See arch/sh/mm/ioremap.c for

 * additional notes on this.

 *

 * We cheat a bit and always return uncachable areas until we've fixed

 * the drivers to handle caching properly.

 */

static __inline__ void * ioremap(unsigned long offset, unsigned long size)

#ifdef CONFIG_MMU

void __iomem *__ioremap(unsigned long offset, unsigned long size,

			unsigned long flags);

void __iounmap(void __iomem *addr);

#else

#define __ioremap(offset, size, flags)	((void __iomem *)(offset))

#define __iounmap(addr)			do { } while (0)

#endif /* CONFIG_MMU */



static inline void __iomem *

__ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)

{

	return __ioremap(offset, size);

}

	unsigned long last_addr = offset + size - 1;



static __inline__ void iounmap(void *addr)

{

	return __iounmap(addr);

	/*

	 * For P1 and P2 space this is trivial, as everything is already

	 * mapped. Uncached access for P1 addresses are done through P2.

	 * In the P3 case or for addresses outside of the 29-bit space,

	 * mapping must be done by the PMB or by using page tables.

	 */

	if (likely(PXSEG(offset) < P3SEG && PXSEG(last_addr) < P3SEG)) {

		if (unlikely(flags & _PAGE_CACHABLE))

			return (void __iomem *)P1SEGADDR(offset);



		return (void __iomem *)P2SEGADDR(offset);

	}



#define ioremap_nocache(off,size) ioremap(off,size)

	return __ioremap(offset, size, flags);

}



static __inline__ int check_signature(unsigned long io_addr,

#define ioremap(offset, size)				\

	__ioremap_mode((offset), (size), 0)

#define ioremap_nocache(offset, size)			\

	__ioremap_mode((offset), (size), 0)

#define ioremap_cache(offset, size)			\

	__ioremap_mode((offset), (size), _PAGE_CACHABLE)

#define p3_ioremap(offset, size, flags)			\

	__ioremap((offset), (size), (flags))

#define iounmap(addr)					\

	__iounmap((addr))



static inline int check_signature(char __iomem *io_addr,

			const unsigned char *signature, int length)

{

	int retval = 0;

include/asm-sh/io_generic.h

+47 −49

File changed.

Preview size limit exceeded, changes collapsed.