From: Govindraj Raja Govindraj.Raja@imgtec.com

usb stack utilizes the clr/set_bits macros also usb stack needs phy_to_bus/bus_to_phys functions. Thus adding these macro and functions for mips platform.

This makes usb stack usable with mips platform.

Signed-off-by: Govindraj Raja govindraj.raja@imgtec.com ---

Changes from v1: --------------- Fixes comments from Daniel as dicussed in below thread: https://patchwork.ozlabs.org/patch/508821/

arch/mips/include/asm/io.h | 54 ++++++++++++++++++++++++++++++++++++++++++++++ arch/mips/lib/io.c | 14 ++++++++++++ 2 files changed, 68 insertions(+)

diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index a7ab087..4093941 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -504,4 +504,58 @@ static inline void unmap_physmem(void *vaddr, unsigned long flags)

}

+#define out_arch(type, endian, a, v) __raw_write##type(cpu_to_##endian(v), a) +#define in_arch(type, endian, a) endian##_to_cpu(__raw_read##type(a)) + +#define out_le32(a, v) out_arch(l, le32, a, v) +#define out_le16(a, v) out_arch(w, le16, a, v) + +#define in_le32(a) in_arch(l, le32, a) +#define in_le16(a) in_arch(w, le16, a) + +#define out_be32(a, v) out_arch(l, be32, a, v) +#define out_be16(a, v) out_arch(w, be16, a, v) + +#define in_be32(a) in_arch(l, be32, a) +#define in_be16(a) in_arch(w, be16, a) + +#define out_8(a, v) __raw_writeb(v, a) +#define in_8(a) __raw_readb(a) + +/* + * Clear and set bits in one shot. These macros can be used to clear and + * set multiple bits in a register using a single call. These macros can + * also be used to set a multiple-bit bit pattern using a mask, by + * specifying the mask in the 'clear' parameter and the new bit pattern + * in the 'set' parameter. + */ + +#define clrbits(type, addr, clear) \ + out_##type((addr), in_##type(addr) & ~(clear)) + +#define setbits(type, addr, set) \ + out_##type((addr), in_##type(addr) | (set)) + +#define clrsetbits(type, addr, clear, set) \ + out_##type((addr), (in_##type(addr) & ~(clear)) | (set)) + +#define clrbits_be32(addr, clear) clrbits(be32, addr, clear) +#define setbits_be32(addr, set) setbits(be32, addr, set) +#define clrsetbits_be32(addr, clear, set) clrsetbits(be32, addr, clear, set) + +#define clrbits_le32(addr, clear) clrbits(le32, addr, clear) +#define setbits_le32(addr, set) setbits(le32, addr, set) +#define clrsetbits_le32(addr, clear, set) clrsetbits(le32, addr, clear, set) + +#define clrbits_be16(addr, clear) clrbits(be16, addr, clear) +#define setbits_be16(addr, set) setbits(be16, addr, set) +#define clrsetbits_be16(addr, clear, set) clrsetbits(be16, addr, clear, set) + +#define clrbits_le16(addr, clear) clrbits(le16, addr, clear) +#define setbits_le16(addr, set) setbits(le16, addr, set) +#define clrsetbits_le16(addr, clear, set) clrsetbits(le16, addr, clear, set) + +#define clrbits_8(addr, clear) clrbits(8, addr, clear) +#define setbits_8(addr, set) setbits(8, addr, set) + #endif /* _ASM_IO_H */ diff --git a/arch/mips/lib/io.c b/arch/mips/lib/io.c index b2d4a09..58a66fc 100644 --- a/arch/mips/lib/io.c +++ b/arch/mips/lib/io.c @@ -10,3 +10,17 @@ * I/O ports are mapped. */ const unsigned long mips_io_port_base = -1; + +#ifdef CONFIG_PHYS_TO_BUS + +__weak unsigned long phys_to_bus(unsigned long phys) +{ + return (unsigned long)virt_to_phys((void *)phys); +} + +__weak unsigned long bus_to_phys(unsigned long bus) +{ + return (unsigned long)phys_to_virt(bus); +} + +#endif