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

Commit 286f4af0 authored by Udipto Goswami's avatar Udipto Goswami Committed by Gerrit - the friendly Code Review server
Browse files

Revert "usb: dwc3: Add support of disable L1 in HS mode" 



This reverts commit c3de8d21 ("usb: dwc3: Add support
of disable L1 in HS mode") since the patch had implemented
the functionality by changing the bcdUSB to 2.0.
Eventhough it solves the problem, this results in compliance
failures.
Fix this by reverting the implementation. This will allow
the compliance to detect the DUT as L1 supported device.

Change-Id: I30894618584ebedf697dd98e0c94a42c961bc49d
Signed-off-by: default avatarUdipto Goswami <ugoswami@codeaurora.org>
parent 1ca91eb8

drivers/usb/dwc3/core.c

+0 −2
Original line number Diff line number Diff line
@@ -1485,8 +1485,6 @@ static void dwc3_get_properties(struct dwc3 *dwc) 
				"snps,dis-tx-ipgap-linecheck-quirk");

	dwc->parkmode_disable_ss_quirk = device_property_read_bool(dev,

				"snps,parkmode-disable-ss-quirk");

	dwc->usb2_l1_disable = device_property_read_bool(dev,

				"snps,usb2-l1-disable");



	dwc->tx_de_emphasis_quirk = device_property_read_bool(dev,

				"snps,tx_de_emphasis_quirk");

drivers/usb/dwc3/core.h

+0 −1
Original line number Diff line number Diff line
@@ -1363,7 +1363,6 @@ struct dwc3 { 
	unsigned		tx_de_emphasis:2;

	unsigned		err_evt_seen:1;

	unsigned		enable_bus_suspend:1;

	unsigned		usb2_l1_disable:1;



	atomic_t		in_lpm;

	bool			b_suspend;

drivers/usb/dwc3/gadget.c

+1 −1
Original line number Diff line number Diff line
@@ -4369,7 +4369,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) 
	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.sg_supported	= true;

	dwc->gadget.name		= "dwc3-gadget";

	dwc->gadget.lpm_capable		= !dwc->usb2_l1_disable;

	dwc->gadget.lpm_capable		= true;



	/*

	 * FIXME We might be setting max_speed to <SUPER, however versions

drivers/usb/gadget/composite.c

+1 −2
Original line number Diff line number Diff line
@@ -1726,12 +1726,11 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				count_configs(cdev, USB_DT_DEVICE);

			cdev->desc.bMaxPacketSize0 =

				cdev->gadget->ep0->maxpacket;

				cdev->desc.bcdUSB = cpu_to_le16(0x0200);

			if (gadget_is_superspeed(gadget)) {

				if (gadget->speed >= USB_SPEED_SUPER) {

					cdev->desc.bcdUSB = cpu_to_le16(0x0320);

					cdev->desc.bMaxPacketSize0 = 9;

				} else if (gadget->lpm_capable) {

				} else {

					cdev->desc.bcdUSB = cpu_to_le16(0x0210);

				}

			} else {