ssb: Implement SDIO host bus support
PATCH 1/1 ssb: Implement SDIO host bus support
From: Albert Herranz <[email protected]>
Add support for communicating with a Sonics Silicon Backplane through a SDIO interface, as found in the Nintendo Wii WLAN daughter card.
The Nintendo Wii WLAN card includes a custom Broadcom 4318 chip with a SDIO host interface.
Signed-off-by Albert Herranz <[email protected]>
Signed-off-by Michael Buesch <[email protected]>
--- drivers/ssb/Kconfig | 14 + drivers/ssb/Makefile | 1 + drivers/ssb/main.c | 58 +++++- drivers/ssb/scan.c | 11 + drivers/ssb/sdio.c | 611 +++++++++++++++++++++++++++++++++++++++++++++ drivers/ssb/ssb_private.h | 40 +++ include/linux/ssb/ssb.h | 32 +++ 7 files changed, 766 insertions(+), 1 deletions(-) create mode 100644 drivers/ssb/sdio.c
drivers/ssb/Kconfig +14 -0
@@ -66,6 +66,20 @@ config SSB_PCMCIAHOST If unsure, say N +config SSB_SDIOHOST_POSSIBLE + bool + depends on SSB && (MMC = y || MMC = SSB) + default y + +config SSB_SDIOHOST + bool "Support for SSB on SDIO-bus host" + depends on SSB_SDIOHOST_POSSIBLE + help + Support for a Sonics Silicon Backplane on top + of a SDIO device. + + If unsure, say N + config SSB_SILENT bool "No SSB kernel messages" depends on SSB && EMBEDDED
drivers/ssb/Makefile +1 -0
@@ -6,6 +6,7 @@ ssb-$(CONFIG_SSB_SPROM) += sprom.o # host support ssb-$(CONFIG_SSB_PCIHOST) += pci.o pcihost_wrapper.o ssb-$(CONFIG_SSB_PCMCIAHOST) += pcmcia.o +ssb-$(CONFIG_SSB_SDIOHOST) += sdio.o # built-in drivers ssb-y += driver_chipcommon.o
drivers/ssb/main.c +57 -1
99 lines not on this page · raw message
drivers/ssb/scan.c +11 -0
@@ -175,6 +175,9 @@ static u32 scan_read32(struct ssb_bus *b }else ssb_pcmcia_switch_segment (bus,0 );break ; +case SSB_BUSTYPE_SDIO : + offset += current_coreidx *SSB_CORE_SIZE ; +return ssb_sdio_scan_read32 (bus, offset); }return readl (bus->mmio + offset); }
@@ -188,6 +191,8 @@ static int scan_switchcore(struct ssb_bureturn ssb_pci_switch_coreidx (bus, coreidx);case SSB_BUSTYPE_PCMCIA :return ssb_pcmcia_switch_coreidx (bus, coreidx); +case SSB_BUSTYPE_SDIO : +return ssb_sdio_scan_switch_coreidx (bus, coreidx); }return 0 ; }
@@ -206,6 +211,8 @@ void ssb_iounmap(struct ssb_bus *bus)SSB_BUG_ON (1 );/* Can't reach this code. */ #endif break ; +case SSB_BUSTYPE_SDIO : +break ; } bus->mmio =NULL ; bus->mapped_device =NULL ;
@@ -230,6 +237,10 @@ static void __iomem *ssb_ioremap(structSSB_BUG_ON (1 );/* Can't reach this code. */ #endif break ; +case SSB_BUSTYPE_SDIO : +/* Nothing to ioremap in the SDIO case, just fake it */ + mmio = (void __iomem *)baseaddr; +break ; }return mmio;
drivers/ssb/sdio.c new file +610 -0
610 lines not on this page · raw message
drivers/ssb/ssb_private.h +40 -0
@@ -114,6 +114,46 @@ static inline int ssb_pcmcia_init(struct }#endif /* CONFIG_SSB_PCMCIAHOST */ +/* sdio.c */ +#ifdef CONFIG_SSB_SDIOHOST +extern int ssb_sdio_get_invariants (struct ssb_bus *bus, +struct ssb_init_invariants *iv); + +extern u32 ssb_sdio_scan_read32 (struct ssb_bus *bus,u16 offset); +extern int ssb_sdio_switch_core (struct ssb_bus *bus,struct ssb_device *dev); +extern int ssb_sdio_scan_switch_coreidx (struct ssb_bus *bus,u8 coreidx); +extern int ssb_sdio_hardware_setup (struct ssb_bus *bus); +extern void ssb_sdio_exit (struct ssb_bus *bus); +extern int ssb_sdio_init (struct ssb_bus *bus); + +extern const struct ssb_bus_ops ssb_sdio_ops; +#else /* CONFIG_SSB_SDIOHOST */ +static inline u32 ssb_sdio_scan_read32 (struct ssb_bus *bus,u16 offset) +{ +return 0 ; +} +static inline int ssb_sdio_switch_core (struct ssb_bus *bus, +struct ssb_device *dev) +{ +return 0 ; +} +static inline int ssb_sdio_scan_switch_coreidx (struct ssb_bus *bus,u8 coreidx) +{ +return 0 ; +} +static inline int ssb_sdio_hardware_setup (struct ssb_bus *bus) +{ +return 0 ; +} +static inline void ssb_sdio_exit (struct ssb_bus *bus) +{ +} +static inline int ssb_sdio_init (struct ssb_bus *bus) +{ +return 0 ; +} +#endif /* CONFIG_SSB_SDIOHOST */ +/* scan.c */ extern const char *ssb_core_name (u16 coreid);
include/linux/ssb/ssb.h +23 -2
@@ -238,6 +238,7 @@ enum ssb_bustype {SSB_BUSTYPE_SSB ,/* This SSB bus is the system bus */ SSB_BUSTYPE_PCI ,/* SSB is connected to PCI bus */ SSB_BUSTYPE_PCMCIA ,/* SSB is connected to PCMCIA bus */ + SSB_BUSTYPE_SDIO, /* SSB is connected to SDIO bus */ };/* board_vendor */
@@ -270,8 +271,12 @@ struct ssb_bus {/* The core in the basic address register window. (PCI bus only) */ struct ssb_device *mapped_device; -/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */ -u8 mapped_pcmcia_seg; +union { +/* Currently mapped PCMCIA segment. (bustype == SSB_BUSTYPE_PCMCIA only) */ +u8 mapped_pcmcia_seg; +/* Current SSB base address window for SDIO. */ +u32 sdio_sbaddr; + };/* Lock for core and segment switching. * On PCMCIA-host busses this is used to protect the whole MMIO access. */ spinlock_t bar_lock;
@@ -282,6 +287,11 @@ struct ssb_bus {struct pci_dev *host_pci;/* Pointer to the PCMCIA device (only if bustype == SSB_BUSTYPE_PCMCIA). */ struct pcmcia_device *host_pcmcia; +/* Pointer to the SDIO device (only if bustype == SSB_BUSTYPE_SDIO). */ +struct sdio_func *host_sdio; + +/* See enum ssb_quirks */ +unsigned int quirks;#ifdef CONFIG_SSB_SPROM /* Mutex to protect the SPROM writing. */
@@ -336,6 +346,11 @@ struct ssb_bus {#endif /* DEBUG */ }; +enum ssb_quirks { +/* SDIO connected card requires performing a read after writing a 32-bit value */ +SSB_QUIRK_SDIO_READ_AFTER_WRITE32 = (1 <<0 ), +}; +/* The initialization-invariants. */ struct ssb_init_invariants {/* Versioning information about the PCB. */
@@ -366,6 +381,12 @@ extern int ssb_bus_pcmciabus_register(ststruct pcmcia_device *pcmcia_dev, unsigned long baseaddr);#endif /* CONFIG_SSB_PCMCIAHOST */ +#ifdef CONFIG_SSB_SDIOHOST +extern int ssb_bus_sdiobus_register (struct ssb_bus *bus, +struct sdio_func *sdio_func, +unsigned int quirks); +#endif /* CONFIG_SSB_SDIOHOST */ +extern void ssb_bus_unregister (struct ssb_bus *bus);
Signature · 1 line
Greetings, Michael.