diff options
| author | Sasha Finkelstein <fnkl.kernel@gmail.com> | 2024-11-24 16:48:28 +0100 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2024-12-04 17:42:27 +0530 |
| commit | 8d55e8a16f019211163f1180fd9f9fbe05901900 (patch) | |
| tree | 05288b0d0caab9ada7d74560fe8933429254ed63 /drivers/dma | |
| parent | 790fb9956eead785b720ccc0851f09a5ca3a093e (diff) | |
| download | linux-8d55e8a16f019211163f1180fd9f9fbe05901900.tar.gz linux-8d55e8a16f019211163f1180fd9f9fbe05901900.tar.bz2 linux-8d55e8a16f019211163f1180fd9f9fbe05901900.zip | |
dmaengine: apple-admac: Avoid accessing registers in probe
The ADMAC attached to the AOP has complex power sequencing, and is
power gated when the probe callback runs. Move the register reads
to other functions, where we can guarantee that the hardware is
switched on.
Fixes: 568aa6dd641f ("dmaengine: apple-admac: Allocate cache SRAM to channels")
Signed-off-by: Sasha Finkelstein <fnkl.kernel@gmail.com>
Link: https://lore.kernel.org/r/20241124-admac-power-v1-1-58f2165a4d55@gmail.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/apple-admac.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index c499173d80b2..bd49f0374291 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -153,6 +153,8 @@ static int admac_alloc_sram_carveout(struct admac_data *ad, { struct admac_sram *sram; int i, ret = 0, nblocks; + ad->txcache.size = readl_relaxed(ad->base + REG_TX_SRAM_SIZE); + ad->rxcache.size = readl_relaxed(ad->base + REG_RX_SRAM_SIZE); if (dir == DMA_MEM_TO_DEV) sram = &ad->txcache; @@ -912,12 +914,7 @@ static int admac_probe(struct platform_device *pdev) goto free_irq; } - ad->txcache.size = readl_relaxed(ad->base + REG_TX_SRAM_SIZE); - ad->rxcache.size = readl_relaxed(ad->base + REG_RX_SRAM_SIZE); - dev_info(&pdev->dev, "Audio DMA Controller\n"); - dev_info(&pdev->dev, "imprint %x TX cache %u RX cache %u\n", - readl_relaxed(ad->base + REG_IMPRINT), ad->txcache.size, ad->rxcache.size); return 0; |