cris: use generic io.h
fixes the warning:
lib/iomap.c: In function ‘ioread8_rep’:
./arch/cris/include/asm/io.h:139:31: warning: statement with no effect [-Wunused-value]
#define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
^
lib/iomap.c:56:3: note: in definition of macro ‘IO_COND’
is_pio; \
^
lib/iomap.c:197:16: note: in expansion of macro ‘insb’
IO_COND(addr, insb(port,dst,count), mmio_insb(addr, dst, count));
^
cris_iops was previously set to NULL (no matter if CONFIG_PCI was set or
not), but was removed in commit ab28e96fd1 ("CRIS v32: remove old GPIO
and LEDs code"). Before commit ab28e96fd1 ("CRIS v32: remove old GPIO
and LEDs code"), cris_iops could have been set from an external module,
since it was exported, but as commit c24bf9b4cc ("CRIS: fix I/O
macros") noted, the macros using cris_iops have been broken since first
included, so they could never have worked.
Because of this, instead of readding cris_iops, remove all special
handling of cris_iops. By doing so, we can rely on the default
implementation of almost all functions previously defined in our arch
specific io.h.
Signed-off-by: Niklas Cassel <nks@flawful.org>
Signed-off-by: Jesper Nilsson <jespern@axis.com>
This commit is contained in:
Niklas Cassel
Jesper Nilsson
Родитель
2765262f7b
Коммит
4c241d3c7b
|
|
@ -8,34 +8,6 @@
|
||||||
#include <asm-generic/iomap.h>
|
#include <asm-generic/iomap.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
|
|
||||||
struct cris_io_operations
|
|
||||||
{
|
|
||||||
u32 (*read_mem)(void *addr, int size);
|
|
||||||
void (*write_mem)(u32 val, int size, void *addr);
|
|
||||||
u32 (*read_io)(u32 port, void *addr, int size, int count);
|
|
||||||
void (*write_io)(u32 port, void *addr, int size, int count);
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
|
||||||
extern struct cris_io_operations *cris_iops;
|
|
||||||
#else
|
|
||||||
#define cris_iops ((struct cris_io_operations*)NULL)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Change virtual addresses to physical addresses and vv.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static inline unsigned long virt_to_phys(volatile void * address)
|
|
||||||
{
|
|
||||||
return __pa(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void * phys_to_virt(unsigned long address)
|
|
||||||
{
|
|
||||||
return __va(address);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
|
extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
|
||||||
extern void __iomem * __ioremap_prot(unsigned long phys_addr, unsigned long size, pgprot_t prot);
|
extern void __iomem * __ioremap_prot(unsigned long phys_addr, unsigned long size, pgprot_t prot);
|
||||||
|
|
||||||
|
|
@ -48,147 +20,6 @@ extern void iounmap(volatile void * __iomem addr);
|
||||||
|
|
||||||
extern void __iomem * ioremap_nocache(unsigned long offset, unsigned long size);
|
extern void __iomem * ioremap_nocache(unsigned long offset, unsigned long size);
|
||||||
|
|
||||||
/*
|
#include <asm-generic/io.h>
|
||||||
* IO bus memory addresses are also 1:1 with the physical address
|
|
||||||
*/
|
|
||||||
#define virt_to_bus virt_to_phys
|
|
||||||
#define bus_to_virt phys_to_virt
|
|
||||||
|
|
||||||
/*
|
|
||||||
* readX/writeX() are used to access memory mapped devices. On some
|
|
||||||
* architectures the memory mapped IO stuff needs to be accessed
|
|
||||||
* differently. On the CRIS architecture, we just read/write the
|
|
||||||
* memory location directly.
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_PCI
|
|
||||||
#define PCI_SPACE(x) ((((unsigned)(x)) & 0x10000000) == 0x10000000)
|
|
||||||
#else
|
|
||||||
#define PCI_SPACE(x) 0
|
|
||||||
#endif
|
|
||||||
static inline unsigned char readb(const volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
return cris_iops->read_mem((void*)addr, 1);
|
|
||||||
else
|
|
||||||
return *(volatile unsigned char __force *) addr;
|
|
||||||
}
|
|
||||||
static inline unsigned short readw(const volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
return cris_iops->read_mem((void*)addr, 2);
|
|
||||||
else
|
|
||||||
return *(volatile unsigned short __force *) addr;
|
|
||||||
}
|
|
||||||
static inline unsigned int readl(const volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
return cris_iops->read_mem((void*)addr, 4);
|
|
||||||
else
|
|
||||||
return *(volatile unsigned int __force *) addr;
|
|
||||||
}
|
|
||||||
#define readb_relaxed(addr) readb(addr)
|
|
||||||
#define readw_relaxed(addr) readw(addr)
|
|
||||||
#define readl_relaxed(addr) readl(addr)
|
|
||||||
#define __raw_readb readb
|
|
||||||
#define __raw_readw readw
|
|
||||||
#define __raw_readl readl
|
|
||||||
|
|
||||||
static inline void writeb(unsigned char b, volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
cris_iops->write_mem(b, 1, (void*)addr);
|
|
||||||
else
|
|
||||||
*(volatile unsigned char __force *) addr = b;
|
|
||||||
}
|
|
||||||
static inline void writew(unsigned short b, volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
cris_iops->write_mem(b, 2, (void*)addr);
|
|
||||||
else
|
|
||||||
*(volatile unsigned short __force *) addr = b;
|
|
||||||
}
|
|
||||||
static inline void writel(unsigned int b, volatile void __iomem *addr)
|
|
||||||
{
|
|
||||||
if (PCI_SPACE(addr) && cris_iops)
|
|
||||||
cris_iops->write_mem(b, 4, (void*)addr);
|
|
||||||
else
|
|
||||||
*(volatile unsigned int __force *) addr = b;
|
|
||||||
}
|
|
||||||
#define writeb_relaxed(b, addr) writeb(b, addr)
|
|
||||||
#define writew_relaxed(b, addr) writew(b, addr)
|
|
||||||
#define writel_relaxed(b, addr) writel(b, addr)
|
|
||||||
#define __raw_writeb writeb
|
|
||||||
#define __raw_writew writew
|
|
||||||
#define __raw_writel writel
|
|
||||||
|
|
||||||
#define mmiowb()
|
|
||||||
|
|
||||||
#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))
|
|
||||||
|
|
||||||
|
|
||||||
/* I/O port access. Normally there is no I/O space on CRIS but when
|
|
||||||
* Cardbus/PCI is enabled the request is passed through the bridge.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define IO_SPACE_LIMIT 0xffff
|
|
||||||
#define inb(port) (cris_iops ? cris_iops->read_io(port,NULL,1,1) : 0)
|
|
||||||
#define inw(port) (cris_iops ? cris_iops->read_io(port,NULL,2,1) : 0)
|
|
||||||
#define inl(port) (cris_iops ? cris_iops->read_io(port,NULL,4,1) : 0)
|
|
||||||
#define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
|
|
||||||
#define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
|
|
||||||
#define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
|
|
||||||
static inline void outb(unsigned char data, unsigned int port)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *) &data, 1, 1);
|
|
||||||
}
|
|
||||||
static inline void outw(unsigned short data, unsigned int port)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *) &data, 2, 1);
|
|
||||||
}
|
|
||||||
static inline void outl(unsigned int data, unsigned int port)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *) &data, 4, 1);
|
|
||||||
}
|
|
||||||
static inline void outsb(unsigned int port, const void *addr,
|
|
||||||
unsigned long count)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *)addr, 1, count);
|
|
||||||
}
|
|
||||||
static inline void outsw(unsigned int port, const void *addr,
|
|
||||||
unsigned long count)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *)addr, 2, count);
|
|
||||||
}
|
|
||||||
static inline void outsl(unsigned int port, const void *addr,
|
|
||||||
unsigned long count)
|
|
||||||
{
|
|
||||||
if (cris_iops)
|
|
||||||
cris_iops->write_io(port, (void *)addr, 4, count);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define inb_p(port) inb(port)
|
|
||||||
#define inw_p(port) inw(port)
|
|
||||||
#define inl_p(port) inl(port)
|
|
||||||
#define outb_p(val, port) outb((val), (port))
|
|
||||||
#define outw_p(val, port) outw((val), (port))
|
|
||||||
#define outl_p(val, port) outl((val), (port))
|
|
||||||
|
|
||||||
/*
|
|
||||||
* 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
|
#endif
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче