kevin/linux
1
Fork 0
Code

dma: dw-axi-dmac: support per channel interrupt

Browse Source 
Hardware might not support a single combined interrupt that covers all
channels. In that case we have to deal with interrupt per channel. Add
support for that configuration.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Link: https://lore.kernel.org/r/ebab52e886ef1adc3c40e636aeb1ba3adfe2e578.1711453387.git.baruchs-c@neureality.ai
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Baruch Siach 2024-03-26 13:43:07 +02:00 committed by Vinod Koul
parent 333e11bf47
commit e32634f466
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
View File

@ -1443,6 +1443,24 @@ static int parse_device_properties(struct axi_dma_chip *chip)
return 0; return 0;
} }
static int axi_req_irqs(struct platform_device *pdev, struct axi_dma_chip *chip)
{
int irq_count = platform_irq_count(pdev);
int ret;
for (int i = 0; i < irq_count; i++) {
chip->irq[i] = platform_get_irq(pdev, i);
if (chip->irq[i] < 0)
return chip->irq[i];
ret = devm_request_irq(chip->dev, chip->irq[i], dw_axi_dma_interrupt,
IRQF_SHARED, KBUILD_MODNAME, chip);
if (ret < 0)
return ret;
}
return 0;
}
static int dw_probe(struct platform_device *pdev) static int dw_probe(struct platform_device *pdev)
{ {
struct axi_dma_chip *chip; struct axi_dma_chip *chip;
@ -1469,10 +1487,6 @@ static int dw_probe(struct platform_device *pdev)
chip->dev = &pdev->dev; chip->dev = &pdev->dev;
chip->dw->hdata = hdata; chip->dw->hdata = hdata;
chip->irq = platform_get_irq(pdev, 0);
if (chip->irq < 0)
return chip->irq;
chip->regs = devm_platform_ioremap_resource(pdev, 0); chip->regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(chip->regs)) if (IS_ERR(chip->regs))
return PTR_ERR(chip->regs); return PTR_ERR(chip->regs);
@ -1513,8 +1527,7 @@ static int dw_probe(struct platform_device *pdev)
if (!dw->chan) if (!dw->chan)
return -ENOMEM; return -ENOMEM;
ret = devm_request_irq(chip->dev, chip->irq, dw_axi_dma_interrupt, ret = axi_req_irqs(pdev, chip);
IRQF_SHARED, KBUILD_MODNAME, chip);
if (ret) if (ret)
return ret; return ret;
@ -1627,7 +1640,9 @@ static void dw_remove(struct platform_device *pdev)
pm_runtime_disable(chip->dev); pm_runtime_disable(chip->dev);
axi_dma_suspend(chip); axi_dma_suspend(chip);
devm_free_irq(chip->dev, chip->irq, chip); for (i = 0; i < DMAC_MAX_CHANNELS; i++)
if (chip->irq[i] > 0)
devm_free_irq(chip->dev, chip->irq[i], chip);
of_dma_controller_free(chip->dev->of_node); of_dma_controller_free(chip->dev->of_node);

2
drivers/dma/dw-axi-dmac/dw-axi-dmac.h
View File

@ -65,7 +65,7 @@ struct dw_axi_dma {
struct axi_dma_chip { struct axi_dma_chip {
struct device *dev; struct device *dev;
int irq; int irq[DMAC_MAX_CHANNELS];
void __iomem *regs; void __iomem *regs;
void __iomem *apb_regs; void __iomem *apb_regs;
struct clk *core_clk; struct clk *core_clk;