linux-kernel - [RFT PATCH 2/2] Revert "usb: dwc2: Fix probe problem on bcm2835"

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri,  4 Mar 2016 10:23:06 -0800
From:	Douglas Anderson <dianders@...omium.org>
To:	johnyoun@...opsys.com, balbi@...nel.org,
	Heiko Stuebner <heiko@...ech.de>
Cc:	linux@...ewoehner.de, caesar.upstream@...il.com,
	huangtao@...k-chips.com, repk@...plefau.lt, stefan.wahren@...e.com,
	Julius Werner <jwerner@...omium.org>,
	Douglas Anderson <dianders@...omium.org>,
	gregkh@...uxfoundation.org, linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: [RFT PATCH 2/2] Revert "usb: dwc2: Fix probe problem on bcm2835"

This reverts commit 192cb07f7928 ("usb: dwc2: Fix probe problem on
bcm2835") now that we've found the root cause.  See the change
titled ("usb: dwc2: Add a 10 ms delay to dwc2_core_reset()").

Signed-off-by: Douglas Anderson <dianders@...omium.org>
---
 drivers/usb/dwc2/core.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/dwc2/core.c b/drivers/usb/dwc2/core.c
index 8710b2d3e770..7c4a6cf4c73a 100644
--- a/drivers/usb/dwc2/core.c
+++ b/drivers/usb/dwc2/core.c
@@ -353,6 +353,12 @@ static bool dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host)
 	set = host ? GUSBCFG_FORCEHOSTMODE : GUSBCFG_FORCEDEVMODE;
 	clear = host ? GUSBCFG_FORCEDEVMODE : GUSBCFG_FORCEHOSTMODE;
 
+	/*
+	* If the force mode bit is already set, don't set it.
+	*/
+	if ((gusbcfg & set) && !(gusbcfg & clear))
+		return false;
+
 	gusbcfg &= ~clear;
 	gusbcfg |= set;
 	dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG);
-- 
2.7.0.rc3.207.g0ac5344