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

Commit 9746882f authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: group io mapping definitions and functions 



Create a new header file, kmap.h, that groups all the definitions and
functions associated with the io mapping and remapping.

Currently the functions are spread across raw_io.h and io_mm.h. And in
the future we will want to use these in io_no.h as well. So it makes
sense to move them all together into a single header file.

It is named after the arch/m68k/mm/kmap.c file that actually implements
many of the exported functions.

Signed-off-by: default avatarGreg Ungerer <gerg@linux-m68k.org>
Tested-by: default avatarAngelo Dureghello <angelo@sysam.it>
parent 4478048b

arch/m68k/include/asm/atarihw.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/types.h>

#include <asm/bootinfo-atari.h>

#include <asm/raw_io.h>

#include <asm/kmap.h>



extern u_long atari_mch_cookie;

extern u_long atari_mch_type;

arch/m68k/include/asm/io_mm.h

+1 −42
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/compiler.h>

#include <asm/raw_io.h>

#include <asm/virtconvert.h>

#include <asm/kmap.h>



#include <asm-generic/iomap.h>
@@ -461,39 +462,6 @@ static inline void isa_delay(void) 


#define mmiowb()



static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}

static inline void __iomem *ioremap_nocache(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}

#define ioremap_uc ioremap_nocache

static inline void __iomem *ioremap_wt(unsigned long physaddr,

					 unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);

}

static inline void __iomem *ioremap_fullcache(unsigned long physaddr,

				      unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);

}



static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count)

{

	__builtin_memset((void __force *) addr, val, count);

}

static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count)

{

	__builtin_memcpy(dst, (void __force *) src, count);

}

static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count)

{

	__builtin_memcpy((void __force *) dst, src, count);

}



#ifndef CONFIG_SUN3

#define IO_SPACE_LIMIT 0xffff

#else
@@ -515,15 +483,6 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int 
 */

#define xlate_dev_kmem_ptr(p)	p



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

{

	return (void __iomem *) port;

}



static inline void ioport_unmap(void __iomem *p)

{

}



#define readb_relaxed(addr)	readb(addr)

#define readw_relaxed(addr)	readw(addr)

#define readl_relaxed(addr)	readl(addr)

arch/m68k/include/asm/io_no.h

+12 −0
Original line number Diff line number Diff line
@@ -25,6 +25,18 @@ 
#define writew __raw_writew

#define writel __raw_writel



/*

 * These are defined in kmap.h as static inline functions. To maintain

 * previous behavior we put these define guards here so io_mm.h doesn't

 * see them.

 */

#ifdef CONFIG_MMU

#define memset_io memset_io

#define memcpy_fromio memcpy_fromio

#define memcpy_toio memcpy_toio

#endif



#include <asm/kmap.h>

#include <asm/virtconvert.h>

#include <asm-generic/io.h>

arch/m68k/include/asm/kmap.h

0 → 100644
+80 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _KMAP_H

#define _KMAP_H



#ifdef CONFIG_MMU



/* Values for nocacheflag and cmode */

#define IOMAP_FULL_CACHING		0

#define IOMAP_NOCACHE_SER		1

#define IOMAP_NOCACHE_NONSER		2

#define IOMAP_WRITETHROUGH		3



/*

 * These functions exported by arch/m68k/mm/kmap.c.

 * Only needed on MMU enabled systems.

 */

extern void __iomem *__ioremap(unsigned long physaddr, unsigned long size,

			       int cacheflag);

extern void iounmap(void __iomem *addr);

extern void __iounmap(void *addr, unsigned long size);



#define ioremap ioremap

static inline void __iomem *ioremap(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}



#define ioremap_nocache ioremap_nocache

static inline void __iomem *ioremap_nocache(unsigned long physaddr,

					    unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_NOCACHE_SER);

}



#define ioremap_uc ioremap_nocache

static inline void __iomem *ioremap_wt(unsigned long physaddr,

				       unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);

}



#define ioremap_fillcache ioremap_fullcache

static inline void __iomem *ioremap_fullcache(unsigned long physaddr,

					      unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);

}



static inline void memset_io(volatile void __iomem *addr, unsigned char val,

			     int count)

{

	__builtin_memset((void __force *) addr, val, count);

}



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

				 int count)

{

	__builtin_memcpy(dst, (void __force *) src, count);

}



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

			       int count)

{

	__builtin_memcpy((void __force *) dst, src, count);

}



#endif /* CONFIG_MMU */



#define ioport_map ioport_map

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

{

	return (void __iomem *) port;

}



#define ioport_unmap ioport_unmap

static inline void ioport_unmap(void __iomem *p)

{

}



#endif /* _KMAP_H */

arch/m68k/include/asm/nubus.h

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#define _ASM_M68K_NUBUS_H



#include <asm/raw_io.h>

#include <asm/kmap.h>



#define nubus_readb raw_inb

#define nubus_readw raw_inw