Message ID | 1690880632-12588-1-git-send-email-quic_prashk@quicinc.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2580543vqg; Tue, 1 Aug 2023 03:47:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGDtvWAfv5lKpLIdONrPI5kRaqWADYQ6m6vW5fWn+0pNEL7s/fFdflRC5mYbkIq2R3jEvvb X-Received: by 2002:a05:6512:214a:b0:4f8:631b:bf77 with SMTP id s10-20020a056512214a00b004f8631bbf77mr1894003lfr.22.1690886855584; Tue, 01 Aug 2023 03:47:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690886855; cv=none; d=google.com; s=arc-20160816; b=XJ5AKK2LmMJwzSKk9n60xPmc3ZMyULRCQu/GHOMrtFiZ523tzDqP0hoREoWEr/A2mR nb5RP/RN1V+6F2TnE5Gd/i1W379Cuq4QNC05OnrlKVun5PrddxIiYyPFzpx25YQ4j9Jn B+teiGeC0dIDkqmP+PdThZ11StSqSAupZ/pselK5VpUYikYwQ/ykf7QEmnhyHMzx76Mx iqB8t18ehdItVxS7o7lkJW8m6iXREPrf+bi+kbJYlcYxoXrCD/9K43L9FX6DVXoGqkjQ OtVFksIVmC1iVv0xB7SQ5CNAk3cRZQGfZREGC4KpYENuHULsrWvlIGxOQE7cSh/277s2 tW/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:date:subject:cc:to:from :dkim-signature; bh=KHfLUQGL6faL0F/nqq7dox/0afIBoQuFJvhxwvUo7Oo=; fh=UvOD2PgI+e7dUwSBnKfoB0iyj8Pc9vs8k+4skb1UoUY=; b=n4nJRePt5gx3c9xsB5A+HZYRpWIArpYmklo5ys3lpNGlf5atTC/mCDyDZjZHt4hfKl 4GnPxHSsZBga8VDp1aYhZ8qLcHjlXrtT6xFNE/J1CsxyPrYgchF97Ek5rBZxDzCvazlJ mufkpt8Amzs8ThNrPj7SKtfR83AU2z5LuAcFmskaa+3vfbFHTEzC9JMt+5CJc4D3h5/f iVXXd+vgwQdey7+80pbFWLxKV26pUQg8G9mDPqZcN/NAwo8HaU9dmzhA0v+t+oektvCy lXuJr0rOHOOuuGeLdJm5/cZeeZj3wS5d8ZrhGSQ/buGTFz9imqb7+ssvzmlZHLpV6BRX 6k6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=diTWugTb; 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 l16-20020a056402029000b0051de4c29577si4130426edv.184.2023.08.01.03.47.11; Tue, 01 Aug 2023 03:47:35 -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=diTWugTb; 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 S232732AbjHAJTs (ORCPT <rfc822;maxi.paulin@gmail.com> + 99 others); Tue, 1 Aug 2023 05:19:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232842AbjHAJTP (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 1 Aug 2023 05:19:15 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1ABA198C; Tue, 1 Aug 2023 02:17:30 -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 37189ds0009279; Tue, 1 Aug 2023 09:04:11 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=qcppdkim1; bh=KHfLUQGL6faL0F/nqq7dox/0afIBoQuFJvhxwvUo7Oo=; b=diTWugTb2yTf4hkW+pNfpS9azQ74t3yZV0fCwa3NekRR9yV+aas5eXl5iYZrkTSioqc4 t0EKxl/+b82tSbd9zy3q6RwXp0BaVDQwMzIGf0VCiwozB79wKmta5cUZaW6PFLco2eCV p67zCtn4LeG+DDrAgnOax/7Y6+EQQpc0uX9SuJo3yXQr+IQeCCzoTZG0QlJPROz6uHDG /4a1HMTwEfG/aK0rAECPAZ9G3H9EuscWk48Hx0XIKoD0+0DBGc+Zfj908sKZZ6pNuRD/ tqC4GfIUdt4rLb+R+OrpgvKbLOLQ+lfNss7uCsgfrfdRlAEz3LHyQD245Yu7ImMJfqai cg== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s6ckfjr6u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Aug 2023 09:04:11 +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 3719400G019389 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 1 Aug 2023 09:04:00 GMT Received: from hu-prashk-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.1118.30; Tue, 1 Aug 2023 02:03:57 -0700 From: Prashanth K <quic_prashk@quicinc.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>, Heikki Krogerus <heikki.krogerus@linux.intel.com>, Matthias Brugger <matthias.bgg@gmail.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Prashanth K <quic_prashk@quicinc.com>, "# 5 . 4" <stable@vger.kernel.org> Subject: [PATCH v3] usb: common: usb-conn-gpio: Prevent bailing out if initial role is none Date: Tue, 1 Aug 2023 14:33:52 +0530 Message-ID: <1690880632-12588-1-git-send-email-quic_prashk@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) 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: WOAdOjPmQ1559TjJLMp9b0ORUc9TQPci X-Proofpoint-ORIG-GUID: WOAdOjPmQ1559TjJLMp9b0ORUc9TQPci X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-01_03,2023-07-31_02,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 bulkscore=0 mlxlogscore=843 spamscore=0 clxscore=1011 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308010082 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773023375230836899 X-GMAIL-MSGID: 1773023375230836899 |
Series |
[v3] usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
|
|
Commit Message
Prashanth K
Aug. 1, 2023, 9:03 a.m. UTC
Currently if we bootup a device without cable connected, then
usb-conn-gpio won't call set_role() because last_role is same
as current role. This happens since last_role gets initialised
to zero during the probe.
To avoid this, add a new flag initial_detection into struct
usb_conn_info, which prevents bailing out during initial
detection.
Cc: <stable@vger.kernel.org> # 5.4
Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver")
Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
---
v3: Added cc tag as suggested by the patch-bot.
v2: Updated the bool name to initial_detection.
drivers/usb/common/usb-conn-gpio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Comments
Il 01/08/23 11:03, Prashanth K ha scritto: > Currently if we bootup a device without cable connected, then > usb-conn-gpio won't call set_role() because last_role is same > as current role. This happens since last_role gets initialised > to zero during the probe. > > To avoid this, add a new flag initial_detection into struct > usb_conn_info, which prevents bailing out during initial > detection. > > Cc: <stable@vger.kernel.org> # 5.4 > Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver") > Signed-off-by: Prashanth K <quic_prashk@quicinc.com> Just noticed that there was a v3, sent the T-b to the v2 erroneously, so: MediaTek platforms Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
On 01-08-23 04:31 pm, AngeloGioacchino Del Regno wrote: > Il 01/08/23 11:03, Prashanth K ha scritto: >> Currently if we bootup a device without cable connected, then >> usb-conn-gpio won't call set_role() because last_role is same >> as current role. This happens since last_role gets initialised >> to zero during the probe. >> >> To avoid this, add a new flag initial_detection into struct >> usb_conn_info, which prevents bailing out during initial >> detection. >> >> Cc: <stable@vger.kernel.org> # 5.4 >> Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection >> detection driver") >> Signed-off-by: Prashanth K <quic_prashk@quicinc.com> > > Just noticed that there was a v3, sent the T-b to the v2 erroneously, so: > > MediaTek platforms > > Tested-by: AngeloGioacchino Del Regno > <angelogioacchino.delregno@collabora.com> > > Thanks AgneloGioacchino for testing. Regards Prashanth K
On Tue, Aug 01, 2023 at 02:33:52PM +0530, Prashanth K wrote: > Currently if we bootup a device without cable connected, then > usb-conn-gpio won't call set_role() because last_role is same > as current role. This happens since last_role gets initialised > to zero during the probe. > > To avoid this, add a new flag initial_detection into struct > usb_conn_info, which prevents bailing out during initial > detection. > > Cc: <stable@vger.kernel.org> # 5.4 > Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver") > Signed-off-by: Prashanth K <quic_prashk@quicinc.com> FWIW: Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > v3: Added cc tag as suggested by the patch-bot. > v2: Updated the bool name to initial_detection. > > drivers/usb/common/usb-conn-gpio.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c > index 766005d..501e8bc9 100644 > --- a/drivers/usb/common/usb-conn-gpio.c > +++ b/drivers/usb/common/usb-conn-gpio.c > @@ -42,6 +42,7 @@ struct usb_conn_info { > > struct power_supply_desc desc; > struct power_supply *charger; > + bool initial_detection; > }; > > /* > @@ -86,11 +87,13 @@ static void usb_conn_detect_cable(struct work_struct *work) > dev_dbg(info->dev, "role %s -> %s, gpios: id %d, vbus %d\n", > usb_role_string(info->last_role), usb_role_string(role), id, vbus); > > - if (info->last_role == role) { > + if (!info->initial_detection && info->last_role == role) { > dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role)); > return; > } > > + info->initial_detection = false; > + > if (info->last_role == USB_ROLE_HOST && info->vbus) > regulator_disable(info->vbus); > > @@ -258,6 +261,7 @@ static int usb_conn_probe(struct platform_device *pdev) > device_set_wakeup_capable(&pdev->dev, true); > > /* Perform initial detection */ > + info->initial_detection = true; > usb_conn_queue_dwork(info, 0); > > return 0; > -- > 2.7.4 thanks,
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 766005d..501e8bc9 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -42,6 +42,7 @@ struct usb_conn_info { struct power_supply_desc desc; struct power_supply *charger; + bool initial_detection; }; /* @@ -86,11 +87,13 @@ static void usb_conn_detect_cable(struct work_struct *work) dev_dbg(info->dev, "role %s -> %s, gpios: id %d, vbus %d\n", usb_role_string(info->last_role), usb_role_string(role), id, vbus); - if (info->last_role == role) { + if (!info->initial_detection && info->last_role == role) { dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role)); return; } + info->initial_detection = false; + if (info->last_role == USB_ROLE_HOST && info->vbus) regulator_disable(info->vbus); @@ -258,6 +261,7 @@ static int usb_conn_probe(struct platform_device *pdev) device_set_wakeup_capable(&pdev->dev, true); /* Perform initial detection */ + info->initial_detection = true; usb_conn_queue_dwork(info, 0); return 0;