49148020bc
Merge header files for m68k and m68knommu to the single location: arch/m68k/include/asm The majority of this patch was the result of the script that is included in the changelog below. The script was originally written by Arnd Bergman and exten by me to cover a few more files. When the header files differed the script uses the following: The original m68k file is named <file>_mm.h [mm for memory manager] The m68knommu file is named <file>_no.h [no for no memory manager] The files uses the following include guard: This include gaurd works as the m68knommu toolchain set the __uClinux__ symbol - so this should work in userspace too. Merging the header files for m68k and m68knommu exposes the (unexpected?) ABI differences thus it is easier to actually identify these and thus to fix them. The commit has been build tested with both a m68k and a m68knommu toolchain - with success. The commit has also been tested with "make headers_check" and this patch fixes make headers_check for m68knommu. The script used: TARGET=arch/m68k/include/asm SOURCE=arch/m68knommu/include/asm INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \ linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \ oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \ shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \ termbits.h termios.h tlb.h types.h user.h" EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \ ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \ sections.h topology.h" NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \ elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \ m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \ m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \ m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \ mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \ mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \ nettel.h quicc_simple.h smp.h" FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \ cacheflush.h checksum.h current.h delay.h div64.h \ dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \ irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \ module.h page.h page_offset.h param.h pci.h pgalloc.h \ pgtable.h processor.h ptrace.h scatterlist.h segment.h \ setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \ thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \ unaligned.h unistd.h" mergefile() { BASE=${1%.h} git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h cat << EOF > ${TARGET}/$1 EOF git add ${TARGET}/$1 } set -e mkdir -p ${TARGET} git mv include/asm-m68k/* ${TARGET} rmdir include/asm-m68k git rm ${SOURCE}/Kbuild for F in $INCLUDE $EQUAL; do git rm ${SOURCE}/$F done for F in $NOMUUFILES; do git mv ${SOURCE}/$F ${TARGET}/$F done for F in $FILES ; do mergefile $F done rmdir arch/m68knommu/include/asm rmdir arch/m68knommu/include Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
195 lines
5.5 KiB
C
195 lines
5.5 KiB
C
#ifndef _M68KNOMMU_IO_H
|
|
#define _M68KNOMMU_IO_H
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
|
|
/*
|
|
* These are for ISA/PCI shared memory _only_ and should never be used
|
|
* on any other type of memory, including Zorro memory. They are meant to
|
|
* access the bus in the bus byte order which is little-endian!.
|
|
*
|
|
* readX/writeX() are used to access memory mapped devices. On some
|
|
* architectures the memory mapped IO stuff needs to be accessed
|
|
* differently. On the m68k architecture, we just read/write the
|
|
* memory location directly.
|
|
*/
|
|
/* ++roman: The assignments to temp. vars avoid that gcc sometimes generates
|
|
* two accesses to memory, which may be undesireable for some devices.
|
|
*/
|
|
|
|
/*
|
|
* swap functions are sometimes needed to interface little-endian hardware
|
|
*/
|
|
static inline unsigned short _swapw(volatile unsigned short v)
|
|
{
|
|
return ((v << 8) | (v >> 8));
|
|
}
|
|
|
|
static inline unsigned int _swapl(volatile unsigned long v)
|
|
{
|
|
return ((v << 24) | ((v & 0xff00) << 8) | ((v & 0xff0000) >> 8) | (v >> 24));
|
|
}
|
|
|
|
#define readb(addr) \
|
|
({ unsigned char __v = (*(volatile unsigned char *) (addr)); __v; })
|
|
#define readw(addr) \
|
|
({ unsigned short __v = (*(volatile unsigned short *) (addr)); __v; })
|
|
#define readl(addr) \
|
|
({ unsigned int __v = (*(volatile unsigned int *) (addr)); __v; })
|
|
|
|
#define readb_relaxed(addr) readb(addr)
|
|
#define readw_relaxed(addr) readw(addr)
|
|
#define readl_relaxed(addr) readl(addr)
|
|
|
|
#define writeb(b,addr) (void)((*(volatile unsigned char *) (addr)) = (b))
|
|
#define writew(b,addr) (void)((*(volatile unsigned short *) (addr)) = (b))
|
|
#define writel(b,addr) (void)((*(volatile unsigned int *) (addr)) = (b))
|
|
|
|
#define __raw_readb readb
|
|
#define __raw_readw readw
|
|
#define __raw_readl readl
|
|
#define __raw_writeb writeb
|
|
#define __raw_writew writew
|
|
#define __raw_writel writel
|
|
|
|
static inline void io_outsb(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned char *ap = (volatile unsigned char *) addr;
|
|
unsigned char *bp = (unsigned char *) buf;
|
|
while (len--)
|
|
*ap = *bp++;
|
|
}
|
|
|
|
static inline void io_outsw(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned short *ap = (volatile unsigned short *) addr;
|
|
unsigned short *bp = (unsigned short *) buf;
|
|
while (len--)
|
|
*ap = _swapw(*bp++);
|
|
}
|
|
|
|
static inline void io_outsl(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned int *ap = (volatile unsigned int *) addr;
|
|
unsigned int *bp = (unsigned int *) buf;
|
|
while (len--)
|
|
*ap = _swapl(*bp++);
|
|
}
|
|
|
|
static inline void io_insb(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned char *ap = (volatile unsigned char *) addr;
|
|
unsigned char *bp = (unsigned char *) buf;
|
|
while (len--)
|
|
*bp++ = *ap;
|
|
}
|
|
|
|
static inline void io_insw(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned short *ap = (volatile unsigned short *) addr;
|
|
unsigned short *bp = (unsigned short *) buf;
|
|
while (len--)
|
|
*bp++ = _swapw(*ap);
|
|
}
|
|
|
|
static inline void io_insl(unsigned int addr, void *buf, int len)
|
|
{
|
|
volatile unsigned int *ap = (volatile unsigned int *) addr;
|
|
unsigned int *bp = (unsigned int *) buf;
|
|
while (len--)
|
|
*bp++ = _swapl(*ap);
|
|
}
|
|
|
|
#define mmiowb()
|
|
|
|
/*
|
|
* make the short names macros so specific devices
|
|
* can override them as required
|
|
*/
|
|
|
|
#define memset_io(a,b,c) memset((void *)(a),(b),(c))
|
|
#define memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
|
|
#define memcpy_toio(a,b,c) memcpy((void *)(a),(b),(c))
|
|
|
|
#define inb(addr) readb(addr)
|
|
#define inw(addr) readw(addr)
|
|
#define inl(addr) readl(addr)
|
|
#define outb(x,addr) ((void) writeb(x,addr))
|
|
#define outw(x,addr) ((void) writew(x,addr))
|
|
#define outl(x,addr) ((void) writel(x,addr))
|
|
|
|
#define inb_p(addr) inb(addr)
|
|
#define inw_p(addr) inw(addr)
|
|
#define inl_p(addr) inl(addr)
|
|
#define outb_p(x,addr) outb(x,addr)
|
|
#define outw_p(x,addr) outw(x,addr)
|
|
#define outl_p(x,addr) outl(x,addr)
|
|
|
|
#define outsb(a,b,l) io_outsb(a,b,l)
|
|
#define outsw(a,b,l) io_outsw(a,b,l)
|
|
#define outsl(a,b,l) io_outsl(a,b,l)
|
|
|
|
#define insb(a,b,l) io_insb(a,b,l)
|
|
#define insw(a,b,l) io_insw(a,b,l)
|
|
#define insl(a,b,l) io_insl(a,b,l)
|
|
|
|
#define IO_SPACE_LIMIT 0xffff
|
|
|
|
|
|
/* Values for nocacheflag and cmode */
|
|
#define IOMAP_FULL_CACHING 0
|
|
#define IOMAP_NOCACHE_SER 1
|
|
#define IOMAP_NOCACHE_NONSER 2
|
|
#define IOMAP_WRITETHROUGH 3
|
|
|
|
extern void *__ioremap(unsigned long physaddr, unsigned long size, int cacheflag);
|
|
extern void __iounmap(void *addr, unsigned long size);
|
|
|
|
static inline void *ioremap(unsigned long physaddr, unsigned long size)
|
|
{
|
|
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
|
|
}
|
|
static inline void *ioremap_nocache(unsigned long physaddr, unsigned long size)
|
|
{
|
|
return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);
|
|
}
|
|
static inline void *ioremap_writethrough(unsigned long physaddr, unsigned long size)
|
|
{
|
|
return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);
|
|
}
|
|
static inline void *ioremap_fullcache(unsigned long physaddr, unsigned long size)
|
|
{
|
|
return __ioremap(physaddr, size, IOMAP_FULL_CACHING);
|
|
}
|
|
|
|
extern void iounmap(void *addr);
|
|
|
|
/* Pages to physical address... */
|
|
#define page_to_phys(page) ((page - mem_map) << PAGE_SHIFT)
|
|
#define page_to_bus(page) ((page - mem_map) << PAGE_SHIFT)
|
|
|
|
/*
|
|
* Macros used for converting between virtual and physical mappings.
|
|
*/
|
|
#define phys_to_virt(vaddr) ((void *) (vaddr))
|
|
#define virt_to_phys(vaddr) ((unsigned long) (vaddr))
|
|
|
|
#define virt_to_bus virt_to_phys
|
|
#define bus_to_virt phys_to_virt
|
|
|
|
/*
|
|
* 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 /* __KERNEL__ */
|
|
|
|
#endif /* _M68KNOMMU_IO_H */
|