Blackfin: fix DMA/cache bug when resuming from suspend to RAM

The dma_memcpy() function takes care of flushing different caches for us.
Normally this is what we want, but when resuming from mem, we don't yet
have caches enabled.  If these functions happen to be placed into L1 mem
(which is what we're trying to relocate), then things aren't going to
work.  So define a non-cache dma_memcpy() variant to utilize in situations
like this.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

1 files changed, 9 insertions, 8 deletions

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index ea7f95f6bb4c..09c1fb410748 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -61,10 +61,11 @@ void bfin_pm_suspend_standby_enter(void)
 
 int bf53x_suspend_l1_mem(unsigned char *memptr)
 {
-        dma_memcpy(memptr, (const void *) L1_CODE_START, L1_CODE_LENGTH);
-        dma_memcpy(memptr + L1_CODE_LENGTH, (const void *) L1_DATA_A_START,
-                        L1_DATA_A_LENGTH);
-        dma_memcpy(memptr + L1_CODE_LENGTH + L1_DATA_A_LENGTH,
+        dma_memcpy_nocache(memptr, (const void *) L1_CODE_START,
+                        L1_CODE_LENGTH);
+        dma_memcpy_nocache(memptr + L1_CODE_LENGTH,
+                        (const void *) L1_DATA_A_START, L1_DATA_A_LENGTH);
+        dma_memcpy_nocache(memptr + L1_CODE_LENGTH + L1_DATA_A_LENGTH,
                         (const void *) L1_DATA_B_START, L1_DATA_B_LENGTH);
         memcpy(memptr + L1_CODE_LENGTH + L1_DATA_A_LENGTH +
                         L1_DATA_B_LENGTH, (const void *) L1_SCRATCH_START,
@@ -75,10 +76,10 @@ int bf53x_suspend_l1_mem(unsigned char *memptr)
 
 int bf53x_resume_l1_mem(unsigned char *memptr)
 {
-        dma_memcpy((void *) L1_CODE_START, memptr, L1_CODE_LENGTH);
-        dma_memcpy((void *) L1_DATA_A_START, memptr + L1_CODE_LENGTH,
+        dma_memcpy_nocache((void *) L1_CODE_START, memptr, L1_CODE_LENGTH);
+        dma_memcpy_nocache((void *) L1_DATA_A_START, memptr + L1_CODE_LENGTH,
                         L1_DATA_A_LENGTH);
-        dma_memcpy((void *) L1_DATA_B_START, memptr + L1_CODE_LENGTH +
+        dma_memcpy_nocache((void *) L1_DATA_B_START, memptr + L1_CODE_LENGTH +
                         L1_DATA_A_LENGTH, L1_DATA_B_LENGTH);
         memcpy((void *) L1_SCRATCH_START, memptr + L1_CODE_LENGTH +
                         L1_DATA_A_LENGTH + L1_DATA_B_LENGTH, L1_SCRATCH_LENGTH);
@@ -167,7 +168,7 @@ int bfin_pm_suspend_mem_enter(void)
         _disable_icplb();
         bf53x_suspend_l1_mem(memptr);
 
-        do_hibernate(wakeup | vr_wakeup);       /* Goodbye */
+        do_hibernate(wakeup | vr_wakeup);       /* See you later! */
 
         bf53x_resume_l1_mem(memptr);