Merge "usb: dwc3: gadget: Let GSI ep ops allocate TRBs for GSI eps" (36177f93) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/dwc3/gadget.c

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2063,6 +2063,12 @@ static int dwc3_device_core_soft_reset(struct dwc3 *dwc)
	/* phy sync delay as per data book */		/* phy sync delay as per data book */
	msleep(50);		msleep(50);

			/*
			* Soft reset clears the block on the doorbell,
			* set it back to prevent unwanted writes to the doorbell.
			*/
			dwc3_notify_event(dwc, DWC3_CONTROLLER_NOTIFY_CLEAR_DB, 0);

	return 0;		return 0;
	}		}

	@@ -2227,6 +2233,9 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on)
	/* prevent pending bh to run later */		/* prevent pending bh to run later */
	flush_work(&dwc->bh_work);		flush_work(&dwc->bh_work);

			if (is_on)
			dwc3_device_core_soft_reset(dwc);

	spin_lock_irqsave(&dwc->lock, flags);		spin_lock_irqsave(&dwc->lock, flags);
	if (dwc->ep0state != EP0_SETUP_PHASE)		if (dwc->ep0state != EP0_SETUP_PHASE)
	dbg_event(0xFF, "EP0 is not in SETUP phase\n", dwc->ep0state);		dbg_event(0xFF, "EP0 is not in SETUP phase\n", dwc->ep0state);
	@@ -2645,7 +2654,6 @@ static const struct usb_gadget_ops dwc3_gadget_ops = {
	#define NUM_GSI_OUT_EPS 1		#define NUM_GSI_OUT_EPS 1
	#define NUM_GSI_IN_EPS 2		#define NUM_GSI_IN_EPS 2


	static int dwc3_gadget_init_control_endpoint(struct dwc3_ep *dep)		static int dwc3_gadget_init_control_endpoint(struct dwc3_ep *dep)
	{		{
	struct dwc3 *dwc = dep->dwc;		struct dwc3 *dwc = dep->dwc;
	@@ -2749,12 +2757,16 @@ static int dwc3_gadget_init_endpoints(struct dwc3 *dwc, u8 total)
	/* Reserve EPs at the end for GSI */		/* Reserve EPs at the end for GSI */
	if (!dep->direction && num >		if (!dep->direction && num >
	out_count - NUM_GSI_OUT_EPS - 1) {		out_count - NUM_GSI_OUT_EPS - 1) {
			/* Allocation of TRBs are handled by GSI EP ops. */
			dwc3_free_trb_pool(dep);
	idx = num - (out_count - NUM_GSI_OUT_EPS - 1);		idx = num - (out_count - NUM_GSI_OUT_EPS - 1);
	snprintf(dep->name, sizeof(dep->name), "gsi-epout%d",		snprintf(dep->name, sizeof(dep->name), "gsi-epout%d",
	idx);		idx);
	dep->gsi = true;		dep->gsi = true;
	} else if (dep->direction && num >		} else if (dep->direction && num >
	in_count - NUM_GSI_IN_EPS - 1) {		in_count - NUM_GSI_IN_EPS - 1) {
			/* Allocation of TRBs are handled by GSI EP ops. */
			dwc3_free_trb_pool(dep);
	idx = num - (in_count - NUM_GSI_IN_EPS - 1);		idx = num - (in_count - NUM_GSI_IN_EPS - 1);
	snprintf(dep->name, sizeof(dep->name), "gsi-epin%d",		snprintf(dep->name, sizeof(dep->name), "gsi-epin%d",
	idx);		idx);