Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d07e8819 authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: dwc3: add xHCI Host support 



The Designware USB3 IP can be configured with
an internal xHCI. If we're running on such a
version, let's start the xHCI stack.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0949e99b

drivers/usb/dwc3/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config USB_DWC3 
	tristate "DesignWare USB3 DRD Core Support"

	depends on (USB || USB_GADGET)

	select USB_OTG_UTILS

	select USB_XHCI_PLATFORM

	help

	  Say Y or M here if your system has a Dual Role SuperSpeed

	  USB controller based on the DesignWare USB3 IP Core.

drivers/usb/dwc3/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,11 +4,13 @@ ccflags-$(CONFIG_USB_DWC3_VERBOSE) += -DVERBOSE_DEBUG 
obj-$(CONFIG_USB_DWC3)			+= dwc3.o



dwc3-y					:= core.o

dwc3-y					+= host.o



ifneq ($(CONFIG_USB_GADGET_DWC3),)

	dwc3-y				+= gadget.o ep0.o

endif





ifneq ($(CONFIG_DEBUG_FS),)

	dwc3-y				+= debugfs.o

endif

drivers/usb/dwc3/core.c

+36 −3
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ static int __devinit dwc3_probe(struct platform_device *pdev) 
		goto err1;

	}



	dwc->res = res;



	res = request_mem_region(res->start, resource_size(res),

			dev_name(&pdev->dev));

	if (!res) {
@@ -401,8 +403,27 @@ static int __devinit dwc3_probe(struct platform_device *pdev) 
	mode = DWC3_MODE(dwc->hwparams.hwparams0);



	switch (mode) {

	case DWC3_MODE_DRD:

	case DWC3_MODE_DEVICE:

		ret = dwc3_gadget_init(dwc);

		if (ret) {

			dev_err(&pdev->dev, "failed to initialize gadget\n");

			goto err4;

		}

		break;

	case DWC3_MODE_HOST:

		ret = dwc3_host_init(dwc);

		if (ret) {

			dev_err(&pdev->dev, "failed to initialize host\n");

			goto err4;

		}

		break;

	case DWC3_MODE_DRD:

		ret = dwc3_host_init(dwc);

		if (ret) {

			dev_err(&pdev->dev, "failed to initialize host\n");

			goto err4;

		}



		ret = dwc3_gadget_init(dwc);

		if (ret) {

			dev_err(&pdev->dev, "failed to initialize gadget\n");
@@ -427,10 +448,16 @@ static int __devinit dwc3_probe(struct platform_device *pdev) 


err5:

	switch (mode) {

	case DWC3_MODE_DRD:

	case DWC3_MODE_DEVICE:

		dwc3_gadget_exit(dwc);

		break;

	case DWC3_MODE_HOST:

		dwc3_host_exit(dwc);

		break;

	case DWC3_MODE_DRD:

		dwc3_host_exit(dwc);

		dwc3_gadget_exit(dwc);

		break;

	default:

		/* do nothing */

		break;
@@ -465,10 +492,16 @@ static int __devexit dwc3_remove(struct platform_device *pdev) 
	dwc3_debugfs_exit(dwc);



	switch (dwc->mode) {

	case DWC3_MODE_DRD:

	case DWC3_MODE_DEVICE:

		dwc3_gadget_exit(dwc);

		break;

	case DWC3_MODE_HOST:

		dwc3_host_exit(dwc);

		break;

	case DWC3_MODE_DRD:

		dwc3_host_exit(dwc);

		dwc3_gadget_exit(dwc);

		break;

	default:

		/* do nothing */

		break;

drivers/usb/dwc3/core.h

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include <linux/device.h>

#include <linux/spinlock.h>

#include <linux/ioport.h>

#include <linux/list.h>

#include <linux/dma-mapping.h>

#include <linux/mm.h>
@@ -560,6 +561,7 @@ struct dwc3_hwparams { 
 * @ep0_bounce_addr: dma address of ep0_bounce

 * @lock: for synchronizing

 * @dev: pointer to our struct device

 * @xhci: pointer to our xHCI child

 * @event_buffer_list: a list of event buffers

 * @gadget: device side representation of the peripheral controller

 * @gadget_driver: pointer to the gadget driver
@@ -598,6 +600,9 @@ struct dwc3 { 
	spinlock_t		lock;

	struct device		*dev;



	struct platform_device	*xhci;

	struct resource		*res;



	struct dwc3_event_buffer *ev_buffs[DWC3_EVENT_BUFFERS_MAX];

	struct dwc3_ep		*eps[DWC3_ENDPOINTS_NUM];
@@ -782,4 +787,8 @@ union dwc3_event { 
#define DWC3_HAS_XHCI			BIT(1)

#define DWC3_HAS_OTG			BIT(3)



/* prototypes */

int dwc3_host_init(struct dwc3 *dwc);

void dwc3_host_exit(struct dwc3 *dwc);



#endif /* __DRIVERS_USB_DWC3_CORE_H */

drivers/usb/dwc3/host.c

0 → 100644
+116 −0
Original line number Diff line number Diff line 
/**

 * host.c - DesignWare USB3 DRD Controller Host Glue

 *

 * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com

 *

 * Authors: Felipe Balbi <balbi@ti.com>,

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions, and the following disclaimer,

 *    without modification.

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in the

 *    documentation and/or other materials provided with the distribution.

 * 3. The names of the above-listed copyright holders may not be used

 *    to endorse or promote products derived from this software without

 *    specific prior written permission.

 *

 * ALTERNATIVELY, this software may be distributed under the terms of the

 * GNU General Public License ("GPL") version 2, as published by the Free

 * Software Foundation.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

 * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF

 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/spinlock.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/interrupt.h>

#include <linux/ioport.h>

#include <linux/io.h>

#include <linux/list.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>



#include "core.h"

#include "io.h"



#include "debug.h"



static struct resource generic_resources[] = {

	{

		.flags = IORESOURCE_IRQ,

	},

	{

		.flags = IORESOURCE_MEM,

	},

};



int dwc3_host_init(struct dwc3 *dwc)

{

	struct platform_device	*xhci;

	int			ret;



	xhci = platform_device_alloc("xhci", -1);

	if (!xhci) {

		dev_err(dwc->dev, "couldn't allocate xHCI device\n");

		ret = -ENOMEM;

		goto err0;

	}



	dma_set_coherent_mask(&xhci->dev, dwc->dev->coherent_dma_mask);



	xhci->dev.parent	= dwc->dev;

	xhci->dev.dma_mask	= dwc->dev->dma_mask;

	xhci->dev.dma_parms	= dwc->dev->dma_parms;



	dwc->xhci = xhci;



	/* setup resources */

	generic_resources[0].start = dwc->irq;



	generic_resources[1].start = dwc->res->start;

	generic_resources[1].end = dwc->res->start + 0x7fff;



	ret = platform_device_add_resources(xhci, generic_resources,

			ARRAY_SIZE(generic_resources));

	if (ret) {

		dev_err(dwc->dev, "couldn't add resources to xHCI device\n");

		goto err1;

	}



	ret = platform_device_add(xhci);

	if (ret) {

		dev_err(dwc->dev, "failed to register xHCI device\n");

		goto err1;

	}



	return 0;



err1:

	platform_device_put(xhci);



err0:

	return ret;

}



void dwc3_host_exit(struct dwc3 *dwc)

{

	platform_device_unregister(dwc->xhci);

}