From patchwork Tue Aug 1 06:01:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prashanth K X-Patchwork-Id: 129057 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2513052vqg; Tue, 1 Aug 2023 01:02:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlGF1ut33kpkiS0vESQ0xTK0ohy0Gdoxi5+DpEqFdfjO8mm3dv0dcysiqoFoi8KXdTZ2xQye X-Received: by 2002:a05:6a00:1401:b0:687:570:5011 with SMTP id l1-20020a056a00140100b0068705705011mr14419936pfu.24.1690876967570; Tue, 01 Aug 2023 01:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690876967; cv=none; d=google.com; s=arc-20160816; b=C6CuFe0jye9LPGBqj+FdxUle30+3Ud3eBGPPo9LB73wjF4szwOwO3d3xmzBcvTJ+f9 3F9TEL6M9BnfJh6/VBkCRRU1A1GZcOIyBmpwBVgojnsDiJ6YhVlmujk9AVeOM717VzxX 1cltloqIUVL7qDbVwcJhtEvtYkL1YyAg+rC5Y3C5SuNZXFU910mMo1TjJFuCS6gS9O/u KK6J136BRusNhFQxqhNZK0ITmNpnuQrGxsBUrw4TROG1X+fM1FFnItKYsegwCKHXReZH O9nO27fBDL04Nx0+983CxyOOXdJCDetoTaW5PZ8a7AXIXLjO7TJKJoahya2U+mBkyAAf KawQ== 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=rSy7dPqq1OG7Y6hBJX9jb9y8LyPyQfc/Of+5x7X6wfw=; fh=gOApOFl03anzf1WwT5TjZlmVdeT4QeQcNY4FzSmdxBI=; b=O32P+DV0kBJt/etdo+wSWRtgiQx+g7kaTW5qLFgKSYBTBD8ASkYKSuLRfZ00wLRGE+ PuRx124ZbfREVZOfsZ+PqqV6RdbjQ3x2eEybIjKGqWKwDpSbpV7fkbaOyHRa0ws8bnlq m7ugEoZEr57q1YXll1nzNp9ObJAJZ3n0b+lHclMZMRRNaaI6TdgDmrN+uyud/FJOrDb6 g/wHEXmsb9jwNioqjIwd2dDV9P6pQ26ZhOL1Yax+efOKCQiwiCwSM6EsX7ukowbDSzA1 /wSmpHFXH9/BDusBO6hJXwg34ZkqS/ATXM2+pxdMLGI9regReP2oIR+rPmImo/YXwHf+ jNlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=iBKwCs4c; 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 e193-20020a6369ca000000b0055b6a717367si8554204pgc.45.2023.08.01.01.02.23; Tue, 01 Aug 2023 01:02:47 -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=iBKwCs4c; 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 S231244AbjHAGCD (ORCPT + 99 others); Tue, 1 Aug 2023 02:02:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230096AbjHAGCB (ORCPT ); Tue, 1 Aug 2023 02:02:01 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5944E7D; Mon, 31 Jul 2023 23:01:59 -0700 (PDT) Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3715woir026178; Tue, 1 Aug 2023 06:01:54 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=rSy7dPqq1OG7Y6hBJX9jb9y8LyPyQfc/Of+5x7X6wfw=; b=iBKwCs4ccCspmHvyG8PFYisnizgHPHKUQNzSCmCWCVZwLc2YAErXMqB229vowCiCq/6H DLq/yKtTDq2KBEibSp4ieEP2iNN8zl2hV2BshfVkeMHVzm7HmpMs5rAt9zLWYxkJkU0/ n720ix46ErzmuhhmPhG0tpN32iJ/p8nL/oM43ro8IZTkaDtQq58GV+7MqvC0ojnluQAT GkrROlzCuTPxcfh63RsjaIAGGTrrDzrEyz0Z2rhWd0/xgpfEARMXO77sBdh0QjNMGwcK u7SH0ibWEN5aM8VgQmXoKcpZTIwvgrO/Jvmku++rANJBXbd1lyyCI068duM6wkDrp9N2 Ng== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3s6a502tpr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 01 Aug 2023 06:01:54 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 37161rZ0031148 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 1 Aug 2023 06:01:53 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; Mon, 31 Jul 2023 23:01:50 -0700 From: Prashanth K To: Greg Kroah-Hartman , "AngeloGioacchino Del Regno" , Heikki Krogerus CC: Matthias Brugger , , , Prashanth K Subject: [v2] usb: common: usb-conn-gpio: Prevent bailing out if initial role is none Date: Tue, 1 Aug 2023 11:31:35 +0530 Message-ID: <1690869695-32018-1-git-send-email-quic_prashk@quicinc.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 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: rL03t9C0u4CngsQgmCsE9uu27tZeobvl X-Proofpoint-ORIG-GUID: rL03t9C0u4CngsQgmCsE9uu27tZeobvl 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 adultscore=0 malwarescore=0 priorityscore=1501 phishscore=0 clxscore=1015 mlxscore=0 lowpriorityscore=0 impostorscore=0 bulkscore=0 suspectscore=0 mlxlogscore=851 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2306200000 definitions=main-2308010055 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773006989342783178 X-GMAIL-MSGID: 1773013007337569472 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_detection in the struct usb_conn_info, which prevents from bailing out during initial detection. Fixes: 4602f3bff266 ("usb: common: add USB GPIO based connection detection driver") Signed-off-by: Prashanth K Tested-by: AngeloGioacchino Del Regno --- 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;