From patchwork Tue Mar 28 16:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kurapati X-Patchwork-Id: 76193 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2352966vqo; Tue, 28 Mar 2023 09:36:04 -0700 (PDT) X-Google-Smtp-Source: AKy350a18ZOrPRTomAMFiqyRJOwdeBpg/Rw4pUgxU2gzGb2T1UO0FaWwRzPhag1azymE1u+qUCnG X-Received: by 2002:a17:907:1c09:b0:930:f953:9608 with SMTP id nc9-20020a1709071c0900b00930f9539608mr23479052ejc.0.1680021364474; Tue, 28 Mar 2023 09:36:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680021364; cv=none; d=google.com; s=arc-20160816; b=ghoWF9CLgwtDLjMcIWkor0oHYoSQ1SBmB5jAAo5iklc4RF1n8N8nSN4QBb34BXyqRS 4desWAcFC5tOrymNqlVjSYJiahcDbr9dtuelno7xDobQugEBdX98hO2r7VmxQXd2ZVzM oNVBNBQGMnhN6UvJ6OkqwZJFFbH8qLTjBiyJBVv+5QjGG3XGTYZMWqf/H3A5CDgSud4V 6AqO10Q0r+65d+lu5r1kPi2qhJQT+dL+8hbh9MlNLTKLKaHLU82xixhBdzOGMAKUskv4 MM58gQdJCx7j0OhXUBIvGjMhylvF8I5CvDyDrtH7Hzmvtvo+k96j2NTDkgmImP4mmiCo x63Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QKhL0KzrR4b6znOdJrnhGJP/JXQIAdpm6o5hO8iT3zo=; b=hQnJ6+jABnByMWnuMPGk5Qc9I9u7QOrtJuURf68AZ3OoUf2+bfX7isukxYYtSI2NSF 19S2Mcs7MTG1nGgVW+UADs0yDTx5SLzo6F3fYjB+TqI9LhCvl2+Vlbp9TqSDM2RK0EKn 4Gq8q2e7gQNR27nZNNxX9UIUcLPtUxg0vbPmAfNfxFvYauN6tCmcjDkaukxM4qRuzWIT W6HAar0Us/xqwNauEVhBf3PSLfXZk4li1cjhvfGyl23Lzw0wyMDL9/Bk+8PmIknjIvNY YRZkoIkMuYNB+MJTfvhp74U6e783ZiifBldy7vrOcG/fL+yEqiQKsrf+a+r5Ph+OcIPP ETkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=f5exfEoa; 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=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt36-20020a1709072da400b0093defbd6292si13221327ejc.1049.2023.03.28.09.35.41; Tue, 28 Mar 2023 09:36:04 -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=@quicinc.com header.s=qcppdkim1 header.b=f5exfEoa; 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=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233122AbjC1QJP (ORCPT + 99 others); Tue, 28 Mar 2023 12:09:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232987AbjC1QJF (ORCPT ); Tue, 28 Mar 2023 12:09:05 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1A49DFF3C; Tue, 28 Mar 2023 09:08:53 -0700 (PDT) Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32SDUSdG029866; Tue, 28 Mar 2023 16:08:16 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=qcppdkim1; bh=QKhL0KzrR4b6znOdJrnhGJP/JXQIAdpm6o5hO8iT3zo=; b=f5exfEoamxF6isProRqyoHRbL59Rd/PXrWEdT87yK9DIhAqhAPwiv77VGg2pnJL0DZ4Y wPzr1KTObta1Lcvm7cbsomnALQ0dUrDaJvgjpvrIxvmEY+ffQGAS5CYl9wPYkR6LMC8l 9PScKFswyjWIByMMA15FMF4upFseRVTXso+7ch0lAjfyafonLSGx/MThZB4SNpQSCoxJ 9Edri0bRSPfbbukc/CHVIfFXcDfWdOdNXjzBXHVA2JMo723MB8kwPUKH8pgYHc5HB8IP wxW7Gye7VVl1iTPSduGs8/MX7vC0dvLdMO4tlK/d8d03dZUXiruhoPgrhlJ08vFLaBfl sQ== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3pk5774nu2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Mar 2023 16:08:15 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 32SG8EJb012255 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 28 Mar 2023 16:08:14 GMT Received: from hu-kriskura-hyd.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Tue, 28 Mar 2023 09:08:10 -0700 From: Krishna Kurapati To: Thinh Nguyen , Greg Kroah-Hartman , Alan Stern , "Geert Uytterhoeven" , Colin Ian King , Jiantao Zhang , "Rafael J . Wysocki" CC: , , , , , , Krishna Kurapati Subject: [PATCH v2 1/2] usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens Date: Tue, 28 Mar 2023 21:37:55 +0530 Message-ID: <20230328160756.30520-2-quic_kriskura@quicinc.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230328160756.30520-1-quic_kriskura@quicinc.com> References: <20230328160756.30520-1-quic_kriskura@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: AoVszABDzWQTIz1CwF3bS0QWeQDBeEov X-Proofpoint-ORIG-GUID: AoVszABDzWQTIz1CwF3bS0QWeQDBeEov X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-28_02,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 mlxscore=0 suspectscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 adultscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 spamscore=0 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2303200000 definitions=main-2303280126 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761630082184775855?= X-GMAIL-MSGID: =?utf-8?q?1761630082184775855?= If the core soft reset timeout happens, avoid setting up event buffers and starting gadget as the writes to these registers may not reflect when in reset and setting the run stop bit can lead the controller to access wrong event buffer address resulting in a crash. Signed-off-by: Krishna Kurapati Acked-by: Thinh Nguyen --- drivers/usb/dwc3/gadget.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 3c63fa97a680..f0472801d9a5 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2620,13 +2620,16 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) * device-initiated disconnect requires a core soft reset * (DCTL.CSftRst) before enabling the run/stop bit. */ - dwc3_core_soft_reset(dwc); + ret = dwc3_core_soft_reset(dwc); + if (ret) + goto done; dwc3_event_buffers_setup(dwc); __dwc3_gadget_start(dwc); ret = dwc3_gadget_run_stop(dwc, true, false); } +done: pm_runtime_put(dwc->dev); return ret;