dmaengine: at_xdmac: do not enable all cyclic channels
authorClaudiu Beznea <claudiu.beznea@microchip.com>
Tue, 14 Feb 2023 15:18:25 +0000 (17:18 +0200)
committerVinod Koul <vkoul@kernel.org>
Wed, 12 Apr 2023 17:48:44 +0000 (23:18 +0530)
Do not global enable all the cyclic channels in at_xdmac_resume(). Instead
save the global status in at_xdmac_suspend() and re-enable the cyclic
channel only if it was active before suspend.

Fixes: e1f7c9eee707 ("dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver")
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20230214151827.1050280-6-claudiu.beznea@microchip.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/at_xdmac.c

index 34c004a..96f1b69 100644 (file)
@@ -246,6 +246,7 @@ struct at_xdmac {
        int                     irq;
        struct clk              *clk;
        u32                     save_gim;
+       u32                     save_gs;
        struct dma_pool         *at_xdmac_desc_pool;
        const struct at_xdmac_layout    *layout;
        struct at_xdmac_chan    chan[];
@@ -2162,6 +2163,7 @@ static int __maybe_unused atmel_xdmac_suspend(struct device *dev)
                }
        }
        atxdmac->save_gim = at_xdmac_read(atxdmac, AT_XDMAC_GIM);
+       atxdmac->save_gs = at_xdmac_read(atxdmac, AT_XDMAC_GS);
 
        at_xdmac_off(atxdmac, false);
        pm_runtime_mark_last_busy(atxdmac->dev);
@@ -2224,7 +2226,8 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev)
                        at_xdmac_chan_write(atchan, AT_XDMAC_CNDC, atchan->save_cndc);
                        at_xdmac_chan_write(atchan, AT_XDMAC_CIE, atchan->save_cim);
                        wmb();
-                       at_xdmac_write(atxdmac, AT_XDMAC_GE, atchan->mask);
+                       if (atxdmac->save_gs & atchan->mask)
+                               at_xdmac_write(atxdmac, AT_XDMAC_GE, atchan->mask);
                }
        }