From: Peter Chen <peter.chen@nxp.com>
To: <gregkh@linuxfoundation.org>, <stern@rowland.harvard.edu>,
<ulf.hansson@linaro.org>, <broonie@kernel.org>, <sre@kernel.org>,
<robh+dt@kernel.org>, <shawnguo@kernel.org>, <rjw@rjwysocki.net>,
<dbaryshkov@gmail.com>
Cc: <heiko@sntech.de>, <linux-arm-kernel@lists.infradead.org>,
<p.zabel@pengutronix.de>, <devicetree@vger.kernel.org>,
<pawel.moll@arm.com>, <mark.rutland@arm.com>,
<linux-usb@vger.kernel.org>, <arnd@arndb.de>,
<s.hauer@pengutronix.de>, <mail@maciej.szmigiero.name>,
<troy.kisky@boundarydevices.com>, <festevam@gmail.com>,
<oscar@naiandei.net>, <stephen.boyd@linaro.org>,
<linux-pm@vger.kernel.org>, <stillcompiling@gmail.com>,
<linux-kernel@vger.kernel.org>, <mka@chromium.org>,
<vaibhav.hiremath@linaro.org>, <gary.bisson@boundarydevices.com>,
<hverkuil@xs4all.nl>, <krzk@kernel.org>,
Peter Chen <peter.chen@nxp.com>,
Sriram Dash <sriram.dash@nxp.com>
Subject: [PATCH v12 7/9] usb: ehci: use bus->sysdev for DMA configuration
Date: Mon, 6 Feb 2017 17:13:39 +0800 [thread overview]
Message-ID: <1486372421-29073-8-git-send-email-peter.chen@nxp.com> (raw)
In-Reply-To: <1486372421-29073-1-git-send-email-peter.chen@nxp.com>
Set the dma for ehci from sysdev. The sysdev is pointing to device that
is known to the system firmware or hardware.
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Sriram Dash <sriram.dash@nxp.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
---
drivers/usb/host/ehci-mem.c | 38 +++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/host/ehci-mem.c b/drivers/usb/host/ehci-mem.c
index 4de4301..f54478d 100644
--- a/drivers/usb/host/ehci-mem.c
+++ b/drivers/usb/host/ehci-mem.c
@@ -46,21 +46,21 @@ static inline void ehci_qtd_init(struct ehci_hcd *ehci, struct ehci_qtd *qtd,
INIT_LIST_HEAD (&qtd->qtd_list);
}
-static struct ehci_qtd *ehci_qtd_alloc (struct ehci_hcd *ehci, gfp_t flags)
+static struct ehci_qtd *ehci_qtd_alloc(struct ehci_hcd *ehci, gfp_t flags)
{
struct ehci_qtd *qtd;
dma_addr_t dma;
- qtd = dma_pool_alloc (ehci->qtd_pool, flags, &dma);
+ qtd = dma_pool_alloc(ehci->qtd_pool, flags, &dma);
if (qtd != NULL) {
ehci_qtd_init(ehci, qtd, dma);
}
return qtd;
}
-static inline void ehci_qtd_free (struct ehci_hcd *ehci, struct ehci_qtd *qtd)
+static inline void ehci_qtd_free(struct ehci_hcd *ehci, struct ehci_qtd *qtd)
{
- dma_pool_free (ehci->qtd_pool, qtd, qtd->qtd_dma);
+ dma_pool_free(ehci->qtd_pool, qtd, qtd->qtd_dma);
}
@@ -72,12 +72,12 @@ static void qh_destroy(struct ehci_hcd *ehci, struct ehci_qh *qh)
BUG ();
}
if (qh->dummy)
- ehci_qtd_free (ehci, qh->dummy);
+ ehci_qtd_free(ehci, qh->dummy);
dma_pool_free(ehci->qh_pool, qh->hw, qh->qh_dma);
kfree(qh);
}
-static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
+static struct ehci_qh *ehci_qh_alloc(struct ehci_hcd *ehci, gfp_t flags)
{
struct ehci_qh *qh;
dma_addr_t dma;
@@ -96,7 +96,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
INIT_LIST_HEAD(&qh->unlink_node);
/* dummy td enables safe urb queuing */
- qh->dummy = ehci_qtd_alloc (ehci, flags);
+ qh->dummy = ehci_qtd_alloc(ehci, flags);
if (qh->dummy == NULL) {
ehci_dbg (ehci, "no dummy td\n");
goto fail1;
@@ -117,7 +117,7 @@ static struct ehci_qh *ehci_qh_alloc (struct ehci_hcd *ehci, gfp_t flags)
* This is the initialisation and cleanup code.
*/
-static void ehci_mem_cleanup (struct ehci_hcd *ehci)
+static void ehci_mem_cleanup(struct ehci_hcd *ehci)
{
if (ehci->async)
qh_destroy(ehci, ehci->async);
@@ -138,7 +138,7 @@ static void ehci_mem_cleanup (struct ehci_hcd *ehci)
ehci->sitd_pool = NULL;
if (ehci->periodic)
- dma_free_coherent (ehci_to_hcd(ehci)->self.controller,
+ dma_free_coherent(ehci_to_hcd(ehci)->self.sysdev,
ehci->periodic_size * sizeof (u32),
ehci->periodic, ehci->periodic_dma);
ehci->periodic = NULL;
@@ -154,8 +154,8 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
int i;
/* QTDs for control/bulk/intr transfers */
- ehci->qtd_pool = dma_pool_create ("ehci_qtd",
- ehci_to_hcd(ehci)->self.controller,
+ ehci->qtd_pool = dma_pool_create("ehci_qtd",
+ ehci_to_hcd(ehci)->self.sysdev,
sizeof (struct ehci_qtd),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
@@ -164,22 +164,22 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
}
/* QHs for control/bulk/intr transfers */
- ehci->qh_pool = dma_pool_create ("ehci_qh",
- ehci_to_hcd(ehci)->self.controller,
+ ehci->qh_pool = dma_pool_create("ehci_qh",
+ ehci_to_hcd(ehci)->self.sysdev,
sizeof(struct ehci_qh_hw),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
if (!ehci->qh_pool) {
goto fail;
}
- ehci->async = ehci_qh_alloc (ehci, flags);
+ ehci->async = ehci_qh_alloc(ehci, flags);
if (!ehci->async) {
goto fail;
}
/* ITD for high speed ISO transfers */
- ehci->itd_pool = dma_pool_create ("ehci_itd",
- ehci_to_hcd(ehci)->self.controller,
+ ehci->itd_pool = dma_pool_create("ehci_itd",
+ ehci_to_hcd(ehci)->self.sysdev,
sizeof (struct ehci_itd),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
@@ -188,8 +188,8 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
}
/* SITD for full/low speed split ISO transfers */
- ehci->sitd_pool = dma_pool_create ("ehci_sitd",
- ehci_to_hcd(ehci)->self.controller,
+ ehci->sitd_pool = dma_pool_create("ehci_sitd",
+ ehci_to_hcd(ehci)->self.sysdev,
sizeof (struct ehci_sitd),
32 /* byte alignment (for hw parts) */,
4096 /* can't cross 4K */);
@@ -199,7 +199,7 @@ static int ehci_mem_init (struct ehci_hcd *ehci, gfp_t flags)
/* Hardware periodic table */
ehci->periodic = (__le32 *)
- dma_alloc_coherent (ehci_to_hcd(ehci)->self.controller,
+ dma_alloc_coherent(ehci_to_hcd(ehci)->self.sysdev,
ehci->periodic_size * sizeof(__le32),
&ehci->periodic_dma, flags);
if (ehci->periodic == NULL) {
--
2.7.4
next prev parent reply other threads:[~2017-02-06 9:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-06 9:13 [PATCH v12 0/9] power: add power sequence library Peter Chen
2017-02-06 9:13 ` [PATCH v12 1/9] binding-doc: power: pwrseq-generic: add binding doc for generic " Peter Chen
2017-02-06 9:13 ` [PATCH v12 2/9] power: add " Peter Chen
2017-02-06 9:13 ` [PATCH v12 3/9] usb: separate out sysdev pointer from usb_bus Peter Chen
2017-02-09 6:20 ` Vivek Gautam
2017-02-06 9:13 ` [PATCH v12 4/9] usb: chipidea: use bus->sysdev for DMA configuration Peter Chen
2017-02-06 9:13 ` [PATCH v12 5/9] usb: ehci: fsl: " Peter Chen
2017-02-06 9:13 ` [PATCH v12 6/9] usb: xhci: " Peter Chen
2017-02-08 11:57 ` Vivek Gautam
2017-02-09 1:45 ` Peter Chen
2017-02-08 20:43 ` Jack Pham
2017-02-09 1:41 ` Peter Chen
2017-02-09 6:15 ` Vivek Gautam
2017-02-09 11:53 ` Roger Quadros
2017-02-09 11:54 ` Roger Quadros
2017-02-09 12:10 ` Vivek Gautam
2017-02-10 1:40 ` Peter Chen
2017-02-09 12:08 ` Vivek Gautam
2017-02-06 9:13 ` Peter Chen [this message]
2017-02-06 9:13 ` [PATCH v12 8/9] binding-doc: usb: usb-device: add optional properties for power sequence Peter Chen
2017-02-06 9:13 ` [PATCH v12 9/9] usb: core: add power sequence handling for USB devices 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=1486372421-29073-8-git-send-email-peter.chen@nxp.com \
--to=peter.chen@nxp.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=dbaryshkov@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=gary.bisson@boundarydevices.com \
--cc=gregkh@linuxfoundation.org \
--cc=heiko@sntech.de \
--cc=hverkuil@xs4all.nl \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mail@maciej.szmigiero.name \
--cc=mark.rutland@arm.com \
--cc=mka@chromium.org \
--cc=oscar@naiandei.net \
--cc=p.zabel@pengutronix.de \
--cc=pawel.moll@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=sre@kernel.org \
--cc=sriram.dash@nxp.com \
--cc=stephen.boyd@linaro.org \
--cc=stern@rowland.harvard.edu \
--cc=stillcompiling@gmail.com \
--cc=troy.kisky@boundarydevices.com \
--cc=ulf.hansson@linaro.org \
--cc=vaibhav.hiremath@linaro.org \
/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).