]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 May 2023 09:35:54 +0000 (11:35 +0200)
[ Upstream commit f8435befd81dd85b7b610598551fadf675849bc1 ]

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: 73a1e1f6d727 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/dma/at_xdmac.c

index a406b3c0d170acd7a9e4a85351cbd856dfe0eab5..fdf3b5be2d50d4f3be11bb928a2942e5483a0e99 100644 (file)
@@ -212,6 +212,7 @@ struct at_xdmac {
        int                     irq;
        struct clk              *clk;
        u32                     save_gim;
+       u32                     save_gs;
        struct dma_pool         *at_xdmac_desc_pool;
        struct at_xdmac_chan    chan[0];
 };
@@ -1922,6 +1923,7 @@ static int 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);
        clk_disable_unprepare(atxdmac->clk);
@@ -1958,7 +1960,8 @@ static int 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);
                }
        }
        return 0;