Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2903793iob; Fri, 6 May 2022 12:58:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+kKBcfQB+IrHyoYBjRKtGSoA8h7FOfpA2Vbw4dXa5cBJP2Of1B5S/EysBnPxzrD3cvM1q X-Received: by 2002:a17:902:c952:b0:15e:9e3d:8e16 with SMTP id i18-20020a170902c95200b0015e9e3d8e16mr5454792pla.51.1651867082676; Fri, 06 May 2022 12:58:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651867082; cv=none; d=google.com; s=arc-20160816; b=bUpX6DkkPX3YfZnKK4z0XQCaRQSJFiLYU6VS95omNKMZL71S3HBkOCyQ8TR+fqbBmh RqxmD3bdrI9ayNDlnlh50zOWGEsC/1wvzDRSEX8YcDB1Us4Sh6PQHYaIXLcX95aw+TZu yGNOtD6b2Dg02LT1EFPhJbKrYZ/bfox7MwFki4AZ3q9kWU0qkvBLhERtYCKD87nPiqSz xn89oY8F6foHtYVhRUMOMnsB0S6B+XSiai5r8TZjcUwnK/R9kdNstu7kZHi4m5gbtDdG tIGy0WfJFnBiPU9G/DHDAuYyDzzHCqoaIF/TtJd3b2JJuDamVRJE6RiG18cBgYeTc/yj Pl3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sCrQoW86ZfOXsfofZBFWz7fbO3R0PdA2KxzL64VuBXs=; b=pi47RtMsOWye51qt5CHsU439plFmXCBi96a519lQSB0fI+Wswt8zjzo5ySHz7bcGY0 pngcRlWk/baEVUbAC5wtX9iLaC/gBRB+V5VcGPGgJtSoTf6ckMIEVw3cgizzWPD00eJ0 uDTY8s+/NagJiBPDqEiYRkTiRMjFlz0bis2/U5fLgDmc4IzcUWGNJt1Es75+IxwqKzsJ XMNVpJZ/ptOHK+KP2que0H8PptjjQYiyModkYrPKw12cvIFroANRy6H2971SzgKst+hO VRYdnq2eo8s4cIf4DcLDvBKy4DJZc+is70HFPpfbawpGiTFo3Rq21abZaNjOAA60J5iL CJWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=H1uNbwiM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id on3-20020a17090b1d0300b001bd14e030adsi6540517pjb.133.2022.05.06.12.57.47; Fri, 06 May 2022 12:58:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=H1uNbwiM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358651AbiEDRiz (ORCPT + 99 others); Wed, 4 May 2022 13:38:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356835AbiEDRJp (ORCPT ); Wed, 4 May 2022 13:09:45 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6845C39B9F; Wed, 4 May 2022 09:55:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DDC80617D5; Wed, 4 May 2022 16:55:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 35FF0C385AA; Wed, 4 May 2022 16:55:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683353; bh=C4EKP94MvTGCniLFfvtIL0jrQ+e0SnOl2t7SXMLH+m0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H1uNbwiMuUNt9e8zA1shUUoEA01FF9rTNNjfLLoXT57v8DFeNs13cg/i4W+29vSIH cyW7J6TQMyXmaixIx3G7nsTMzL72TKBD3h8YQyR4CJeYClkTDokt4YSerRp5JaTF7u tNEy76rfHUOydUgWjpiJPLFotvGABZRVo7Wchdt4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thinh Nguyen Subject: [PATCH 5.17 026/225] usb: dwc3: core: Only handle soft-reset in DCTL Date: Wed, 4 May 2022 18:44:24 +0200 Message-Id: <20220504153112.653432169@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Thinh Nguyen commit f4fd84ae0765a80494b28c43b756a95100351a94 upstream. Make sure not to set run_stop bit or link state change request while initiating soft-reset. Register read-modify-write operation may unintentionally start the controller before the initialization completes with its previous DCTL value, which can cause initialization failure. Fixes: f59dcab17629 ("usb: dwc3: core: improve reset sequence") Cc: Signed-off-by: Thinh Nguyen Link: https://lore.kernel.org/r/6aecbd78328f102003d40ccf18ceeebd411d3703.1650594792.git.Thinh.Nguyen@synopsys.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/dwc3/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -276,7 +276,8 @@ static int dwc3_core_soft_reset(struct d reg = dwc3_readl(dwc->regs, DWC3_DCTL); reg |= DWC3_DCTL_CSFTRST; - dwc3_writel(dwc->regs, DWC3_DCTL, reg); + reg &= ~DWC3_DCTL_RUN_STOP; + dwc3_gadget_dctl_write_safe(dwc, reg); /* * For DWC_usb31 controller 1.90a and later, the DCTL.CSFRST bit