Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp957911pxb; Fri, 22 Apr 2022 15:18:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkOLeNIa0Ecd+HkppSPD8t6++JYnhpJ/8lWBof7owEktFnbuaz/t0p8EYjFHBHyQtkQ0pN X-Received: by 2002:a17:902:e881:b0:159:828:b6dd with SMTP id w1-20020a170902e88100b001590828b6ddmr6874748plg.127.1650665902138; Fri, 22 Apr 2022 15:18:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650665902; cv=none; d=google.com; s=arc-20160816; b=Dj5Rd667xBBl1iU2SDf7Kf0Kq1VbIKo8pJMCXaaiwyx8qwS5Xi/74AMeM2R/X1qoyR BK31MGmTueAWkBZgXV8oQDRvvhQix0HkJD50PKXQ0hVchNnMIhoBftbv8NUyVB/SR9YP b8FZd7RDmdv4s9SK9RdnBv0Lxl73by4nTn4pvy9SeN77PzvYtq57r9OgyGBBCjf5YL6D iiYR/6vbb97juoxlaAx8C6UzQLM1nLKDMX8Sg+je4vhvuM8cDRSOMWuKCsUswz6JCR2+ hGbfwhVE4hD0l04uN8LQB4H48exOD1Cm5Xnow5HtQhp6Lnts7tv1NaYllgdiQhJAjVPu yoJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=8A9UVs8eDwMksmfA+yXz+HToGT/gdx6H2OojUHbE1fs=; b=QFWBdaEUyxHPVhqefBvmIvvBg8OIgxZmi5SNPTuH3UjOrZI8CcGP+IPimaNW9quLJb UDgCCGWQ/t0Hvj+3AcOP/ZyRfhm1ux2x1gYQjokPBHqB5nNPkHGPfESm63Im/qZtSOme KTpQWavSHg4rQDmTjQHRk7ARxeGxYICr0lh1SqFCqFF96B1vzh4nw6Ngow+Xd6+Gif1N 0Bli/j9d+p7dGwiWb3I5ASzaxlGz+EzOD0aBovXmGCgQIwpvfSJScUW1vLK83kbtkKNH qTTJIJh8yLVvWWvNq93+bsRtflNbw1T59GVbLvK0qAsTJ4i+6psssvHwmDz0Ml1lhEdN zavA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=KdvOHxby; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id i190-20020a6387c7000000b003a158337b8bsi9020885pge.0.2022.04.22.15.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Apr 2022 15:18:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcdkim header.b=KdvOHxby; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E8391260AB9; Fri, 22 Apr 2022 13:22:58 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353688AbiDSTOl (ORCPT + 99 others); Tue, 19 Apr 2022 15:14:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353316AbiDSTOi (ORCPT ); Tue, 19 Apr 2022 15:14:38 -0400 Received: from alexa-out.qualcomm.com (alexa-out.qualcomm.com [129.46.98.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84D9B3A72B; Tue, 19 Apr 2022 12:11:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1650395516; x=1681931516; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=8A9UVs8eDwMksmfA+yXz+HToGT/gdx6H2OojUHbE1fs=; b=KdvOHxbyO5P2pGYPsAiEIEQiKEpKbROzO1ykBSOMK8g0nNLIgMtwVS7V B+ZG6Cj1h4B0M6+NipF17YA3Ffa/SzQ61h6a2AOmG0icm5t3M4hY3vhSk LefpUbtJ34OUDmUUK/Yg6JnvkjKXJSnC8LBef5TlY0wetNgDqlRrGr5sB g=; Received: from ironmsg09-lv.qualcomm.com ([10.47.202.153]) by alexa-out.qualcomm.com with ESMTP; 19 Apr 2022 12:11:55 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg09-lv.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Apr 2022 12:11:55 -0700 Received: from nalasex01a.na.qualcomm.com (10.47.209.196) by nasanex01c.na.qualcomm.com (10.47.97.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 19 Apr 2022 12:11:54 -0700 Received: from c-sanm-linux.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.22; Tue, 19 Apr 2022 12:11:48 -0700 From: Sandeep Maheswaram To: Rob Herring , Andy Gross , "Bjorn Andersson" , Greg Kroah-Hartman , Felipe Balbi , Stephen Boyd , Doug Anderson , "Matthias Kaehlcke" , Mathias Nyman , Krzysztof Kozlowski , "Rafael J . Wysocki" , Len Brown , Pavel Machek CC: , , , , , , , , , Sandeep Maheswaram Subject: [PATCH v14 3/7] usb: dwc3: core: Host wake up support from system suspend Date: Wed, 20 Apr 2022 00:41:06 +0530 Message-ID: <1650395470-31333-4-git-send-email-quic_c_sanm@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1650395470-31333-1-git-send-email-quic_c_sanm@quicinc.com> References: <1650395470-31333-1-git-send-email-quic_c_sanm@quicinc.com> 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-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE autolearn=no 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 During suspend read the status of all port and set hs phy mode based on current speed. Use this hs phy mode to configure wakeup interrupts in qcom glue driver. Check wakeup-source property for dwc3 core node to set the wakeup capability. Drop the device_init_wakeup call from runtime suspend and resume. Also check during suspend if any wakeup capable devices are connected to the controller (directly or through hubs), if there are none set a flag to indicate that the PHY is powered down during suspend. Signed-off-by: Sandeep Maheswaram --- v14: Used device_children_wakeup_capable instead of usb_wakeup_enabled_descendants. v13: Changed dwc3_set_phy_speed_mode to dwc3_check_phy_speed_mode. Removed device_init_wakeup calls from dwc3_runtime_suspend and dwc3_runtime_resume as we have a new dt property wakeup-source. drivers/usb/dwc3/core.c | 33 ++++++++++++++++++++------------- drivers/usb/dwc3/core.h | 4 ++++ drivers/usb/dwc3/host.c | 24 ++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 1170b80..898aa66 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -32,6 +32,7 @@ #include #include #include +#include #include "core.h" #include "gadget.h" @@ -1723,6 +1724,7 @@ static int dwc3_probe(struct platform_device *pdev) platform_set_drvdata(pdev, dwc); dwc3_cache_hwparams(dwc); + device_init_wakeup(&pdev->dev, of_property_read_bool(dev->of_node, "wakeup-source")); spin_lock_init(&dwc->lock); mutex_init(&dwc->mutex); @@ -1865,6 +1867,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) { unsigned long flags; u32 reg; + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); switch (dwc->current_dr_role) { case DWC3_GCTL_PRTCAP_DEVICE: @@ -1877,10 +1880,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) dwc3_core_exit(dwc); break; case DWC3_GCTL_PRTCAP_HOST: - if (!PMSG_IS_AUTO(msg)) { - dwc3_core_exit(dwc); - break; - } + dwc3_check_phy_speed_mode(dwc); /* Let controller to suspend HSPHY before PHY driver suspends */ if (dwc->dis_u2_susphy_quirk || @@ -1896,6 +1896,16 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) phy_pm_runtime_put_sync(dwc->usb2_generic_phy); phy_pm_runtime_put_sync(dwc->usb3_generic_phy); + + if (!PMSG_IS_AUTO(msg)) { + if (device_may_wakeup(dwc->dev) && + device_children_wakeup_capable(&hcd->self.root_hub->dev)) { + dwc->phy_power_off = false; + } else { + dwc->phy_power_off = true; + dwc3_core_exit(dwc); + } + } break; case DWC3_GCTL_PRTCAP_OTG: /* do nothing during runtime_suspend */ @@ -1939,11 +1949,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) break; case DWC3_GCTL_PRTCAP_HOST: if (!PMSG_IS_AUTO(msg)) { - ret = dwc3_core_init_for_resume(dwc); - if (ret) - return ret; - dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); - break; + if (dwc->phy_power_off) { + ret = dwc3_core_init_for_resume(dwc); + if (ret) + return ret; + dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_HOST); + } } /* Restore GUSB2PHYCFG bits that were modified in suspend */ reg = dwc3_readl(dwc->regs, DWC3_GUSB2PHYCFG(0)); @@ -2015,8 +2026,6 @@ static int dwc3_runtime_suspend(struct device *dev) if (ret) return ret; - device_init_wakeup(dev, true); - return 0; } @@ -2025,8 +2034,6 @@ static int dwc3_runtime_resume(struct device *dev) struct dwc3 *dwc = dev_get_drvdata(dev); int ret; - device_init_wakeup(dev, false); - ret = dwc3_resume_common(dwc, PMSG_AUTO_RESUME); if (ret) return ret; diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 5c9d467..6a5845f 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1154,6 +1154,9 @@ struct dwc3 { bool phys_ready; + unsigned int hs_phy_mode; + bool phy_power_off; + struct ulpi *ulpi; bool ulpi_ready; @@ -1537,6 +1540,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc); #if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) int dwc3_host_init(struct dwc3 *dwc); void dwc3_host_exit(struct dwc3 *dwc); +void dwc3_check_phy_speed_mode(struct dwc3 *dwc); #else static inline int dwc3_host_init(struct dwc3 *dwc) { return 0; } diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index eda8719..3902b56 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c @@ -13,6 +13,7 @@ #include #include "core.h" +#include "../host/xhci.h" static void dwc3_host_fill_xhci_irq_res(struct dwc3 *dwc, int irq, char *name) @@ -138,3 +139,26 @@ void dwc3_host_exit(struct dwc3 *dwc) { platform_device_unregister(dwc->xhci); } + +void dwc3_check_phy_speed_mode(struct dwc3 *dwc) +{ + int i, num_ports; + u32 reg; + struct usb_hcd *hcd = platform_get_drvdata(dwc->xhci); + struct xhci_hcd *xhci_hcd = hcd_to_xhci(hcd); + + dwc->hs_phy_mode = 0; + + reg = readl(&xhci_hcd->cap_regs->hcs_params1); + + num_ports = HCS_MAX_PORTS(reg); + for (i = 0; i < num_ports; i++) { + reg = readl(&xhci_hcd->op_regs->port_status_base + i * NUM_PORT_REGS); + if (reg & PORT_PE) { + if (DEV_HIGHSPEED(reg) || DEV_FULLSPEED(reg)) + dwc->hs_phy_mode |= PHY_MODE_USB_HOST_HS; + else if (DEV_LOWSPEED(reg)) + dwc->hs_phy_mode |= PHY_MODE_USB_HOST_LS; + } + } +} -- 2.7.4