Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1443423
| From | Peter Ujfalusi <peter.ujfalusi@ti.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 4/7] dmaengine: omap-dma: Dynamically allocate memory for lch_map |
| Date | 2016-07-14 14:50 +0200 |
| Message-ID | <rUOfw-1kh-33@gated-at.bofh.it> (permalink) |
| References | <rUOfv-1kh-5@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On OMAP1 platforms we do not have 32 channels available. Allocate the
lch_map based on the available channels. This way we are not going to have
more visible channels then it is available on the platform.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
drivers/dma/omap-dma.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
index 6d134252ed61..c026642fc66a 100644
--- a/drivers/dma/omap-dma.c
+++ b/drivers/dma/omap-dma.c
@@ -35,7 +35,7 @@ struct omap_dmadev {
unsigned dma_requests;
spinlock_t irq_lock;
uint32_t irq_enable_mask;
- struct omap_chan *lch_map[OMAP_SDMA_CHANNELS];
+ struct omap_chan **lch_map;
};
struct omap_chan {
@@ -1223,16 +1223,24 @@ static int omap_dma_probe(struct platform_device *pdev)
spin_lock_init(&od->lock);
spin_lock_init(&od->irq_lock);
- od->dma_requests = OMAP_SDMA_REQUESTS;
- if (pdev->dev.of_node && of_property_read_u32(pdev->dev.of_node,
- "dma-requests",
- &od->dma_requests)) {
+ if (!pdev->dev.of_node) {
+ od->dma_requests = od->plat->dma_attr->lch_count;
+ if (unlikely(!od->dma_requests))
+ od->dma_requests = OMAP_SDMA_REQUESTS;
+ } else if (of_property_read_u32(pdev->dev.of_node, "dma-requests",
+ &od->dma_requests)) {
dev_info(&pdev->dev,
"Missing dma-requests property, using %u.\n",
OMAP_SDMA_REQUESTS);
+ od->dma_requests = OMAP_SDMA_REQUESTS;
}
- for (i = 0; i < OMAP_SDMA_CHANNELS; i++) {
+ od->lch_map = devm_kcalloc(&pdev->dev, od->dma_requests,
+ sizeof(*od->lch_map), GFP_KERNEL);
+ if (!od->lch_map)
+ return -ENOMEM;
+
+ for (i = 0; i < od->dma_requests; i++) {
rc = omap_dma_chan_init(od);
if (rc) {
omap_dma_free(od);
--
2.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] dmaengine:omap-dma: Linked List transfer for slave_sg Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
[PATCH 1/7] dmaengine: omap-dma: Simplify omap_dma_start_sg parameter list Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
[PATCH 7/7] dmaengine: omap-dma: Support for LinkedList transfer of slave_sg Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
Re: [PATCH 7/7] dmaengine: omap-dma: Support for LinkedList transfer of slave_sg Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-18 12:50 +0200
Re: [PATCH 7/7] dmaengine: omap-dma: Support for LinkedList transfer of slave_sg Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-18 13:20 +0200
[PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-18 12:40 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-19 14:40 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-19 18:30 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-19 21:30 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Vinod Koul <vinod.koul@intel.com> - 2016-07-24 09:40 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Robert Jarzmik <robert.jarzmik@free.fr> - 2016-07-20 08:30 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-21 11:40 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-21 11:40 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-21 11:50 +0200
Re: [PATCH 2/7] dmaengine: omap-dma: Complete the cookie first on transfer completion Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-22 13:10 +0200
[PATCH 4/7] dmaengine: omap-dma: Dynamically allocate memory for lch_map Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
[PATCH 6/7] dmaengine: omap-dma: Use pointer to omap_sg in slave_sg setup's loop Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-14 14:50 +0200
Re: [PATCH 0/7] dmaengine:omap-dma: Linked List transfer for slave_sg Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-18 12:40 +0200
Re: [PATCH 0/7] dmaengine:omap-dma: Linked List transfer for slave_sg Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-18 14:10 +0200
Re: [PATCH 0/7] dmaengine:omap-dma: Linked List transfer for slave_sg Russell King - ARM Linux <linux@armlinux.org.uk> - 2016-07-18 14:30 +0200
Re: [PATCH 0/7] dmaengine:omap-dma: Linked List transfer for slave_sg Peter Ujfalusi <peter.ujfalusi@ti.com> - 2016-07-18 14:40 +0200
csiph-web