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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA391ECDE42 for ; Thu, 18 Oct 2018 01:47:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A01321470 for ; Thu, 18 Oct 2018 01:47:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A01321470 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727434AbeJRJpm (ORCPT ); Thu, 18 Oct 2018 05:45:42 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:32700 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1727082AbeJRJpl (ORCPT ); Thu, 18 Oct 2018 05:45:41 -0400 X-UUID: 86f48988d13b4fcc938bd7acc0825851-20181018 X-UUID: 86f48988d13b4fcc938bd7acc0825851-20181018 Received: from mtkcas36.mediatek.inc [(172.27.4.250)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 960577932; Thu, 18 Oct 2018 09:46:48 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS33N2.mediatek.inc (172.27.4.76) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 18 Oct 2018 09:46:47 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Thu, 18 Oct 2018 09:46:46 +0800 Message-ID: <1539827206.32173.62.camel@mhfsdcap03> Subject: Re: [PATCH V2 2/6] usb: core: Add ability to skip phy exit on suspend and init on resume From: Chunfeng Yun To: Al Cooper CC: , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , , "Bjorn Andersson" , "David S. Miller" , , Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Jianguo Sun , Johan Hovold , Kees Cook , , Lu Baolu , Mark Rutland , "Martin Blumenstingl" , Mathias Nyman , Mathias Nyman , Mauro Carvalho Chehab , Rishabh Bhatnagar , Rob Herring , Roger Quadros Date: Thu, 18 Oct 2018 09:46:46 +0800 In-Reply-To: <1539815349-24126-3-git-send-email-alcooperx@gmail.com> References: <1539815349-24126-1-git-send-email-alcooperx@gmail.com> <1539815349-24126-3-git-send-email-alcooperx@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org hi, On Wed, 2018-10-17 at 18:29 -0400, Al Cooper wrote: > Add the ability to skip calling the PHY's exit routine on suspend > and the PHY's init routine on resume. This is to handle a USB PHY > that should have it's power_off function called on suspend but cannot > have it's exit function called because on exit it will disable the > PHY to the point where register accesses to the Host Controllers > using the PHY will be disabled and the host drivers will crash. > > This is enabled with the HCD flag "suspend_without_phy_exit" which > can be set from any HCD driver. > > Signed-off-by: Al Cooper > --- > drivers/usb/core/hcd.c | 8 ++++---- > drivers/usb/core/phy.c | 18 ++++++++++++------ > drivers/usb/core/phy.h | 9 ++++++--- > include/linux/usb/hcd.h | 3 +++ > 4 files changed, 25 insertions(+), 13 deletions(-) > > diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c > index 1c21955fe7c0..e67e4d6b3d21 100644 > --- a/drivers/usb/core/hcd.c > +++ b/drivers/usb/core/hcd.c > @@ -2263,7 +2263,7 @@ int hcd_bus_suspend(struct usb_device *rhdev, pm_message_t msg) > hcd->state = HC_STATE_SUSPENDED; > > if (!PMSG_IS_AUTO(msg)) > - usb_phy_roothub_suspend(hcd->self.sysdev, > + usb_phy_roothub_suspend(hcd, > hcd->phy_roothub); > > /* Did we race with a root-hub wakeup event? */ > @@ -2304,7 +2304,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) > } > > if (!PMSG_IS_AUTO(msg)) { > - status = usb_phy_roothub_resume(hcd->self.sysdev, > + status = usb_phy_roothub_resume(hcd, > hcd->phy_roothub); > if (status) > return status; > @@ -2347,7 +2347,7 @@ int hcd_bus_resume(struct usb_device *rhdev, pm_message_t msg) > } > } else { > hcd->state = old_state; > - usb_phy_roothub_suspend(hcd->self.sysdev, hcd->phy_roothub); > + usb_phy_roothub_suspend(hcd, hcd->phy_roothub); > dev_dbg(&rhdev->dev, "bus %s fail, err %d\n", > "resume", status); > if (status != -ESHUTDOWN) > @@ -2744,7 +2744,7 @@ int usb_add_hcd(struct usb_hcd *hcd, > struct usb_device *rhdev; > > if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) { > - hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev); > + hcd->phy_roothub = usb_phy_roothub_alloc(hcd); > if (IS_ERR(hcd->phy_roothub)) > return PTR_ERR(hcd->phy_roothub); > > diff --git a/drivers/usb/core/phy.c b/drivers/usb/core/phy.c > index 9879767452a2..b54db39eee4c 100644 > --- a/drivers/usb/core/phy.c > +++ b/drivers/usb/core/phy.c > @@ -45,10 +45,11 @@ static int usb_phy_roothub_add_phy(struct device *dev, int index, > return 0; > } > > -struct usb_phy_roothub *usb_phy_roothub_alloc(struct device *dev) > +struct usb_phy_roothub *usb_phy_roothub_alloc(struct usb_hcd *hcd) > { > struct usb_phy_roothub *phy_roothub; > int i, num_phys, err; > + struct device *dev = hcd->self.sysdev; > > if (!IS_ENABLED(CONFIG_GENERIC_PHY)) > return NULL; > @@ -161,26 +162,30 @@ void usb_phy_roothub_power_off(struct usb_phy_roothub *phy_roothub) > } > EXPORT_SYMBOL_GPL(usb_phy_roothub_power_off); > > -int usb_phy_roothub_suspend(struct device *controller_dev, > +int usb_phy_roothub_suspend(struct usb_hcd *hcd, > struct usb_phy_roothub *phy_roothub) > { > + struct device *controller_dev = hcd->self.sysdev; > + > usb_phy_roothub_power_off(phy_roothub); > > /* keep the PHYs initialized so the device can wake up the system */ > - if (device_may_wakeup(controller_dev)) > + if (device_may_wakeup(controller_dev) || hcd->suspend_without_phy_exit) > return 0; > > return usb_phy_roothub_exit(phy_roothub); > } > EXPORT_SYMBOL_GPL(usb_phy_roothub_suspend); > > -int usb_phy_roothub_resume(struct device *controller_dev, > +int usb_phy_roothub_resume(struct usb_hcd *hcd, > struct usb_phy_roothub *phy_roothub) > { > + struct device *controller_dev = hcd->self.sysdev; > int err; > > /* if the device can't wake up the system _exit was called */ > - if (!device_may_wakeup(controller_dev)) { > + if (!device_may_wakeup(controller_dev) && > + !hcd->suspend_without_phy_exit) { > err = usb_phy_roothub_init(phy_roothub); > if (err) > return err; > @@ -189,7 +194,8 @@ int usb_phy_roothub_resume(struct device *controller_dev, > err = usb_phy_roothub_power_on(phy_roothub); > > /* undo _init if _power_on failed */ > - if (err && !device_may_wakeup(controller_dev)) > + if (err && !device_may_wakeup(controller_dev) > + && !hcd->suspend_without_phy_exit) > usb_phy_roothub_exit(phy_roothub); > > return err; > diff --git a/drivers/usb/core/phy.h b/drivers/usb/core/phy.h > index 88a3c037e9df..34293e11a917 100644 > --- a/drivers/usb/core/phy.h > +++ b/drivers/usb/core/phy.h > @@ -5,13 +5,16 @@ > * Copyright (C) 2018 Martin Blumenstingl > */ > > +#include > +#include > + > #ifndef __USB_CORE_PHY_H_ > #define __USB_CORE_PHY_H_ > > struct device; > struct usb_phy_roothub; > > -struct usb_phy_roothub *usb_phy_roothub_alloc(struct device *dev); > +struct usb_phy_roothub *usb_phy_roothub_alloc(struct usb_hcd *hcd); > > int usb_phy_roothub_init(struct usb_phy_roothub *phy_roothub); > int usb_phy_roothub_exit(struct usb_phy_roothub *phy_roothub); > @@ -19,9 +22,9 @@ > int usb_phy_roothub_power_on(struct usb_phy_roothub *phy_roothub); > void usb_phy_roothub_power_off(struct usb_phy_roothub *phy_roothub); > > -int usb_phy_roothub_suspend(struct device *controller_dev, > +int usb_phy_roothub_suspend(struct usb_hcd *hcd, > struct usb_phy_roothub *phy_roothub); > -int usb_phy_roothub_resume(struct device *controller_dev, > +int usb_phy_roothub_resume(struct usb_hcd *hcd, > struct usb_phy_roothub *phy_roothub); > > #endif /* __USB_CORE_PHY_H_ */ > diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h > index 97e2ddec18b1..87a104055b5e 100644 > --- a/include/linux/usb/hcd.h > +++ b/include/linux/usb/hcd.h > @@ -157,6 +157,9 @@ struct usb_hcd { > */ > unsigned skip_phy_initialization:1; > > + /* Some phys don't want the phy's exit/init called on suspend/resume */ > + unsigned suspend_without_phy_exit:1; As suggested before, you can skip phy's exit/init during suspend/resume by enabling wakeup of hcd, so needn't add a new variable for it. > + > /* The next flag is a stopgap, to be removed when all the HCDs > * support the new root-hub polling mechanism. */ > unsigned uses_new_polling:1;