dmaengine: cppi41: Make CPPI 4.1 driver more generic
v3 cover dmaengine: cppi41: Make CPPI 4.1 driver more generic
Most of the patch of this series were part of "[PATCH 00/11] dmaengine: cppi41: Add dma support to da8xx"
This series intend to make the CPPI 4.1 more generic in order to add a new platform (the DA8xx).
To achieve that, all the IRQ code present in CPPI 4.1 driver has been moved to MUSB DSPS driver.
Other changes mainly update the glue layer and platform code to make the whole driver more generic.
This series is to apply on top of
"[PATCH v3 0/3] usb: musb: cppi41: Add a way to manage DMA irq".
Changes in v3:
- To prevent build error report from kbuild test robot, move the first patch of v2 to another patchset.
- Make CPPI 4.1 driver compatible with old and new binddings.
- Remove the patch updating the am33xx-usb binddings.
- Remove useless changes in patch 4
- Remove a patch that was fixing PM runtime issue that was happenning during a teardown. Tony Lindgren's patches fix the issue.
Alexandre Bailon (4):
dmaengine: cppi41: Remove usbss_mem
dmaengine: cppi41: rename platform variables
dmaengine: cppi41: Move some constants to glue layer
dmaengine: cppi41: init_sched(): Get number of channels from DT
drivers/dma/cppi41.c | 81 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 33 deletions(-)
Signature · 6 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20170119103705.13532-1-abailon-rdvid1DuHRBWk0Htik3J/[email protected]
PATCH v3 1/4 dmaengine: cppi41: Remove usbss_mem
In order to make CPPI 4.1 DMA driver more generic, accesses to USBSS have been removed. So it is not required anymore to map the "glue" register's.
Remove usbss_mem.
--- drivers/dma/cppi41.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/dma/cppi41.c +10 -8
@@ -131,7 +131,6 @@ struct cppi41_dd {u32 first_td_desc;struct cppi41_channel *chan_busy[ALLOC_DECS_NUM ]; -void __iomem *usbss_mem;void __iomem *ctrl_mem;void __iomem *sched_mem;void __iomem *qmgr_mem;
@@ -973,6 +972,7 @@ static int cppi41_dma_probe(struct platform_device *pdev)struct cppi41_dd *cdd;struct device *dev = &pdev->dev;const struct cppi_glue_infos *glue_info; +int index;int irq;int ret;
@@ -999,16 +999,20 @@ static int cppi41_dma_probe(struct platform_device *pdev)INIT_LIST_HEAD (&cdd->ddev.channels); cpp41_dma_info.dma_cap = cdd->ddev.cap_mask; - cdd->usbss_mem =of_iomap (dev->of_node,0 ); - cdd->ctrl_mem =of_iomap (dev->of_node,1 ); - cdd->sched_mem =of_iomap (dev->of_node,2 ); - cdd->qmgr_mem =of_iomap (dev->of_node,3 ); + index =of_property_match_string (dev->of_node, +"reg-names" ,"controller" ); +if (index <0 ) +return index; + + cdd->ctrl_mem =of_iomap (dev->of_node, index); + cdd->sched_mem =of_iomap (dev->of_node, index +1 ); + cdd->qmgr_mem =of_iomap (dev->of_node, index +2 );spin_lock_init (&cdd->lock);INIT_LIST_HEAD (&cdd->pending);platform_set_drvdata (pdev, cdd); -if (!cdd->usbss_mem || !cdd->ctrl_mem || !cdd->sched_mem || +if (!cdd->ctrl_mem || !cdd->sched_mem || !cdd->qmgr_mem)return -ENXIO ;
@@ -1068,7 +1072,6 @@ static int cppi41_dma_probe(struct platform_device *pdev) err_get_sync:pm_runtime_put_sync (dev);pm_runtime_disable (dev); -iounmap (cdd->usbss_mem);iounmap (cdd->ctrl_mem);iounmap (cdd->sched_mem);iounmap (cdd->qmgr_mem);
@@ -1090,7 +1093,6 @@ static int cppi41_dma_remove(struct platform_device *pdev)devm_free_irq (&pdev->dev, cdd->irq, cdd);cleanup_chans (cdd);deinit_cppi41 (&pdev->dev, cdd); -iounmap (cdd->usbss_mem);iounmap (cdd->ctrl_mem);iounmap (cdd->sched_mem);iounmap (cdd->qmgr_mem);
Signature · 6 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 2/4 dmaengine: cppi41: rename platform variables
In reply to a message not in the archiveCurrently, only the AM335x is supported by the driver. Though the driver has a glue layer to support different platforms, some platform variable names are not prefixed with the platform name. To facilitate the addition of a new platform,
rename some variables owned by the AM335x glue.
--- drivers/dma/cppi41.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/dma/cppi41.c +9 -8
@@ -147,7 +147,7 @@ struct cppi41_dd { };#define FIST_COMPLETION_QUEUE 93 -static struct chan_queues usb_queues_tx[] = { +static struct chan_queues am335x_usb_queues_tx[] = {/* USB0 ENDP 1 */ [0 ] = { .submit =32 , .complete =93 }, [1 ] = { .submit =34 , .complete =94 },
@@ -183,7 +183,7 @@ static struct chan_queues usb_queues_tx[] = { [29] = { .submit = 90, .complete = 139}, }; -static const struct chan_queues usb_queues_rx[] = { +static const struct chan_queues am335x_usb_queues_rx[] = {/* USB0 ENDP 1 */ [0 ] = { .submit =1 , .complete =109 }, [1 ] = { .submit =2 , .complete =110 },
@@ -910,8 +910,9 @@ static bool cpp41_dma_filter_fn(struct dma_chan *chan, void *param)else queues = cdd->queues_rx; -BUILD_BUG_ON (ARRAY_SIZE (usb_queues_rx) !=ARRAY_SIZE (usb_queues_tx)); -if (WARN_ON (cchan->port_num >ARRAY_SIZE (usb_queues_rx))) +BUILD_BUG_ON (ARRAY_SIZE (am335x_usb_queues_rx) != +ARRAY_SIZE (am335x_usb_queues_tx)); +if (WARN_ON (cchan->port_num >ARRAY_SIZE (am335x_usb_queues_rx)))return false; cchan->q_num = queues[cchan->port_num].submit;
@@ -939,15 +940,15 @@ static struct dma_chan *cppi41_dma_xlate(struct of_phandle_args *dma_spec, &dma_spec->args[0]); } -static const struct cppi_glue_infos usb_infos = { +static const struct cppi_glue_infos am335x_usb_infos = { .isr = cppi41_irq, - .queues_rx = usb_queues_rx, - .queues_tx = usb_queues_tx, + .queues_rx = am335x_usb_queues_rx, + .queues_tx = am335x_usb_queues_tx, .td_queue = { .submit =31 , .complete =0 }, };static const struct of_device_id cppi41_dma_ids[] = { - { .compatible ="ti,am3359-cppi41" , .data = &usb_infos}, + { .compatible ="ti,am3359-cppi41" , .data = &am335x_usb_infos}, {}, };MODULE_DEVICE_TABLE (of, cppi41_dma_ids);
Signature · 6 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 3/4 dmaengine: cppi41: Move some constants to glue layer
In reply to a message not in the archiveSome constants are defined and use by the driver whereas they are specifics to AM335x.
Add new variables to the glue layer, initialize them with the constants, and use them in the driver.
--- drivers/dma/cppi41.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/dma/cppi41.c +14 -6
@@ -68,7 +68,6 @@#define QMGR_MEMCTRL_IDX_SH 16#define QMGR_MEMCTRL_DESC_SH 8 -#define QMGR_NUM_PEND 5#define QMGR_PEND (x) (0x90 + (x) * 4)#define QMGR_PENDING_SLOT_Q (x) (x / 32)
@@ -138,6 +137,8 @@ struct cppi41_dd {const struct chan_queues *queues_rx;const struct chan_queues *queues_tx;struct chan_queues td_queue; +u16 first_completion_queue; +u16 qmgr_num_pend;struct list_head pending;/* Pending queued transfers */ spinlock_t lock;/* Lock for pending list */
@@ -146,7 +147,6 @@ struct cppi41_dd {unsigned int dma_tdfdq; }; -#define FIST_COMPLETION_QUEUE 93static struct chan_queues am335x_usb_queues_tx[] = {/* USB0 ENDP 1 */ [0 ] = { .submit =32 , .complete =93 },
@@ -224,6 +224,8 @@ struct cppi_glue_infos {const struct chan_queues *queues_rx;const struct chan_queues *queues_tx;struct chan_queues td_queue; +u16 first_completion_queue; +u16 qmgr_num_pend; };static struct cppi41_channel *to_cpp41_chan (struct dma_chan *c)
@@ -278,19 +280,21 @@ static u32 cppi41_pop_desc(struct cppi41_dd *cdd, unsigned queue_num)static irqreturn_t cppi41_irq (int irq,void *data) {struct cppi41_dd *cdd = data; +u16 first_completion_queue = cdd->first_completion_queue; +u16 qmgr_num_pend = cdd->qmgr_num_pend;struct cppi41_channel *c;int i; -for (i =QMGR_PENDING_SLOT_Q (FIST_COMPLETION_QUEUE ); i <QMGR_NUM_PEND ; +for (i =QMGR_PENDING_SLOT_Q (first_completion_queue); i < qmgr_num_pend; i++) {u32 val;u32 q_num; val =cppi_readl (cdd->qmgr_mem +QMGR_PEND (i)); -if (i ==QMGR_PENDING_SLOT_Q (FIST_COMPLETION_QUEUE ) && val) { +if (i ==QMGR_PENDING_SLOT_Q (first_completion_queue) && val) {u32 mask;/* set corresponding bit for completetion Q 93 */ - mask =1 <<QMGR_PENDING_BIT_Q (FIST_COMPLETION_QUEUE ); + mask =1 <<QMGR_PENDING_BIT_Q (first_completion_queue);/* not set all bits for queues less than Q 93 */ mask--;/* now invert and keep only Q 93+ set */
@@ -862,7 +866,7 @@ static int init_cppi41(struct device *dev, struct cppi41_dd *cdd)return -ENOMEM ;cppi_writel (cdd->scratch_phys, cdd->qmgr_mem +QMGR_LRAM0_BASE ); -cppi_writel (QMGR_SCRATCH_SIZE , cdd->qmgr_mem +QMGR_LRAM_SIZE ); +cppi_writel (TOTAL_DESCS_NUM , cdd->qmgr_mem +QMGR_LRAM_SIZE );cppi_writel (0 , cdd->qmgr_mem +QMGR_LRAM1_BASE ); ret =init_descs (dev, cdd);
@@ -945,6 +949,8 @@ static const struct cppi_glue_infos am335x_usb_infos = { .queues_rx = am335x_usb_queues_rx, .queues_tx = am335x_usb_queues_tx, .td_queue = { .submit = 31, .complete = 0 }, + .first_completion_queue = 93, + .qmgr_num_pend = 5, };static const struct of_device_id cppi41_dma_ids[] = {
@@ -1027,6 +1033,8 @@ static int cppi41_dma_probe(struct platform_device *pdev) cdd->queues_rx = glue_info->queues_rx; cdd->queues_tx = glue_info->queues_tx; cdd->td_queue = glue_info->td_queue; + cdd->qmgr_num_pend = glue_info->qmgr_num_pend; + cdd->first_completion_queue = glue_info->first_completion_queue; ret =init_cppi41 (dev, cdd);if (ret)
Signature · 6 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 4/4 dmaengine: cppi41: init_sched(): Get number of channels from DT
In reply to a message not in the archiveDespite the driver is already using DT to get the number of channels, init_sched() is using an hardcoded value to get it.
Use DT to get the number of channels.
--- drivers/dma/cppi41.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/dma/cppi41.c +15 -11
@@ -139,6 +139,8 @@ struct cppi41_dd {struct chan_queues td_queue;u16 first_completion_queue;u16 qmgr_num_pend; +u32 n_chans; +u8 platform;struct list_head pending;/* Pending queued transfers */ spinlock_t lock;/* Lock for pending list */
@@ -720,13 +722,8 @@ static int cppi41_add_chans(struct device *dev, struct cppi41_dd *cdd) {struct cppi41_channel *cchan;int i; -int ret; -u32 n_chans; +u32 n_chans = cdd->n_chans; - ret =of_property_read_u32 (dev->of_node,"#dma-channels" , - &n_chans); -if (ret) -return ret;/* * The channels can only be used as TX or as RX. So we add twice * that much dma channels because USB can only do RX or TX.
@@ -832,7 +829,7 @@ static int init_descs(struct device *dev, struct cppi41_dd *cdd)return 0 ; } -static void init_sched (struct cppi41_dd *cdd) +static void init_sched (struct device *dev,struct cppi41_dd *cdd) {unsigned ch;unsigned word;
@@ -840,7 +837,7 @@ static void init_sched(struct cppi41_dd *cdd) word =0 ;cppi_writel (0 , cdd->sched_mem +DMA_SCHED_CTRL ); -for (ch =0 ; ch <15 *2 ; ch +=2 ) { +for (ch =0 ; ch < cdd->n_chans; ch +=2 ) { reg =SCHED_ENTRY0_CHAN (ch); reg |=SCHED_ENTRY1_CHAN (ch) |SCHED_ENTRY1_IS_RX ;
@@ -850,7 +847,7 @@ static void init_sched(struct cppi41_dd *cdd)cppi_writel (reg, cdd->sched_mem +DMA_SCHED_WORD (word)); word++; } - reg =15 *2 *2 -1 ; + reg = cdd->n_chans *2 -1 ; reg |=DMA_SCHED_CTRL_EN ;cppi_writel (reg, cdd->sched_mem +DMA_SCHED_CTRL ); }
@@ -874,7 +871,8 @@ static int init_cppi41(struct device *dev, struct cppi41_dd *cdd) goto err_td;cppi_writel (cdd->td_queue.submit, cdd->ctrl_mem +DMA_TDFDQ ); -init_sched (cdd); +init_sched (dev, cdd); +return 0 ; err_td:deinit_cppi41 (dev, cdd);
@@ -1036,6 +1034,11 @@ static int cppi41_dma_probe(struct platform_device *pdev) cdd->qmgr_num_pend = glue_info->qmgr_num_pend; cdd->first_completion_queue = glue_info->first_completion_queue; + ret =of_property_read_u32 (dev->of_node, +"#dma-channels" , &cdd->n_chans); +if (ret) + goto err_get_n_chans; + ret =init_cppi41 (dev, cdd);if (ret) goto err_init_cppi;
@@ -1078,6 +1081,7 @@ static int cppi41_dma_probe(struct platform_device *pdev)deinit_cppi41 (dev, cdd); err_init_cppi:pm_runtime_dont_use_autosuspend (dev); +err_get_n_chans: err_get_sync:pm_runtime_put_sync (dev);pm_runtime_disable (dev);
@@ -1134,7 +1138,7 @@ static int __maybe_unused cppi41_resume(struct device *dev)if (!c->is_tx)cppi_writel (c->q_num, c->gcr_reg +RXHPCRA0 ); -init_sched (cdd); +init_sched (dev, cdd);cppi_writel (cdd->dma_tdfdq, cdd->ctrl_mem +DMA_TDFDQ );cppi_writel (cdd->scratch_phys, cdd->qmgr_mem +QMGR_LRAM0_BASE );
Signature · 6 lines
2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 20170119103705.13532-5-abailon-rdvid1DuHRBWk0Htik3J/[email protected]
Re: [PATCH v3 4/4] dmaengine: cppi41: init_sched(): Get number of channels from DT
Quoted 13 lines · Alexandre Bailon
Despite the driver is already using DT to get the number of channels,
init_sched()is using an hardcoded value to get it.
Use DT to get the number of channels.--- drivers/dma/cppi41.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)drivers/dma/cppi41.c +0
-0
[...]
drivers/dma/cppi41.c static int init_descs(struct device *dev, struct cppi41_dd *cdd) · line 832
Quoted 6 lines
drivers/dma/cppi41.c +1
-1@@ -832,7 +829,7 @@ static int init_descs(struct device *dev, struct cppi41_dd *cdd)return 0 ; } -static void init_sched (struct cppi41_dd *cdd) +static void init_sched (struct device *dev,struct cppi41_dd *cdd)
I don't see where 'dev' is used...
Quoted 13 lines
drivers/dma/cppi41.c +1
-1{unsigned ch;unsigned word;@@ -840,7 +837,7 @@ static void init_sched(struct cppi41_dd *cdd) word =0 ;cppi_writel (0 , cdd->sched_mem +DMA_SCHED_CTRL ); -for (ch =0 ; ch <15 *2 ; ch +=2 ) { +for (ch =0 ; ch < cdd->n_chans; ch +=2 ) { reg =SCHED_ENTRY0_CHAN (ch); reg |=SCHED_ENTRY1_CHAN (ch) |SCHED_ENTRY1_IS_RX ;
drivers/dma/cppi41.c static void init_sched(struct cppi41_dd *cdd) · line 853
Quoted 8 lines
drivers/dma/cppi41.c +1
-1@@ -850,7 +847,7 @@ static void init_sched(struct cppi41_dd *cdd)cppi_writel (reg, cdd->sched_mem +DMA_SCHED_WORD (word)); word++; } - reg =15 *2 *2 -1 ; + reg = cdd->n_chans *2 -1 ; reg |=DMA_SCHED_CTRL_EN ;cppi_writel (reg, cdd->sched_mem +DMA_SCHED_CTRL ); }
[...]
MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 1 line · Alexandre Bailon
- Make CPPI 4.1 driver compatible with old and new binddings.
Thanks for fixing that, that removes a dependency with the dts changes.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html