[ Sasha's backport helper bot ]
Hi,
Summary of potential issues: ⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 31f4b28f6c41f734957ea66ac84c6abb69e696f0
WARNING: Author mismatch between patch and found commit: Backport author: Hardik Gohilhgohil@mvista.com Commit author: Peter Ujfalusipeter.ujfalusi@ti.com
Status in newer kernel trees: 6.14.y | Present (exact SHA1) 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1) 5.15.y | Present (exact SHA1) 5.10.y | Present (exact SHA1)
Note: The patch differs from the upstream commit: --- 1: 31f4b28f6c41f ! 1: b6e5827c1f15c dmaengine: ti: edma: Add support for handling reserved channels @@ Commit message Signed-off-by: Peter Ujfalusi peter.ujfalusi@ti.com Link: https://lore.kernel.org/r/20191025073056.25450-4-peter.ujfalusi@ti.com Signed-off-by: Vinod Koul vkoul@kernel.org + Signed-off-by: Hardik Gohil hgohil@mvista.com
## drivers/dma/ti/edma.c ## @@ drivers/dma/ti/edma.c: struct edma_cc { @@ drivers/dma/ti/edma.c: static int edma_alloc_channel(struct edma_chan *echan, edma_or_array2(ecc, EDMA_DRAE, 0, EDMA_REG_ARRAY_INDEX(channel), EDMA_CHANNEL_BIT(channel)); @@ drivers/dma/ti/edma.c: static int edma_probe(struct platform_device *pdev) - { struct edma_soc_info *info = pdev->dev.platform_data; s8 (*queue_priority_mapping)[2]; + int i, off; - const s16 (*rsv_slots)[2]; -+ const s16 (*reserved)[2]; - int i, irq; ++ const s16 (*reserved)[2]; + const s16 (*xbar_chans)[2]; + int irq; char *irq_name; - struct resource *mem; @@ drivers/dma/ti/edma.c: static int edma_probe(struct platform_device *pdev) if (!ecc->slot_inuse) return -ENOMEM; @@ drivers/dma/ti/edma.c: static int edma_probe(struct platform_device *pdev)
ecc->tc_list = devm_kcalloc(dev, ecc->num_tc, @@ drivers/dma/ti/edma.c: static int edma_probe(struct platform_device *pdev) - info->default_queue = i; } + of_node_put(tc_args.np); } + + /* See if we have optional dma-channel-mask array */ ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.4.y | Success | Success |