From: Mathias Nyman <mathias.nyman@linux.intel.com>
To: <gregkh@linuxfoundation.org>
Cc: <linux-usb@vger.kernel.org>, Peter Chen <peter.chen@nxp.com>,
Mathias Nyman <mathias.nyman@linux.intel.com>
Subject: [PATCH 02/10] usb: host: xhci-plat: add .suspend_quirk for struct xhci_plat_priv
Date: Fri, 18 Sep 2020 16:17:44 +0300 [thread overview]
Message-ID: <20200918131752.16488-3-mathias.nyman@linux.intel.com> (raw)
In-Reply-To: <20200918131752.16488-1-mathias.nyman@linux.intel.com>
From: Peter Chen <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>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.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-09-18 13:14 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:17 [PATCH 00/10] xhci features for usb-next Mathias Nyman
2020-09-18 13:17 ` [PATCH 01/10] usb: host: xhci-plat: add platform data support Mathias Nyman
2020-09-18 13:17 ` Mathias Nyman [this message]
2020-09-18 13:17 ` [PATCH 03/10] usb: host: xhci-plat: delete the unnecessary code Mathias Nyman
2020-09-18 13:17 ` [PATCH 04/10] usb: host: xhci-plat: add priv quirk for skip PHY initialization Mathias Nyman
2020-09-18 13:17 ` [PATCH 05/10] usb: host: xhci-plat: add wakeup entry at sysfs Mathias Nyman
2020-09-18 13:17 ` [PATCH 06/10] usb: host: xhci-plat: improve the comments for xhci_plat_suspend Mathias Nyman
2020-09-18 13:17 ` [PATCH 07/10] usb: xhci: omit duplicate actions when suspending a runtime suspended host Mathias Nyman
2020-09-18 13:17 ` [PATCH 08/10] xhci: Tune interrupt blocking for isochronous transfers Mathias Nyman
2020-09-18 13:17 ` [PATCH 09/10] xhci: don't create endpoint debugfs entry before ring buffer is set Mathias Nyman
2020-09-21 12:54 ` Sasha Levin
2020-09-18 13:17 ` [PATCH 10/10] usb: xhci: add debugfs support for ep with stream Mathias Nyman
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=20200918131752.16488-3-mathias.nyman@linux.intel.com \
--to=mathias.nyman@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=peter.chen@nxp.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).