9548b209a3
This fixes some of the alpha-specific build problems, except a) modpost warning about COMMON symbol "saved_config" and b) nasty final link failure with gcc-4.x, -Os and scsi-disk driver configured built-in (due to jump table in .rodata referencing discarded .exit.text). - build failure with gcc-4.2.x: fix up casts in cia_io* routines to avoid warnings ('discards qualifiers from pointer target type'), which are failures, thanks to -Werror; - modpost warnings: add missing __init qualifier for titan and marvel; for non-generic build, move machine vectors from .data to .data.init.refok section; - unbreak CPU-specific optimization: rearrange cpuflags-y assignments so that extended -mcpu value (ev56, pca56, ev67) overrides basic one (ev5, ev6) and not vice versa. Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Richard Henderson <rth@twiddle.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
131 lines
3 KiB
C
131 lines
3 KiB
C
/* Trivial implementations of basic i/o routines. Assumes that all
|
|
of the hard work has been done by ioremap and ioportmap, and that
|
|
access to i/o space is linear. */
|
|
|
|
/* This file may be included multiple times. */
|
|
|
|
#if IO_CONCAT(__IO_PREFIX,trivial_io_bw)
|
|
__EXTERN_INLINE unsigned int
|
|
IO_CONCAT(__IO_PREFIX,ioread8)(void __iomem *a)
|
|
{
|
|
return __kernel_ldbu(*(volatile u8 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE unsigned int
|
|
IO_CONCAT(__IO_PREFIX,ioread16)(void __iomem *a)
|
|
{
|
|
return __kernel_ldwu(*(volatile u16 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,iowrite8)(u8 b, void __iomem *a)
|
|
{
|
|
__kernel_stb(b, *(volatile u8 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,iowrite16)(u16 b, void __iomem *a)
|
|
{
|
|
__kernel_stw(b, *(volatile u16 __force *)a);
|
|
}
|
|
#endif
|
|
|
|
#if IO_CONCAT(__IO_PREFIX,trivial_io_lq)
|
|
__EXTERN_INLINE unsigned int
|
|
IO_CONCAT(__IO_PREFIX,ioread32)(void __iomem *a)
|
|
{
|
|
return *(volatile u32 __force *)a;
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,iowrite32)(u32 b, void __iomem *a)
|
|
{
|
|
*(volatile u32 __force *)a = b;
|
|
}
|
|
#endif
|
|
|
|
#if IO_CONCAT(__IO_PREFIX,trivial_rw_bw) == 1
|
|
__EXTERN_INLINE u8
|
|
IO_CONCAT(__IO_PREFIX,readb)(const volatile void __iomem *a)
|
|
{
|
|
return __kernel_ldbu(*(const volatile u8 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE u16
|
|
IO_CONCAT(__IO_PREFIX,readw)(const volatile void __iomem *a)
|
|
{
|
|
return __kernel_ldwu(*(const volatile u16 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writeb)(u8 b, volatile void __iomem *a)
|
|
{
|
|
__kernel_stb(b, *(volatile u8 __force *)a);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writew)(u16 b, volatile void __iomem *a)
|
|
{
|
|
__kernel_stw(b, *(volatile u16 __force *)a);
|
|
}
|
|
#elif IO_CONCAT(__IO_PREFIX,trivial_rw_bw) == 2
|
|
__EXTERN_INLINE u8
|
|
IO_CONCAT(__IO_PREFIX,readb)(const volatile void __iomem *a)
|
|
{
|
|
void __iomem *addr = (void __iomem *)a;
|
|
return IO_CONCAT(__IO_PREFIX,ioread8)(addr);
|
|
}
|
|
|
|
__EXTERN_INLINE u16
|
|
IO_CONCAT(__IO_PREFIX,readw)(const volatile void __iomem *a)
|
|
{
|
|
void __iomem *addr = (void __iomem *)a;
|
|
return IO_CONCAT(__IO_PREFIX,ioread16)(addr);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writeb)(u8 b, volatile void __iomem *a)
|
|
{
|
|
void __iomem *addr = (void __iomem *)a;
|
|
IO_CONCAT(__IO_PREFIX,iowrite8)(b, addr);
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writew)(u16 b, volatile void __iomem *a)
|
|
{
|
|
void __iomem *addr = (void __iomem *)a;
|
|
IO_CONCAT(__IO_PREFIX,iowrite16)(b, addr);
|
|
}
|
|
#endif
|
|
|
|
#if IO_CONCAT(__IO_PREFIX,trivial_rw_lq) == 1
|
|
__EXTERN_INLINE u32
|
|
IO_CONCAT(__IO_PREFIX,readl)(const volatile void __iomem *a)
|
|
{
|
|
return *(const volatile u32 __force *)a;
|
|
}
|
|
|
|
__EXTERN_INLINE u64
|
|
IO_CONCAT(__IO_PREFIX,readq)(const volatile void __iomem *a)
|
|
{
|
|
return *(const volatile u64 __force *)a;
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writel)(u32 b, volatile void __iomem *a)
|
|
{
|
|
*(volatile u32 __force *)a = b;
|
|
}
|
|
|
|
__EXTERN_INLINE void
|
|
IO_CONCAT(__IO_PREFIX,writeq)(u64 b, volatile void __iomem *a)
|
|
{
|
|
*(volatile u64 __force *)a = b;
|
|
}
|
|
#endif
|
|
|
|
#if IO_CONCAT(__IO_PREFIX,trivial_iounmap)
|
|
__EXTERN_INLINE void IO_CONCAT(__IO_PREFIX,iounmap)(volatile void __iomem *a)
|
|
{
|
|
}
|
|
#endif
|