Message ID | 1688638258-23806-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:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2447347vqx; Thu, 6 Jul 2023 03:13:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlE7stQ/mOS3oWtoKVgyzkoa5N0hM9LRkSkzt8aIAbArIwJcVjnZ0/3wR+lKaDJ5sCl/lfwK X-Received: by 2002:a05:6a20:7489:b0:12b:b9c0:aa61 with SMTP id p9-20020a056a20748900b0012bb9c0aa61mr1115896pzd.29.1688638390845; Thu, 06 Jul 2023 03:13:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688638390; cv=none; d=google.com; s=arc-20160816; b=kWo9JzrHiUw0XcNzYFh3v/Imapxe+hveC8veKQduKa75YduV6T0+gZJzezflrquFWB HzTLhnEsTonSdPeb3wtC3FO2zfXkDZ+VsTf3O7AizbCc/jip8bbmmStmg7SKTjS7DE0m KJPLmUL5SnwCF5jiZd93QtOJ+6V79MWARyxUPJ4QXbdsm7z6GFsnKRTH/VxvI9VCHWwY mM1+ow6OW4X70NzJAfSoKxbRXBR2kjtiaeAZFg8sKkuwpN++4YzPzPUciw+NuUjcA0/c RhkWMjnNvfMZhVf/0bIs0p1dhqPvwQjDqhIbDyLkmtCF+/KrKYMQ4wimEnbRuJKbK33P DdnQ== 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=n4VkmJrNOECDNMdNg9VUhKussPlO+/asOl5UCIflfyw=; fh=gOApOFl03anzf1WwT5TjZlmVdeT4QeQcNY4FzSmdxBI=; b=oCYxJUqROceLgMVlSNlaRofAX37+V4kdveDv+olGGZ3jA4q6rd0vJ9d/1ipRgFeXRe 4VDycCd2QGHZQoU6KP7jBOL1j5nvBB6e3Tf92KQjHp8yfYCW0Qd/ZmRClUe9lFp/ZJ/k sVQt8oEmTBX3MS/wgkNb4NGTTIYCU22RJeZk/Ob4WvFeVDq+nuo+b7kxYuxgb2I4ewgZ fM6cJPOgbO01Bk6FRhVEk2y2KO2Eke1GOOLX03tHsaH95UpUIRLe4Y9GUNRAwCMCzED2 flHH7q68RtN/BpoIfiXgGJgKVOtdz5E88F9KRGZf5LOLTU/4oB81gvkgdIeOJxeobi6n cvjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=WstYDncL; 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 j11-20020a170902da8b00b001b8c6890595si535302plx.310.2023.07.06.03.12.55; Thu, 06 Jul 2023 03:13:10 -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=WstYDncL; 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 S232319AbjGFKLt (ORCPT <rfc822;hadasmailinglist@gmail.com> + 99 others); Thu, 6 Jul 2023 06:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232252AbjGFKLk (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 6 Jul 2023 06:11:40 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F6A91FC7; Thu, 6 Jul 2023 03:11:29 -0700 (PDT) Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3669RrJJ015256; Thu, 6 Jul 2023 10:11:23 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=n4VkmJrNOECDNMdNg9VUhKussPlO+/asOl5UCIflfyw=; b=WstYDncLiD7zjlkVoZIyFtsYVfQ4FUospvVkfjZgbYoP9lt6rBOcBTORAZ9/1b3ZhWuu ymxJiKo5pbJiePW80SLxEcJ7tprSU3lSstJA9Im6sOX8Nu4ou4UtZlBObElGwB+q3BaJ F1obzAB2YdW10bkCHdd03PKYHGWg02MdG8cLHTB7VlztRJ81wmkU5VcEi4LR4QyApAiH QMvRF0ni4ZU/W/GvPLvxp125rymmY5L+R0tycaPpUyNY7xuP4V5jHNoFfyjlNOtdlpkV FdYDyT2xsJM7SPKC8zKRNutRY7HhwWONiUtD3mgKihhV6LXImLA/Nr/gxKDdmT8JxDQD rg== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rnfm4h91k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 06 Jul 2023 10:11:23 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 366ABMLo006904 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 6 Jul 2023 10:11:22 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; Thu, 6 Jul 2023 03:11:20 -0700 From: Prashanth K <quic_prashk@quicinc.com> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "AngeloGioacchino Del Regno" <angelogioacchino.delregno@collabora.com>, Heikki Krogerus <heikki.krogerus@linux.intel.com> CC: Matthias Brugger <matthias.bgg@gmail.com>, <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>, Prashanth K <quic_prashk@quicinc.com> Subject: usb: common: usb-conn-gpio: Prevent bailing out if initial role is none Date: Thu, 6 Jul 2023 15:40:58 +0530 Message-ID: <1688638258-23806-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: Oq571yOh8-9EYEX_VOuYNoALREUPU2Nr X-Proofpoint-ORIG-GUID: Oq571yOh8-9EYEX_VOuYNoALREUPU2Nr 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-07-06_06,2023-07-06_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 adultscore=0 mlxlogscore=880 mlxscore=0 malwarescore=0 suspectscore=0 bulkscore=0 clxscore=1011 impostorscore=0 priorityscore=1501 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2307060090 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770665689618054733?= X-GMAIL-MSGID: =?utf-8?q?1770665689618054733?= |
Series |
usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
|
|
Commit Message
Prashanth K
July 6, 2023, 10:10 a.m. UTC
Currently if we bootup a device without cable connected, then
usb-conn-gpio won't call set_role() since last_role is same as
current role. This happens because during probe last_role gets
initialised to zero.
To avoid this, add a new flag initial_det in usb_conn_info,
which is used to prevent bailing out during init detection.
Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver")
Signed-off-by: Prashanth K <quic_prashk@quicinc.com>
---
drivers/usb/common/usb-conn-gpio.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Comments
On Thu, Jul 06, 2023 at 03:40:58PM +0530, Prashanth K wrote: > Currently if we bootup a device without cable connected, then > usb-conn-gpio won't call set_role() since last_role is same as > current role. This happens because during probe last_role gets > initialised to zero. > > To avoid this, add a new flag initial_det in usb_conn_info, > which is used to prevent bailing out during init detection. > > Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver") > Signed-off-by: Prashanth K <quic_prashk@quicinc.com> > --- > 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..46290ff 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_det; What does "initial_det" mean? Please document this better. > }; > > /* > @@ -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_det && info->last_role == role) { > dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role)); > return; > } > > + info->initial_det = 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_det = true; What is protecting this from changing right after you test for it? thanks, greg k-h
On 25-07-23 09:04 pm, Greg Kroah-Hartman wrote: > On Thu, Jul 06, 2023 at 03:40:58PM +0530, Prashanth K wrote: >> Currently if we bootup a device without cable connected, then >> usb-conn-gpio won't call set_role() since last_role is same as >> current role. This happens because during probe last_role gets >> initialised to zero. >> >> To avoid this, add a new flag initial_det in usb_conn_info, >> which is used to prevent bailing out during init detection. >> >> Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver") >> Signed-off-by: Prashanth K <quic_prashk@quicinc.com> >> --- >> 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..46290ff 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_det; > > What does "initial_det" mean? Please document this better. > Yea sure, will update that. It was supposed to mean 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_det && info->last_role == role) { >> dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role)); >> return; >> } >> >> + info->initial_det = 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_det = true; > > What is protecting this from changing right after you test for it? > > thanks, > > greg k-h Hi Greg, this variable is only used/changed by usb_conn_detect_cable() which is called in next line. So the chance of it changing is none. Basically this initial_det flag points if its initial detection or not. If yes, then prevent bailing out in usb_conn_detect_cable(). Please let me know if your comment was regarding something else. Regards, Prashanth K
diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 766005d..46290ff 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_det; }; /* @@ -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_det && info->last_role == role) { dev_warn(info->dev, "repeated role: %s\n", usb_role_string(role)); return; } + info->initial_det = 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_det = true; usb_conn_queue_dwork(info, 0); return 0;