From patchwork Wed Dec 7 13:19:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 30836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp179404wrr; Wed, 7 Dec 2022 05:24:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf71Pk8p6PcrFOo10/6RGxufNclmmoUhu4JOtO+njRt0CkoBXxkebRq+U4a/EHmwdU7Bbg21 X-Received: by 2002:a62:5b43:0:b0:573:6cfc:2210 with SMTP id p64-20020a625b43000000b005736cfc2210mr77072390pfb.55.1670419449449; Wed, 07 Dec 2022 05:24:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670419449; cv=none; d=google.com; s=arc-20160816; b=cNnPrZA1z/c+uf/Asi+dtsyMPJ9R6XQ83A+csccPGfoU1uhACyICsWjesxwKZczBmu YPitGvDEvs+9uzWMxn7Rk2EyLkFqPhrMxUZfdOIICJFyHSG5wDHKULTrr7D/GCudPhaP R8bj/Zi904YUHQeRhMNVX/UhWnypSUEqkV7kg624GiXD9oUwQzZFfmyE768g6WzinGFO FBRteOiW1W2wIzOJCYU8DQWcvOKEJVfvXgOaHyTe8sI0mvltBpMB5BFBlj/qhXjAnmAp Rl0jN8Dumjq2BO9mBC7pfY9z//zRMFrUVf0kS4HlXSZbCspYO+aK8XF4U8ZpoTgjOLL1 HstQ== 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; bh=fEpJyXYjb7RCehQW0AtUqmPZPJpFFsq26KpTsoLKouY=; b=B/S5i1K8XxbNxQr1pvZVOcW/kcnBsMNmU/8/d91YJ11Hj70r27uMNhupHbR7ngjdZz UKhRrVxFA/RFDC5o/4exg/CWUP/kjlKZkuEzjMlbNXkJf2dPrLHysQSguhhDr+bfG1Kh xsDjbR2mCmSKupi368UeKSuZdfFXbd0AwkGjb7SshM0G+A1PIEp/KZAo6rVq46DNt3d6 yRcWOT2xb3jXC5lVSyHsVo22RMndZYBL9s/FJY2x5Qaa1E1ozTS1XUL/xHUMYNXK8CmT X1Qp1OQ0WQunldn1oOoI4nsJbOIRNZlXkO9+90ub6xy+nOEJot5rU335V68ayMLuOMFt UAUw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g6-20020a6544c6000000b0043adff6d43dsi20038812pgs.583.2022.12.07.05.23.56; Wed, 07 Dec 2022 05:24:09 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbiLGNTw (ORCPT + 99 others); Wed, 7 Dec 2022 08:19:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229946AbiLGNTr (ORCPT ); Wed, 7 Dec 2022 08:19:47 -0500 Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25894140BC; Wed, 7 Dec 2022 05:19:45 -0800 (PST) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id C29E8240004; Wed, 7 Dec 2022 13:19:42 +0000 (UTC) From: Quentin Schulz To: Minas Harutyunyan , Greg Kroah-Hartman Cc: Quentin Schulz , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, William Wu , Bin Yang , Frank Wang Subject: [PATCH 2/3] usb: dwc2: power on/off phy for peripheral mode in dual-role mode Date: Wed, 7 Dec 2022 14:19:17 +0100 Message-Id: <20221206-dwc2-gadget-dual-role-v1-2-36515e1092cd@theobroma-systems.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221206-dwc2-gadget-dual-role-v1-0-36515e1092cd@theobroma-systems.com> References: <20221206-dwc2-gadget-dual-role-v1-0-36515e1092cd@theobroma-systems.com> MIME-Version: 1.0 X-Mailer: b4 0.10.1 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751561744699737689?= X-GMAIL-MSGID: =?utf-8?q?1751561744699737689?= From: Quentin Schulz The PHY power is handled for peripheral mode but only when the device is forced into this peripheral mode. It is missing when the device is operating in peripheral mode when dual-role mode is enabled, so let's update the condition to match this scenario. Signed-off-by: Quentin Schulz --- drivers/usb/dwc2/gadget.c | 6 ++++-- drivers/usb/dwc2/platform.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 8b15742d9e8aa..62fa6378d2d73 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -4549,7 +4549,8 @@ static int dwc2_hsotg_udc_start(struct usb_gadget *gadget, hsotg->gadget.dev.of_node = hsotg->dev->of_node; hsotg->gadget.speed = USB_SPEED_UNKNOWN; - if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) { + if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL || + (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg))) { ret = dwc2_lowlevel_hw_enable(hsotg); if (ret) goto err; @@ -4611,7 +4612,8 @@ static int dwc2_hsotg_udc_stop(struct usb_gadget *gadget) if (!IS_ERR_OR_NULL(hsotg->uphy)) otg_set_peripheral(hsotg->uphy->otg, NULL); - if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) + if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL || + (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg))) dwc2_lowlevel_hw_disable(hsotg); return 0; diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index ec4ace0107f5f..1d4f1ba22b92a 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c @@ -576,7 +576,8 @@ static int dwc2_driver_probe(struct platform_device *dev) dwc2_debugfs_init(hsotg); /* Gadget code manages lowlevel hw on its own */ - if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL) + if (hsotg->dr_mode == USB_DR_MODE_PERIPHERAL || + (hsotg->dr_mode == USB_DR_MODE_OTG && dwc2_is_device_mode(hsotg))) dwc2_lowlevel_hw_disable(hsotg); #if IS_ENABLED(CONFIG_USB_DWC2_PERIPHERAL) || \