From: Ming Lei <tom.leiming@xxxxxxxxx>
This patch provides support for building each dma controller driver
as standalone module, and this modules can be built into one same
image and can be used by each hw glue driver.
HW glue driver has the knowledge of which type of dma controller will
be used, and can pass the knowledge into musb core driver via glue ops,
so we can take runtime method to support all hw controller and its dma
controller in one binary musb driver.
Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
---
drivers/usb/musb/Kconfig | 28 ++++++++++++++++----
drivers/usb/musb/Makefile | 19 ++------------
drivers/usb/musb/blackfin.c | 5 +++-
drivers/usb/musb/cppi_dma.c | 21 +++++++++++++--
drivers/usb/musb/davinci.c | 5 +++-
drivers/usb/musb/musb_core.c | 9 +++++-
drivers/usb/musb/musb_dma.h | 50 ++++++++++++++++++++++++++++++++++++-
drivers/usb/musb/musbhsdma.c | 23 +++++++++++++++--
drivers/usb/musb/omap2430.c | 5 +++-
drivers/usb/musb/tusb6010.c | 6 ++++-
drivers/usb/musb/tusb6010_omap.c | 23 +++++++++++++++--
11 files changed, 155 insertions(+), 39 deletions(-)
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 8846cc0..8584e71 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -179,22 +179,25 @@ config MUSB_PIO_ONLY
you can still disable it at run time using the "use_dma=n" module
parameter.
-config USB_INVENTRA_DMA
- bool
+config USB_INVENTRA_DMA_HW
+ select USB_INVENTRA_DMA
+ tristate
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN
help
Enable DMA transfers using Mentor's engine.
-config USB_TI_CPPI_DMA
- bool
+config USB_TI_CPPI_DMA_HW
+ select USB_TI_CPPI_DMA
+ tristate
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
default USB_MUSB_DAVINCI
help
Enable DMA transfers when TI CPPI DMA is available.
-config USB_TUSB_OMAP_DMA
- bool
+config USB_TUSB_OMAP_DMA_HW
+ select USB_TUSB_OMAP_DMA
+ tristate
depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
depends on USB_MUSB_TUSB6010
depends on ARCH_OMAP
@@ -202,6 +205,19 @@ config USB_TUSB_OMAP_DMA
help
Enable DMA transfers on TUSB 6010 when OMAP DMA is available.
+config USB_INVENTRA_DMA
+ bool
+ default n
+
+config USB_TI_CPPI_DMA
+ bool
+ default n
+
+config USB_TUSB_OMAP_DMA
+ bool
+ default n
+
+
config USB_MUSB_DEBUG
depends on USB_MUSB_HDRC
bool "Enable debugging messages"
diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 11aa660..1e03d20 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -26,20 +26,7 @@ obj-$(CONFIG_USB_MUSB_UX500_GLUE) += ux500.o
# PIO only, or DMA (several potential schemes).
# though PIO is always there to back up DMA, and for ep0
-ifneq ($(CONFIG_MUSB_PIO_ONLY),y)
+obj-$(CONFIG_USB_INVENTRA_DMA_HW) += musbhsdma.o
+obj-$(CONFIG_USB_TI_CPPI_DMA_HW) += cppi_dma.o
+obj-$(CONFIG_USB_TUSB_OMAP_DMA_HW) += tusb6010_omap.o
- ifeq ($(CONFIG_USB_INVENTRA_DMA),y)
- musb_hdrc-y += musbhsdma.o
-
- else
- ifeq ($(CONFIG_USB_TI_CPPI_DMA),y)
- musb_hdrc-y += cppi_dma.o
-
- else
- ifeq ($(CONFIG_USB_TUSB_OMAP_DMA),y)
- musb_hdrc-y += tusb6010_omap.o
-
- endif
- endif
- endif
-endif
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c
index 3bef818..210758d 100644
--- a/drivers/usb/musb/blackfin.c
+++ b/drivers/usb/musb/blackfin.c
@@ -419,7 +419,7 @@ static int bfin_musb_exit(struct musb *musb)
static const struct musb_platform_ops bfin_ops = {
.fifo_mode = 2,
- .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING,
+ .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING | MUSB_GLUE_DMA_INVENTRA,
.init = bfin_musb_init,
.exit = bfin_musb_exit,
@@ -434,6 +434,9 @@ static const struct musb_platform_ops bfin_ops = {
.read_fifo = bfin_musb_read_fifo,
.write_fifo = bfin_musb_write_fifo,
+
+ .dma_controller_create = inventra_dma_controller_create,
+ .dma_controller_destroy = inventra_dma_controller_destroy,
};
static u64 bfin_dmamask = DMA_BIT_MASK(32);
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index 519e641..453a06a 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -1305,7 +1305,7 @@ irqreturn_t cppi_interrupt(int irq, void *dev_id)
/* Instantiate a software object representing a DMA controller. */
struct dma_controller *__devinit
-dma_controller_create(struct musb *musb, void __iomem *mregs)
+cppi_dma_controller_create(struct musb *musb, void __iomem *mregs)
{
struct cppi *controller;
struct device *dev = musb->controller;
@@ -1344,7 +1344,7 @@ dma_controller_create(struct musb *musb, void __iomem *mregs)
if (irq > 0) {
if (request_irq(irq, cppi_interrupt, 0, "cppi-dma", musb)) {
dev_err(dev, "request_irq %d failed!\n", irq);
- dma_controller_destroy(&controller->controller);
+ cppi_dma_controller_destroy(&controller->controller);
return NULL;
}
controller->irq = irq;
@@ -1352,11 +1352,12 @@ dma_controller_create(struct musb *musb, void __iomem *mregs)
return &controller->controller;
}
+EXPORT_SYMBOL(cppi_dma_controller_create);
/*
* Destroy a previously-instantiated DMA controller.
*/
-void dma_controller_destroy(struct dma_controller *c)
+void cppi_dma_controller_destroy(struct dma_controller *c)
{
struct cppi *cppi;
@@ -1370,6 +1371,7 @@ void dma_controller_destroy(struct dma_controller *c)
kfree(cppi);
}
+EXPORT_SYMBOL(cppi_dma_controller_destroy);
/*
* Context: controller irqlocked, endpoint selected
@@ -1550,3 +1552,16 @@ static int cppi_channel_abort(struct dma_channel *channel)
* Power Management ... probably turn off cppi during suspend, restart;
* check state ram? Clocking is presumably shared with usb core.
*/
+MODULE_DESCRIPTION("CPPI dma controller driver for musb");
+MODULE_LICENSE("GPL v2");
+
+static int __init cppi_dma_init(void)
+{
+ return 0;
+}
+module_init(cppi_dma_init);
+
+static void __exit cppi_dma__exit(void)
+{
+}
+module_exit(cppi_dma__exit);
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 8ce8c97..b0f5101 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -506,7 +506,7 @@ static int davinci_musb_exit(struct musb *musb)
static const struct musb_platform_ops davinci_ops = {
.fifo_mode = 2,
- .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING,
+ .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING | MUSB_GLUE_DMA_CPPI,
.init = davinci_musb_init,
.exit = davinci_musb_exit,
@@ -519,6 +519,9 @@ static const struct musb_platform_ops davinci_ops = {
.read_fifo = musb_read_fifo,
.write_fifo = musb_write_fifo,
+
+ .dma_controller_create = cppi_dma_controller_create,
+ .dma_controller_destroy = cppi_dma_controller_destroy,
};
static u64 davinci_dmamask = DMA_BIT_MASK(32);
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index d667212..bc835cd 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -1953,7 +1953,7 @@ static void musb_free(struct musb *musb)
struct dma_controller *c = musb->dma_controller;
(void) c->stop(c);
- dma_controller_destroy(c);
+ musb->ops->dma_controller_destroy(c);
}
#ifdef CONFIG_USB_MUSB_HDRC_HCD
@@ -2065,7 +2065,12 @@ bad_config:
if (use_dma && dev->dma_mask) {
struct dma_controller *c;
- c = dma_controller_create(musb, musb->mregs);
+ if (!musb->ops->dma_controller_create) {
+ dev_err(dev, "no dma_controller_create for non-PIO mode!\n");
+ status = -ENODEV;
+ goto fail3;
+ }
+ c = musb->ops->dma_controller_create(musb, musb->mregs);
musb->dma_controller = c;
if (c)
(void) c->start(c);
diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h
index 23a589d..70a64a2 100644
--- a/drivers/usb/musb/musb_dma.h
+++ b/drivers/usb/musb/musb_dma.h
@@ -175,9 +175,55 @@ struct dma_controller {
extern void musb_dma_completion(struct musb *musb, u8 epnum, u8 transmit);
+#ifdef CONFIG_USB_TI_CPPI_DMA
extern struct dma_controller *__devinit
-dma_controller_create(struct musb *, void __iomem *);
+cppi_dma_controller_create(struct musb *, void __iomem *);
+
+extern void cppi_dma_controller_destroy(struct dma_controller *);
+#else
+static inline struct dma_controller *__devinit
+cppi_dma_controller_create(struct musb *musb, void __iomem *mregs)
+{
+ return NULL;
+}
+
+static inline void cppi_dma_controller_destroy(struct dma_controller *c)
+{
+}
+#endif
+
+#ifdef CONFIG_USB_INVENTRA_DMA
+extern struct dma_controller *__devinit
+inventra_dma_controller_create(struct musb *, void __iomem *);
+
+extern void inventra_dma_controller_destroy(struct dma_controller *);
+#else
+static inline struct dma_controller *__devinit
+inventra_dma_controller_create(struct musb *musb, void __iomem *mregs)
+{
+ return NULL;
+}
-extern void dma_controller_destroy(struct dma_controller *);
+static inline void inventra_dma_controller_destroy(struct dma_controller *c)
+{
+}
+#endif
+
+#ifdef CONFIG_USB_TUSB_OMAP_DMA
+extern struct dma_controller *__devinit
+tusb_dma_controller_create(struct musb *, void __iomem *);
+
+extern void tusb_dma_controller_destroy(struct dma_controller *);
+#else
+static inline struct dma_controller *__devinit
+tusb_dma_controller_create(struct musb *musb, void __iomem *mregs)
+{
+ return NULL;
+}
+
+static inline void tusb_dma_controller_destroy(struct dma_controller *c)
+{
+}
+#endif
#endif /* __MUSB_DMA_H__ */
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c
index 890b25c..69dd4f5 100644
--- a/drivers/usb/musb/musbhsdma.c
+++ b/drivers/usb/musb/musbhsdma.c
@@ -30,6 +30,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
+#include <linux/module.h>
#include <linux/device.h>
#include <linux/interrupt.h>
#include <linux/platform_device.h>
@@ -357,7 +358,7 @@ done:
return retval;
}
-void dma_controller_destroy(struct dma_controller *c)
+void inventra_dma_controller_destroy(struct dma_controller *c)
{
struct musb_dma_controller *controller = container_of(c,
struct musb_dma_controller, controller);
@@ -370,9 +371,10 @@ void dma_controller_destroy(struct dma_controller *c)
kfree(controller);
}
+EXPORT_SYMBOL(inventra_dma_controller_destroy);
struct dma_controller *__devinit
-dma_controller_create(struct musb *musb, void __iomem *base)
+inventra_dma_controller_create(struct musb *musb, void __iomem *base)
{
struct musb_dma_controller *controller;
struct device *dev = musb->controller;
@@ -402,7 +404,7 @@ dma_controller_create(struct musb *musb, void __iomem *base)
if (request_irq(irq, dma_controller_irq, IRQF_DISABLED,
dev_name(musb->controller), &controller->controller)) {
dev_err(dev, "request_irq %d failed!\n", irq);
- dma_controller_destroy(&controller->controller);
+ inventra_dma_controller_destroy(&controller->controller);
return NULL;
}
@@ -411,3 +413,18 @@ dma_controller_create(struct musb *musb, void __iomem *base)
return &controller->controller;
}
+EXPORT_SYMBOL(inventra_dma_controller_create);
+
+MODULE_DESCRIPTION("MUSB Inventra dma controller driver");
+MODULE_LICENSE("GPL v2");
+
+static int __init inventra_dma_init(void)
+{
+ return 0;
+}
+module_init(inventra_dma_init);
+
+static void __exit inventra_dma__exit(void)
+{
+}
+module_exit(inventra_dma__exit);
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index c94f230..688e890 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -371,7 +371,7 @@ static int omap2430_musb_exit(struct musb *musb)
static const struct musb_platform_ops omap2430_ops = {
.fifo_mode = 4,
- .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING,
+ .flags = MUSB_GLUE_EP_ADDR_FLAT_MAPPING | MUSB_GLUE_DMA_INVENTRA,
.init = omap2430_musb_init,
.exit = omap2430_musb_exit,
@@ -382,6 +382,9 @@ static const struct musb_platform_ops omap2430_ops = {
.read_fifo = musb_read_fifo,
.write_fifo = musb_write_fifo,
+
+ .dma_controller_create = inventra_dma_controller_create,
+ .dma_controller_destroy = inventra_dma_controller_destroy,
};
static u64 omap2430_dmamask = DMA_BIT_MASK(32);
diff --git a/drivers/usb/musb/tusb6010.c b/drivers/usb/musb/tusb6010.c
index 75c8e8a..64c0905 100644
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@ -1165,7 +1165,8 @@ static int tusb_musb_exit(struct musb *musb)
static const struct musb_platform_ops tusb_ops = {
.fifo_mode = 4,
- .flags = MUSB_GLUE_TUSB_STYLE | MUSB_GLUE_EP_ADDR_INDEXED_MAPPING,
+ .flags = MUSB_GLUE_TUSB_STYLE |
+ MUSB_GLUE_EP_ADDR_INDEXED_MAPPING | MUSB_GLUE_DMA_TUSB,
.init = tusb_musb_init,
.exit = tusb_musb_exit,
@@ -1181,6 +1182,9 @@ static const struct musb_platform_ops tusb_ops = {
.set_vbus = tusb_musb_set_vbus,
.read_fifo = tusb_musb_read_fifo,
.write_fifo = tusb_musb_write_fifo,
+
+ .dma_controller_create = tusb_dma_controller_create,
+ .dma_controller_destroy = tusb_dma_controller_destroy,
};
static u64 tusb_dmamask = DMA_BIT_MASK(32);
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index af9cb76..c06d921 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -641,7 +641,7 @@ static void tusb_omap_dma_release(struct dma_channel *channel)
channel = NULL;
}
-void dma_controller_destroy(struct dma_controller *c)
+void tusb_dma_controller_destroy(struct dma_controller *c)
{
struct tusb_omap_dma *tusb_dma;
int i;
@@ -660,9 +660,10 @@ void dma_controller_destroy(struct dma_controller *c)
kfree(tusb_dma);
}
+EXPORT_SYMBOL(tusb_dma_controller_destroy);
struct dma_controller *__devinit
-dma_controller_create(struct musb *musb, void __iomem *base)
+tusb_dma_controller_create(struct musb *musb, void __iomem *base)
{
void __iomem *tbase = musb->ctrl_base;
struct tusb_omap_dma *tusb_dma;
@@ -720,7 +721,23 @@ dma_controller_create(struct musb *musb, void __iomem *base)
return &tusb_dma->controller;
cleanup:
- dma_controller_destroy(&tusb_dma->controller);
+ tusb_dma_controller_destroy(&tusb_dma->controller);
return NULL;
}
+EXPORT_SYMBOL(tusb_dma_controller_create);
+
+
+MODULE_DESCRIPTION("TUSB dma controller driver for musb");
+MODULE_LICENSE("GPL v2");
+
+static int __init tusb_dma_init(void)
+{
+ return 0;
+}
+module_init(tusb_dma_init);
+
+static void __exit tusb_dma__exit(void)
+{
+}
+module_exit(tusb_dma__exit);
--
1.7.3
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
