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

Commit f4918d31 authored by Mayank Rana's avatar Mayank Rana
Browse files

usb: dwc3: Add support for GSI event buffer configuration 



Add additional event buffers for GSI based hardware accelerated
endpoints and its related configuration. This change moves USB
GSI endpoint related event buffer handling to glue driver from
DWC3 core driver.

CRs-Fixed: 1003784
Change-Id: Ibedf73690040b8bd872f5621835680a66c22e265
Signed-off-by: default avatarHemant Kumar <hemantk@codeaurora.org>
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 0d90962f

Documentation/devicetree/bindings/usb/msm-ssusb.txt

+3 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ Optional properties : 
	  should point to external connector device, which provide "USB-HOST"

	  cable events. A single phandle may be specified if a single connector

	  device provides both "USB" and "USB-HOST" events.

- qcom,num-gsi-evt-buffs: If present, specifies number of GSI based hardware accelerated

  event buffers. 1 event buffer is needed per h/w accelerated endpoint.



Sub nodes:

- Sub node for "DWC3- USB3 controller".
@@ -84,6 +86,7 @@ Example MSM USB3.0 controller device node : 
		qcom,dwc-usb3-msm-tx-fifo-size = <29696>;

		qcom,usb-dbm = <&dbm_1p4>;

		qcom,lpm-to-suspend-delay-ms = <2>;

		qcom,num-gsi-evt-buffs = <0x2>;



		qcom,msm_bus,name = "usb3";

		qcom,msm_bus,num_cases = <2>;

drivers/usb/dwc3/core.c

+10 −0
Original line number Diff line number Diff line
@@ -356,6 +356,9 @@ static void dwc3_free_event_buffers(struct dwc3 *dwc) 
	evt = dwc->ev_buf;

	if (evt)

		dwc3_free_one_event_buffer(dwc, evt);



	/* free GSI related event buffers */

	dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_FREE);

}



/**
@@ -377,6 +380,8 @@ static int dwc3_alloc_event_buffers(struct dwc3 *dwc, unsigned length) 
	}

	dwc->ev_buf = evt;



	/* alloc GSI related event buffers */

	dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_ALLOC);

	return 0;

}
@@ -406,6 +411,8 @@ int dwc3_event_buffers_setup(struct dwc3 *dwc) 
			DWC3_GEVNTSIZ_SIZE(evt->length));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);



	/* setup GSI related event buffers */

	dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_SETUP);

	return 0;

}
@@ -422,6 +429,9 @@ static void dwc3_event_buffers_cleanup(struct dwc3 *dwc) 
	dwc3_writel(dwc->regs, DWC3_GEVNTSIZ(0), DWC3_GEVNTSIZ_INTMASK

			| DWC3_GEVNTSIZ_SIZE(0));

	dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), 0);



	/* cleanup GSI related event buffers */

	dwc3_notify_event(dwc, DWC3_GSI_EVT_BUF_CLEANUP);

}



static int dwc3_alloc_scratch_buffers(struct dwc3 *dwc)

drivers/usb/dwc3/core.h

+6 −0
Original line number Diff line number Diff line
@@ -780,6 +780,12 @@ struct dwc3_scratchpad_array { 
#define DWC3_CONTROLLER_SET_CURRENT_DRAW_EVENT	7

#define DWC3_CONTROLLER_RESTART_USB_SESSION	8



/* USB GSI event buffer related notification */

#define DWC3_GSI_EVT_BUF_ALLOC			9

#define DWC3_GSI_EVT_BUF_SETUP			10

#define DWC3_GSI_EVT_BUF_CLEANUP		11

#define DWC3_GSI_EVT_BUF_FREE			12



#define MAX_INTR_STATS				10



/**

drivers/usb/dwc3/dwc3-msm.c

+100 −4
Original line number Diff line number Diff line
@@ -117,6 +117,11 @@ MODULE_PARM_DESC(cpu_to_affin, "affin usb irq to this cpu"); 
#define	GSI_IF_STS	(QSCRATCH_REG_OFFSET + 0x1A4)

#define	GSI_WR_CTRL_STATE_MASK	BIT(15)



#define DWC3_GEVNTCOUNT_EVNTINTRPTMASK		(1 << 31)

#define DWC3_GEVNTADRHI_EVNTADRHI_GSI_EN(n)	(n << 22)

#define DWC3_GEVNTADRHI_EVNTADRHI_GSI_IDX(n)	(n << 16)

#define DWC3_GEVENT_TYPE_GSI			0x3



struct dwc3_msm_req_complete {

	struct list_head list_item;

	struct usb_request *req;
@@ -213,6 +218,8 @@ struct dwc3_msm { 
	unsigned int		lpm_to_suspend_delay;

	bool			init;

	enum plug_orientation	typec_orientation;

	u32			num_gsi_event_buffers;

	struct dwc3_event_buffer **gsi_ev_buff;

};



#define USB_HSPHY_3P3_VOL_MIN		3050000 /* uV */
@@ -232,7 +239,7 @@ struct dwc3_msm { 


static void dwc3_pwr_event_handler(struct dwc3_msm *mdwc);

static int dwc3_msm_gadget_vbus_draw(struct dwc3_msm *mdwc, unsigned int mA);



static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned int event);

/**

 *

 * Read register with debug info.
@@ -1608,10 +1615,9 @@ static void dwc3_msm_vbus_draw_work(struct work_struct *w) 
static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned int event)

{

	struct dwc3_msm *mdwc = dev_get_drvdata(dwc->dev->parent);

	struct dwc3_event_buffer *evt;

	u32 reg;



	if (dwc->revision < DWC3_REVISION_230A)

		return;

	int i;



	switch (event) {

	case DWC3_CONTROLLER_ERROR_EVENT:
@@ -1696,6 +1702,93 @@ static void dwc3_msm_notify_event(struct dwc3 *dwc, unsigned int event) 
		dev_dbg(mdwc->dev, "DWC3_CONTROLLER_RESTART_USB_SESSION received\n");

		schedule_work(&mdwc->restart_usb_work);

		break;

	case DWC3_GSI_EVT_BUF_ALLOC:

		dev_dbg(mdwc->dev, "DWC3_GSI_EVT_BUF_ALLOC\n");



		if (!mdwc->num_gsi_event_buffers)

			break;



		mdwc->gsi_ev_buff = devm_kzalloc(dwc->dev,

			sizeof(*dwc->ev_buf) * mdwc->num_gsi_event_buffers,

			GFP_KERNEL);

		if (!mdwc->gsi_ev_buff) {

			dev_err(dwc->dev, "can't allocate gsi_ev_buff\n");

			break;

		}



		for (i = 0; i < mdwc->num_gsi_event_buffers; i++) {



			evt = devm_kzalloc(dwc->dev, sizeof(*evt), GFP_KERNEL);

			if (!evt)

				break;

			evt->dwc	= dwc;

			evt->length	= DWC3_EVENT_BUFFERS_SIZE;

			evt->buf	= dma_alloc_coherent(dwc->dev,

						DWC3_EVENT_BUFFERS_SIZE,

						&evt->dma, GFP_KERNEL);

			if (!evt->buf) {

				dev_err(dwc->dev,

					"can't allocate gsi_evt_buf(%d)\n", i);

				break;

			}

			mdwc->gsi_ev_buff[i] = evt;

		}

		break;

	case DWC3_GSI_EVT_BUF_SETUP:

		dev_dbg(mdwc->dev, "DWC3_GSI_EVT_BUF_SETUP\n");

		for (i = 0; i < mdwc->num_gsi_event_buffers; i++) {

			evt = mdwc->gsi_ev_buff[i];

			dev_dbg(mdwc->dev, "Evt buf %p dma %08llx length %d\n",

				evt->buf, (unsigned long long) evt->dma,

				evt->length);

			memset(evt->buf, 0, evt->length);

			evt->lpos = 0;

			/*

			 * Primary event buffer is programmed with registers

			 * DWC3_GEVNT*(0). Hence use DWC3_GEVNT*(i+1) to

			 * program USB GSI related event buffer with DWC3

			 * controller.

			 */

			dwc3_writel(dwc->regs, DWC3_GEVNTADRLO((i+1)),

				lower_32_bits(evt->dma));

			dwc3_writel(dwc->regs, DWC3_GEVNTADRHI((i+1)),

				DWC3_GEVNTADRHI_EVNTADRHI_GSI_EN(

				DWC3_GEVENT_TYPE_GSI) |

				DWC3_GEVNTADRHI_EVNTADRHI_GSI_IDX((i+1)));

			dwc3_writel(dwc->regs, DWC3_GEVNTSIZ((i+1)),

				DWC3_GEVNTCOUNT_EVNTINTRPTMASK |

				((evt->length) & 0xffff));

			dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT((i+1)), 0);

		}

		break;

	case DWC3_GSI_EVT_BUF_CLEANUP:

		dev_dbg(mdwc->dev, "DWC3_GSI_EVT_BUF_CLEANUP\n");

		for (i = 0; i < mdwc->num_gsi_event_buffers; i++) {

			evt = mdwc->gsi_ev_buff[i];

			evt->lpos = 0;

			/*

			 * Primary event buffer is programmed with registers

			 * DWC3_GEVNT*(0). Hence use DWC3_GEVNT*(i+1) to

			 * program USB GSI related event buffer with DWC3

			 * controller.

			 */

			dwc3_writel(dwc->regs, DWC3_GEVNTADRLO((i+1)), 0);

			dwc3_writel(dwc->regs, DWC3_GEVNTADRHI((i+1)), 0);

			dwc3_writel(dwc->regs, DWC3_GEVNTSIZ((i+1)),

					DWC3_GEVNTSIZ_INTMASK |

					DWC3_GEVNTSIZ_SIZE((i+1)));

			dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT((i+1)), 0);

		}

		break;

	case DWC3_GSI_EVT_BUF_FREE:

		dev_dbg(mdwc->dev, "DWC3_GSI_EVT_BUF_FREE\n");

		for (i = 0; i < mdwc->num_gsi_event_buffers; i++) {

			evt = mdwc->gsi_ev_buff[i];

			if (evt)

				dma_free_coherent(dwc->dev, evt->length,

							evt->buf, evt->dma);

		}

		break;

	default:

		dev_dbg(mdwc->dev, "unknown dwc3 event\n");

		break;
@@ -2878,6 +2971,9 @@ static int dwc3_msm_probe(struct platform_device *pdev) 
	if (cpu_to_affin)

		register_cpu_notifier(&mdwc->dwc3_cpu_notifier);



	ret = of_property_read_u32(node, "qcom,num-gsi-evt-buffs",

				&mdwc->num_gsi_event_buffers);



	/*

	 * Clocks and regulators will not be turned on until the first time

	 * runtime PM resume is called. This is to allow for booting up with