From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 662B3C433F5 for ; Thu, 31 Mar 2022 04:09:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229834AbiCaEL3 (ORCPT ); Thu, 31 Mar 2022 00:11:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50518 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229687AbiCaELM (ORCPT ); Thu, 31 Mar 2022 00:11:12 -0400 Received: from alexa-out-sd-01.qualcomm.com (alexa-out-sd-01.qualcomm.com [199.106.114.38]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFCDE15D3BB; Wed, 30 Mar 2022 20:54:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; i=@quicinc.com; q=dns/txt; s=qcdkim; t=1648698897; x=1680234897; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=uR3FyW+rWjgDurFic+3oDkLuErztdR2t/QdiDkTnpnA=; b=mDcyG2KaFe8833nV8XoeDrAb8Zjq0854c6ZiyFmRXpcjWYa2AZGLqHph OmGJO4xTHoEDQIQ6e3lqcgl4AVhZvwA4O3+wCprNgCTpcO4rJCoJjsXtW 8IYkaoEev9X2FGFPNDE3aXTit7n7tqqSXPAQKgg4DiTYSounUuIh4+ylM Y=; Received: from unknown (HELO ironmsg01-sd.qualcomm.com) ([10.53.140.141]) by alexa-out-sd-01.qualcomm.com with ESMTP; 30 Mar 2022 20:14:54 -0700 X-QCInternal: smtphost Received: from nasanex01c.na.qualcomm.com ([10.47.97.222]) by ironmsg01-sd.qualcomm.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2022 20:14:46 -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; Wed, 30 Mar 2022 20:14:45 -0700 Received: from hu-pkondeti-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.986.22; Wed, 30 Mar 2022 20:14:40 -0700 Date: Thu, 31 Mar 2022 08:44:36 +0530 From: Pavan Kondeti To: Matthias Kaehlcke CC: Pavan Kondeti , "Sandeep Maheswaram (Temp)" , Bjorn Andersson , Greg Kroah-Hartman , Felipe Balbi , Stephen Boyd , Doug Anderson , Mathias Nyman , , , , Subject: Re: [PATCH v11 2/5] usb: dwc3: core: Host wake up support from system suspend Message-ID: <20220331031436.GD29680@hu-pkondeti-hyd.qualcomm.com> References: <1647932876-23249-1-git-send-email-quic_c_sanm@quicinc.com> <1647932876-23249-3-git-send-email-quic_c_sanm@quicinc.com> <20220330040318.GB29680@hu-pkondeti-hyd.qualcomm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Matthias, On Wed, Mar 30, 2022 at 09:46:36AM -0700, Matthias Kaehlcke wrote: > On Wed, Mar 30, 2022 at 09:33:18AM +0530, Pavan Kondeti wrote: > > Hi Sandeep/Matthias, > > > > On Thu, Mar 24, 2022 at 10:24:55AM +0530, Sandeep Maheswaram (Temp) wrote: > > > > > > On 3/23/2022 11:37 PM, Matthias Kaehlcke wrote: > > > >On Tue, Mar 22, 2022 at 12:37:53PM +0530, Sandeep Maheswaram wrote: > > > >>During suspend read the status of all port and make sure the PHYs > > > >>are in the correct mode based on current speed. > > > >>Phy interrupt masks are set based on this mode. Keep track of the mode > > > >>of the HS PHY to be able to configure wakeup properly. > > > >> > > > >>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 > > > >>--- > > > >> drivers/usb/dwc3/core.c | 54 ++++++++++++++++++++++++++++++++++++++++--------- > > > >> 1 file changed, 45 insertions(+), 9 deletions(-) > > > >> > > > >>diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c > > > >>index 1170b80..232a734 100644 > > > >>--- a/drivers/usb/dwc3/core.c > > > >>+++ b/drivers/usb/dwc3/core.c > > > >>@@ -32,12 +32,14 @@ > > > >> #include > > > >> #include > > > >> #include > > > >>+#include > > > >> #include "core.h" > > > >> #include "gadget.h" > > > >> #include "io.h" > > > >> #include "debug.h" > > > >>+#include "../host/xhci.h" > > > >> #define DWC3_DEFAULT_AUTOSUSPEND_DELAY 5000 /* ms */ > > > >>@@ -1861,10 +1863,36 @@ static int dwc3_core_init_for_resume(struct dwc3 *dwc) > > > >> return ret; > > > >> } > > > >>+static void dwc3_set_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 * 0x04); > > > >s/0x04/NUM_PORT_REGS/ > > > Okay. Will update in next version. > > > > > > > >>+ 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; > > > >>+ } > > > >>+ } > > > >>+ phy_set_mode(dwc->usb2_generic_phy, dwc->hs_phy_mode); > > > >>+} > > > >>+ > > > >> 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 +1905,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_set_phy_speed_mode(dwc); > > > >> /* Let controller to suspend HSPHY before PHY driver suspends */ > > > >> if (dwc->dis_u2_susphy_quirk || > > > >>@@ -1896,6 +1921,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->xhci->dev) && > > > >Does the xHCI actually provide the correct information? I think Brian brought > > > >up earlier that xhci-plat always marks the xHCI as wakeup capable, regardless > > > >of whether the specific implementation actually supports wakeup. So a dwc3 > > > >without wakeup support would keep the PHY and the dwc3 active during suspend > > > >if wakeup capable devices are connected (unless the admin disabled wakeup), > > > >even though wakeup it doesn't support wakeup. > > > > > > > >Using the wakeup capability/policy of the xHCI to make decisions in the dwc3 > > > >driver might still be the best we can do with the weird driver split over 3 > > > >drivers for dwc3. Maybe the dwc3 could pass the actual capability to wake up > > > >to the xHCI through a property_entry? Then again, it's actually the 'glue' > > > >driver (dwc3-qcom) who knows about the actual wakeup capability, and not the > > > >dwc3 core/host ... > > > Will check if we can do something regarding this. > > > > Can we introduce a device tree param to xhci-plat to specify if the underlying > > device is wakeup capable or not. Based on this xhci-plat can call > > device_set_wakeup_capable() with correct argument. > > This also came to my mind, the existing 'wakeup-source' property could be an > option, I share your concern about breaking existing use cases though ... > > > One immediate problem is that current code unconditionally calls > > device_set_wakeup_capable(&pdev->dev, true). So we may break existing use > > cases also. > > > Given that xHC assumes that the undelying device is wakeup capable but dwc3 > > tearing the stack during PM suspend does not make any sense. can we atleast > > create a device tree param for dwc3 not to do this? > > I'm not sure I fully understand what you have in mind. Are you thinking about > a parameter/property to indicate whether wakeup should be enabled for the dwc3? > 'wakeup_source' could serve that purpose, it is also used by xhci-mtk.c and > mtu3_host.c. Yes, I was suggesting we can have a device tree param for dwc3 node to decide instead of relying on device_may_wakeup() checks in this patch. Thanks for pointing out wakeup-source property. That sounds perfect here to me. Thanks, Pavan