From: Sasha Levin Date: Mon, 15 May 2023 01:14:39 +0000 (-0400) Subject: Drop dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch X-Git-Tag: v4.14.315~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e9a4bf0480d2f64266795d12a5f424b681ae086;p=thirdparty%2Fkernel%2Fstable-queue.git Drop dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch Signed-off-by: Sasha Levin --- diff --git a/queue-6.2/dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch b/queue-6.2/dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch deleted file mode 100644 index 35e7332c033..00000000000 --- a/queue-6.2/dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b2286db5601a541156c242bdebe352896f919ea4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 14 Feb 2023 17:18:24 +0200 -Subject: dmaengine: at_xdmac: restore the content of grws register - -From: Claudiu Beznea - -[ Upstream commit 7c5eb63d16b01c202aaa95f374ae15a807745a73 ] - -In case the system suspends to a deep sleep state where power to DMA -controller is cut-off we need to restore the content of GRWS register. -This is a write only register and writing bit X tells the controller -to suspend read and write requests for channel X. Thus set GRWS before -restoring the content of GE (Global Enable) regiter. - -Fixes: e1f7c9eee707 ("dmaengine: at_xdmac: creation of the atmel eXtended DMA Controller driver") -Signed-off-by: Claudiu Beznea -Link: https://lore.kernel.org/r/20230214151827.1050280-5-claudiu.beznea@microchip.com -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/dma/at_xdmac.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c -index bfc8ae2143957..7bcfe3db28a47 100644 ---- a/drivers/dma/at_xdmac.c -+++ b/drivers/dma/at_xdmac.c -@@ -2025,6 +2025,15 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev) - if (at_xdmac_chan_is_cyclic(atchan)) { - if (at_xdmac_chan_is_paused(atchan)) - at_xdmac_device_resume(chan); -+ -+ /* -+ * We may resume from a deep sleep state where power -+ * to DMA controller is cut-off. Thus, restore the -+ * suspend state of channels set though dmaengine API. -+ */ -+ else if (at_xdmac_chan_is_paused(atchan)) -+ at_xdmac_device_pause_set(atxdmac, atchan); -+ - at_xdmac_chan_write(atchan, AT_XDMAC_CNDA, atchan->save_cnda); - at_xdmac_chan_write(atchan, AT_XDMAC_CNDC, atchan->save_cndc); - at_xdmac_chan_write(atchan, AT_XDMAC_CIE, atchan->save_cim); --- -2.39.2 - diff --git a/queue-6.2/series b/queue-6.2/series index 44662e81956..0eab3e4360b 100644 --- a/queue-6.2/series +++ b/queue-6.2/series @@ -119,7 +119,6 @@ ksmbd-block-asynchronous-requests-when-making-a-dela.patch ksmbd-destroy-expired-sessions.patch ksmbd-fix-racy-issue-from-smb2-close-and-logoff-with.patch wifi-iwlwifi-mvm-fix-potential-memory-leak.patch -dmaengine-at_xdmac-restore-the-content-of-grws-regis.patch cifs-check-only-tcon-status-on-tcon-related-function.patch cifs-avoid-potential-races-when-handling-multiple-df.patch netfilter-nf_tables-extended-netlink-error-reporting.patch