From: laurentiu.tudor@nxp.com
To: hch@lst.de, stern@rowland.harvard.edu,
gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
marex@denx.de
Cc: leoyang.li@nxp.com, linux-kernel@vger.kernel.org,
robin.murphy@arm.com, noring@nocrew.org, JuergenUrban@gmx.de,
Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH v7 4/5] usb: host: ohci-tmio: init genalloc for local memory
Date: Wed, 29 May 2019 13:28:42 +0300 [thread overview]
Message-ID: <20190529102843.13174-5-laurentiu.tudor@nxp.com> (raw)
In-Reply-To: <20190529102843.13174-1-laurentiu.tudor@nxp.com>
From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
In preparation for dropping the existing "coherent" dma mem declaration
APIs, replace the current dma_declare_coherent_memory() based mechanism
with the creation of a genalloc pool that will be used in the OHCI
subsystem as replacement for the DMA APIs.
For context, see thread here: https://lkml.org/lkml/2019/4/22/357
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
drivers/usb/host/ohci-tmio.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index f88a0370659f..3b84ce0c3f29 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -224,11 +224,6 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
goto err_ioremap_regs;
}
- ret = dma_declare_coherent_memory(&dev->dev, sram->start, sram->start,
- resource_size(sram));
- if (ret)
- goto err_dma_declare;
-
if (cell->enable) {
ret = cell->enable(dev);
if (ret)
@@ -239,6 +234,11 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
ohci = hcd_to_ohci(hcd);
ohci_hcd_init(ohci);
+ ret = usb_hcd_setup_local_mem(hcd, sram->start, sram->start,
+ resource_size(sram));
+ if (ret < 0)
+ goto err_enable;
+
ret = usb_add_hcd(hcd, irq, 0);
if (ret)
goto err_add_hcd;
@@ -254,8 +254,6 @@ static int ohci_hcd_tmio_drv_probe(struct platform_device *dev)
if (cell->disable)
cell->disable(dev);
err_enable:
- dma_release_declared_memory(&dev->dev);
-err_dma_declare:
iounmap(hcd->regs);
err_ioremap_regs:
iounmap(tmio->ccr);
@@ -276,7 +274,6 @@ static int ohci_hcd_tmio_drv_remove(struct platform_device *dev)
tmio_stop_hc(dev);
if (cell->disable)
cell->disable(dev);
- dma_release_declared_memory(&dev->dev);
iounmap(hcd->regs);
iounmap(tmio->ccr);
usb_put_hcd(hcd);
--
2.17.1
next prev parent reply other threads:[~2019-05-29 10:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-29 10:28 [PATCH v7 0/5] prerequisites for device reserved local mem rework laurentiu.tudor
2019-05-29 10:28 ` [PATCH v7 1/5] lib/genalloc.c: Add gen_pool_dma_zalloc() for zeroed DMA allocations laurentiu.tudor
2019-05-29 10:28 ` [PATCH v7 2/5] USB: use genalloc for USB HCs with local memory laurentiu.tudor
2019-05-29 10:38 ` Greg KH
2019-05-29 11:15 ` Laurentiu Tudor
2019-05-29 11:23 ` Greg KH
2019-05-29 11:25 ` hch
2019-05-29 11:32 ` Greg KH
2019-05-29 10:28 ` [PATCH v7 3/5] usb: host: ohci-sm501: init genalloc for " laurentiu.tudor
2019-06-05 21:46 ` Guenter Roeck
2019-06-11 13:32 ` Guenter Roeck
2019-06-11 17:26 ` Fredrik Noring
2019-06-11 19:03 ` Guenter Roeck
2019-06-13 13:40 ` Fredrik Noring
2019-06-13 13:54 ` Guenter Roeck
2019-06-13 15:34 ` Fredrik Noring
2019-06-13 18:05 ` Guenter Roeck
2019-06-14 14:28 ` Fredrik Noring
2019-06-24 6:35 ` Christoph Hellwig
2019-06-24 12:59 ` Fredrik Noring
2019-06-25 6:00 ` Christoph Hellwig
2019-06-25 15:05 ` [PATCH 1/2] lib/genalloc.c: Add algorithm, align and zeroed family of DMA allocators Fredrik Noring
2019-06-25 15:08 ` [PATCH 2/2] usb: host: Fix excessive alignment restriction for local memory allocations Fredrik Noring
2019-06-25 20:54 ` Guenter Roeck
2019-06-25 20:54 ` [PATCH 1/2] lib/genalloc.c: Add algorithm, align and zeroed family of DMA allocators Guenter Roeck
2019-06-28 5:57 ` Christoph Hellwig
2019-06-18 10:48 ` [PATCH v7 3/5] usb: host: ohci-sm501: init genalloc for local memory Laurentiu Tudor
2019-05-29 10:28 ` laurentiu.tudor [this message]
2019-05-29 10:28 ` [PATCH v7 5/5] USB: drop HCD_LOCAL_MEM flag laurentiu.tudor
2019-05-29 11:34 ` [PATCH v7 0/5] prerequisites for device reserved local mem rework Greg KH
2019-05-29 11:37 ` Christoph Hellwig
2019-05-29 14:06 ` Laurentiu Tudor
2019-05-31 16:43 ` Christoph Hellwig
2019-05-31 17:06 ` Laurentiu Tudor
2019-06-04 14:16 ` Laurentiu Tudor
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=20190529102843.13174-5-laurentiu.tudor@nxp.com \
--to=laurentiu.tudor@nxp.com \
--cc=JuergenUrban@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=leoyang.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=marex@denx.de \
--cc=noring@nocrew.org \
--cc=robin.murphy@arm.com \
--cc=stern@rowland.harvard.edu \
/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).