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

Commit c342ad67 authored by Vijayavardhan Vennapusa's avatar Vijayavardhan Vennapusa Committed by Matt Wagantall
Browse files

USB: dwc3: Add support for fixing superspeed enumeration issue 



Setting SSPHY SUSP bit (bit 17) in GUSB3PIPECTL(0) register
might cause device enumerating at high speed mode instead of
superspeed mode on some platforms. Hence add workaround by
clearing the SSPHY SUSP bit during disconnect and setting it
after it is configured to fix this enumeration issue on those
platforms.

Also add support for disabling U1 and U2 low power modes  which
could also affect this enumeration issue.

CRs-Fixed: 637902
Change-Id: I8668ced09a88b77f37265ab15e89fa9e964bfbe9
Signed-off-by: default avatarVijayavardhan Vennapusa <vvreddy@codeaurora.org>
[jackp@codeaurora.org: only add u1/u2 disable bits]
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent 8d68dc56

Documentation/devicetree/bindings/usb/dwc3.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Optional properties: 
 - tx-fifo-resize: determines if the FIFO *has* to be reallocated.

 - snps,nominal-elastic-buffer: When set, the nominal elastic buffer setting

	is used. By default, the half-full setting is used.

 - snps,usb3-u1u2-disable: If present, disable u1u2 low power modes for DWC3 core controller in SS mode.

 - snps,bus-suspend-enable: If present then controller supports low power mode

	during bus suspend.
@@ -27,4 +28,5 @@ dwc3@4a030000 { 
	interrupts = <0 92 4>

	usb-phy = <&usb2_phy>, <&usb3,phy>;

	tx-fifo-resize;

	snps,usb3-u1u2-disable;

};

drivers/usb/dwc3/core.c

+2 −0
Original line number Diff line number Diff line
@@ -837,6 +837,8 @@ static int dwc3_probe(struct platform_device *pdev) 
		dwc->dr_mode = of_usb_get_dr_mode(node);

		dwc->nominal_elastic_buffer = of_property_read_bool(node,

				"snps,nominal-elastic-buffer");

		dwc->usb3_u1u2_disable = of_property_read_bool(node,

				"snps,usb3-u1u2-disable");

		dwc->enable_bus_suspend = of_property_read_bool(node,

						"snps,bus-suspend-enable");

	} else if (pdata) {

drivers/usb/dwc3/core.h

+2 −0
Original line number Diff line number Diff line
@@ -780,6 +780,7 @@ struct dwc3_scratchpad_array { 
 * @start_config_issued: true when StartConfig command has been issued

 * @three_stage_setup: set if we perform a three phase setup

 * @err_evt_seen: previous event in queue was erratic error

 * @usb3_u1u2_disable: if true, disable U1U2 low power modes in Superspeed mode.

 */

struct dwc3 {

	struct usb_ctrlrequest	*ctrl_req;
@@ -897,6 +898,7 @@ struct dwc3 { 


	unsigned		nominal_elastic_buffer:1;

	unsigned		err_evt_seen:1;

	unsigned		usb3_u1u2_disable:1;

	unsigned		enable_bus_suspend:1;



	struct dwc3_gadget_events	dbg_gadget_events;

drivers/usb/dwc3/ep0.c

+22 −7
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 * GNU General Public License for more details.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include <linux/spinlock.h>
@@ -36,6 +37,11 @@ 
#include "io.h"

#include "debug.h"





static bool enable_dwc3_u1u2;

module_param(enable_dwc3_u1u2, bool, S_IRUGO | S_IWUSR);

MODULE_PARM_DESC(enable_dwc3_u1u2, "Enable support for U1U2 low power modes");



static void __dwc3_ep0_do_control_status(struct dwc3 *dwc, struct dwc3_ep *dep);

static void __dwc3_ep0_do_control_data(struct dwc3 *dwc,

		struct dwc3_ep *dep, struct dwc3_request *req);
@@ -419,6 +425,9 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 
			if (dwc->speed != DWC3_DSTS_SUPERSPEED)

				return -EINVAL;



			if (dwc->usb3_u1u2_disable && !enable_dwc3_u1u2)

				return -EINVAL;



			reg = dwc3_readl(dwc->regs, DWC3_DCTL);

			if (set)

				reg |= DWC3_DCTL_INITU1ENA;
@@ -433,6 +442,9 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 
			if (dwc->speed != DWC3_DSTS_SUPERSPEED)

				return -EINVAL;



			if (dwc->usb3_u1u2_disable && !enable_dwc3_u1u2)

				return -EINVAL;



			reg = dwc3_readl(dwc->regs, DWC3_DCTL);

			if (set)

				reg |= DWC3_DCTL_INITU2ENA;
@@ -569,13 +581,16 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl) 
				usb_gadget_set_state(&dwc->gadget,

						USB_STATE_CONFIGURED);



			if (!dwc->usb3_u1u2_disable || enable_dwc3_u1u2) {

				/*

				 * Enable transition to U1/U2 state when

				 * nothing is pending from application.

				 */

				reg = dwc3_readl(dwc->regs, DWC3_DCTL);

			reg |= (DWC3_DCTL_ACCEPTU1ENA | DWC3_DCTL_ACCEPTU2ENA);

				reg |= (DWC3_DCTL_ACCEPTU1ENA |

							DWC3_DCTL_ACCEPTU2ENA);

				dwc3_writel(dwc->regs, DWC3_DCTL, reg);

			}



			dwc->resize_fifos = true;

			dwc3_trace(trace_dwc3_ep0, "resize FIFOs flag SET");