RE: [RFC PATCH v3] Consolidate SRAM support
From: Nori, Sekhar <hidden>
Date: 2011-05-17 13:06:33
Also in:
linux-arm-kernel
Subsystem:
arm port, the rest, ti davinci machine support · Maintainers:
Russell King, Linus Torvalds, Bartosz Golaszewski
Hi Russell, On Thu, May 12, 2011 at 23:15:46, Russell King - ARM Linux wrote:
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-davinci/pm.c b/arch/arm/mach-davinci/pm.c index 1bd73a0..c2f9767 100644 --- a/arch/arm/mach-davinci/pm.c +++ b/arch/arm/mach-davinci/pm.c
[...]
quoted hunk ↗ jump to hunk
@@ -123,14 +118,14 @@ static int __init davinci_pm_probe(struct platform_device *pdev) return -ENOENT; } - davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL); - if (!davinci_sram_suspend) { + davinci_sram_suspend_mem = pv_pool_alloc(davinci_pv_pool, + davinci_cpu_suspend_sz, NULL); + if (!davinci_sram_suspend_mem) { dev_err(&pdev->dev, "cannot allocate SRAM memory\n"); return -ENOMEM; } - - davinci_sram_push(davinci_sram_suspend, davinci_cpu_suspend, - davinci_cpu_suspend_sz); + davinci_sram_suspend = fncpy(davinci_sram_suspend_mem, + davinci_cpu_suspend, davinci_cpu_suspend_sz);
This gave these build errors: arch/arm/mach-davinci/pm.c: In function 'davinci_pm_probe': arch/arm/mach-davinci/pm.c:127: error: lvalue required in asm statement arch/arm/mach-davinci/pm.c:127: error: invalid lvalue in asm output 0 make[1]: *** [arch/arm/mach-davinci/pm.o] Error 1 Replacing davinci_cpu_suspend with &davinci_cpu_suspend fixed the issue. With that change done, tested suspend-to-RAM on DA850 platform. Also tested audio driver on DM365 platform with IRAM buffers enabled. Can you also fold the following patch in? Without this the kernel panics when suspend-to-RAM is enabled.
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index fb5e72b..2cef533 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S@@ -37,6 +37,7 @@ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31) .text + .align 3 /* * Move DaVinci into deep sleep state *
Thanks, Sekhar