From: Peter Chen <peter.chen@nxp.com>
To: mathias.nyman@intel.com
Cc: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org,
linux-imx@nxp.com, Peter Chen <peter.chen@nxp.com>
Subject: [PATCH v2 2/7] usb: host: xhci-plat: add .suspend_quirk for struct xhci_plat_priv
Date: Mon, 17 Aug 2020 17:44:35 +0800 [thread overview]
Message-ID: <20200817094440.23202-3-peter.chen@nxp.com> (raw)
In-Reply-To: <20200817094440.23202-1-peter.chen@nxp.com>
Some platforms (eg cdns3) may have special sequences between
xhci_bus_suspend and xhci_suspend, add .suspend_quick for it.
Reviewed-by: Jun Li <jun.li@nxp.com>
Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
drivers/usb/host/xhci-plat.c | 19 +++++++++++++++++++
drivers/usb/host/xhci-plat.h | 1 +
2 files changed, 20 insertions(+)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index c7f98edc5678..c3ce4d762adf 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -54,6 +54,16 @@ static int xhci_priv_init_quirk(struct usb_hcd *hcd)
return priv->init_quirk(hcd);
}
+static int xhci_priv_suspend_quirk(struct usb_hcd *hcd)
+{
+ struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
+
+ if (!priv->suspend_quirk)
+ return 0;
+
+ return priv->suspend_quirk(hcd);
+}
+
static int xhci_priv_resume_quirk(struct usb_hcd *hcd)
{
struct xhci_plat_priv *priv = hcd_to_xhci_priv(hcd);
@@ -401,7 +411,11 @@ static int __maybe_unused xhci_plat_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ int ret;
+ ret = xhci_priv_suspend_quirk(hcd);
+ if (ret)
+ return ret;
/*
* xhci_suspend() needs `do_wakeup` to know whether host is allowed
* to do wakeup during suspend. Since xhci_plat_suspend is currently
@@ -438,6 +452,11 @@ static int __maybe_unused xhci_plat_runtime_suspend(struct device *dev)
{
struct usb_hcd *hcd = dev_get_drvdata(dev);
struct xhci_hcd *xhci = hcd_to_xhci(hcd);
+ int ret;
+
+ ret = xhci_priv_suspend_quirk(hcd);
+ if (ret)
+ return ret;
return xhci_suspend(xhci, true);
}
diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
index b49f6447bd3a..1fb149d1fbce 100644
--- a/drivers/usb/host/xhci-plat.h
+++ b/drivers/usb/host/xhci-plat.h
@@ -15,6 +15,7 @@ struct xhci_plat_priv {
unsigned long long quirks;
void (*plat_start)(struct usb_hcd *);
int (*init_quirk)(struct usb_hcd *);
+ int (*suspend_quirk)(struct usb_hcd *);
int (*resume_quirk)(struct usb_hcd *);
};
--
2.17.1
next prev parent reply other threads:[~2020-08-17 9:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-17 9:44 [PATCH v2 0/7] usb: host: xhci: some changes for xhci-plat.c Peter Chen
2020-08-17 9:44 ` [PATCH v2 1/7] usb: host: xhci-plat: add platform data support Peter Chen
2020-08-17 9:44 ` Peter Chen [this message]
2020-08-17 9:44 ` [PATCH v2 3/7] usb: host: xhci-plat: delete the unnecessary code Peter Chen
2020-08-17 9:44 ` [PATCH v2 4/7] usb: host: xhci-plat: add priv quirk for skip PHY initialization Peter Chen
2020-08-17 9:44 ` [PATCH v2 5/7] usb: host: xhci-plat: add wakeup entry at sysfs Peter Chen
2020-08-21 9:37 ` Mathias Nyman
2020-08-21 9:57 ` Peter Chen
2020-08-21 10:35 ` Mathias Nyman
2020-09-17 17:49 ` Matthias Kaehlcke
2020-08-17 9:44 ` [PATCH v2 6/7] usb: host: xhci-plat: improve the comments for xhci_plat_suspend Peter Chen
2020-08-17 9:44 ` [PATCH v2 7/7] usb: host: xhci: avoid calling contineous two times for xhci_suspend Peter Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200817094440.23202-3-peter.chen@nxp.com \
--to=peter.chen@nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-imx@nxp.com \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).