UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: UHCI: Add support for big endian mmio 

This patch adds support for big endian mmio to the UHCI HCD. Big endian
mmio is supported by adding a flag bit to the UHCI HCD replicating the
solution used in the EHCI HCD.

When adding big endian support this patch also adds a check to see if we
need to support HCs with PCI I/O registers when we support HCs with MMIO.

This patch also adds 'const' to the register access functions' uhci_hcd
argument.

Signed-off-by: Jan Andersson <jan@gaisler.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jan Andersson 2011-05-18 10:44:49 +02:00 committed by Greg Kroah-Hartman
parent 5116901d85
commit 8452c6745e
2 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/host/Kconfig
View File

@ -416,6 +416,10 @@ config USB_UHCI_SUPPORT_NON_PCI_HC
depends on USB_UHCI_HCD depends on USB_UHCI_HCD
default y if SPARC_LEON default y if SPARC_LEON
config USB_UHCI_BIG_ENDIAN_MMIO
bool
depends on USB_UHCI_SUPPORT_NON_PCI_HC
config USB_FHCI_HCD config USB_FHCI_HCD
tristate "Freescale QE USB Host Controller support" tristate "Freescale QE USB Host Controller support"
depends on USB && OF_GPIO && QE_GPIO && QUICC_ENGINE depends on USB && OF_GPIO && QE_GPIO && QUICC_ENGINE

67
drivers/usb/host/uhci-hcd.h
View File

@ -421,6 +421,7 @@ struct uhci_hcd {
/* Silicon quirks */ /* Silicon quirks */
unsigned int oc_low:1; /* OverCurrent bit active low */ unsigned int oc_low:1; /* OverCurrent bit active low */
unsigned int wait_for_hp:1; /* Wait for HP port reset */ unsigned int wait_for_hp:1; /* Wait for HP port reset */
unsigned int big_endian_mmio:1; /* Big endian registers */
/* Support for port suspend/resume/reset */ /* Support for port suspend/resume/reset */
unsigned long port_c_suspend; /* Bit-arrays of ports */ unsigned long port_c_suspend; /* Bit-arrays of ports */
@ -490,90 +491,126 @@ struct urb_priv {
* we use memory mapped registers. * we use memory mapped registers.
*/ */
#if !defined(CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC) #ifndef CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC
/* Support PCI only */ /* Support PCI only */
static inline u32 uhci_readl(struct uhci_hcd *uhci, int reg) static inline u32 uhci_readl(const struct uhci_hcd *uhci, int reg)
{ {
return inl(uhci->io_addr + reg); return inl(uhci->io_addr + reg);
} }
static inline void uhci_writel(struct uhci_hcd *uhci, u32 val, int reg) static inline void uhci_writel(const struct uhci_hcd *uhci, u32 val, int reg)
{ {
outl(val, uhci->io_addr + reg); outl(val, uhci->io_addr + reg);
} }
static inline u16 uhci_readw(struct uhci_hcd *uhci, int reg) static inline u16 uhci_readw(const struct uhci_hcd *uhci, int reg)
{ {
return inw(uhci->io_addr + reg); return inw(uhci->io_addr + reg);
} }
static inline void uhci_writew(struct uhci_hcd *uhci, u16 val, int reg) static inline void uhci_writew(const struct uhci_hcd *uhci, u16 val, int reg)
{ {
outw(val, uhci->io_addr + reg); outw(val, uhci->io_addr + reg);
} }
static inline u8 uhci_readb(struct uhci_hcd *uhci, int reg) static inline u8 uhci_readb(const struct uhci_hcd *uhci, int reg)
{ {
return inb(uhci->io_addr + reg); return inb(uhci->io_addr + reg);
} }
static inline void uhci_writeb(struct uhci_hcd *uhci, u8 val, int reg) static inline void uhci_writeb(const struct uhci_hcd *uhci, u8 val, int reg)
{ {
outb(val, uhci->io_addr + reg); outb(val, uhci->io_addr + reg);
} }
#else #else
/* Support non-PCI host controllers */
#ifdef CONFIG_PCI
/* Support PCI and non-PCI host controllers */ /* Support PCI and non-PCI host controllers */
#define uhci_has_pci_registers(u) ((u)->io_addr != 0) #define uhci_has_pci_registers(u) ((u)->io_addr != 0)
#else
/* Support non-PCI host controllers only */
#define uhci_has_pci_registers(u) 0
#endif
static inline u32 uhci_readl(struct uhci_hcd *uhci, int reg) #ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
/* Support (non-PCI) big endian host controllers */
#define uhci_big_endian_mmio(u) ((u)->big_endian_mmio)
#else
#define uhci_big_endian_mmio(u) 0
#endif
static inline u32 uhci_readl(const struct uhci_hcd *uhci, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
return inl(uhci->io_addr + reg); return inl(uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
return readl_be(uhci->regs + reg);
#endif
else else
return readl(uhci->regs + reg); return readl(uhci->regs + reg);
} }
static inline void uhci_writel(struct uhci_hcd *uhci, u32 val, int reg) static inline void uhci_writel(const struct uhci_hcd *uhci, u32 val, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
outl(val, uhci->io_addr + reg); outl(val, uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
writel_be(val, uhci->regs + reg);
#endif
else else
writel(val, uhci->regs + reg); writel(val, uhci->regs + reg);
} }
static inline u16 uhci_readw(struct uhci_hcd *uhci, int reg) static inline u16 uhci_readw(const struct uhci_hcd *uhci, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
return inw(uhci->io_addr + reg); return inw(uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
return readw_be(uhci->regs + reg);
#endif
else else
return readw(uhci->regs + reg); return readw(uhci->regs + reg);
} }
static inline void uhci_writew(struct uhci_hcd *uhci, u16 val, int reg) static inline void uhci_writew(const struct uhci_hcd *uhci, u16 val, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
outw(val, uhci->io_addr + reg); outw(val, uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
writew_be(val, uhci->regs + reg);
#endif
else else
writew(val, uhci->regs + reg); writew(val, uhci->regs + reg);
} }
static inline u8 uhci_readb(struct uhci_hcd *uhci, int reg) static inline u8 uhci_readb(const struct uhci_hcd *uhci, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
return inb(uhci->io_addr + reg); return inb(uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
return readb_be(uhci->regs + reg);
#endif
else else
return readb(uhci->regs + reg); return readb(uhci->regs + reg);
} }
static inline void uhci_writeb(struct uhci_hcd *uhci, u8 val, int reg) static inline void uhci_writeb(const struct uhci_hcd *uhci, u8 val, int reg)
{ {
if (uhci_has_pci_registers(uhci)) if (uhci_has_pci_registers(uhci))
outb(val, uhci->io_addr + reg); outb(val, uhci->io_addr + reg);
#ifdef CONFIG_USB_UHCI_BIG_ENDIAN_MMIO
else if (uhci_big_endian_mmio(uhci))
writeb_be(val, uhci->regs + reg);
#endif
else else
writeb(val, uhci->regs + reg); writeb(val, uhci->regs + reg);
} }
#endif /* !defined(CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC) */ #endif /* CONFIG_USB_UHCI_SUPPORT_NON_PCI_HC */
#endif #endif