ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Subsystems (5)
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.html
arch/arm/mach-exynos/include/mach/regs-clock.h | 15 +++ arch/arm/mach-exynos/include/mach/regs-pmu.h | 84 ++++++++++++ arch/arm/mach-exynos/pm.c | 151 +++++++++++++++++++--- arch/arm/mach-exynos/pmu.c | 165 ++++++++++++++++++++++++ 4 files changed, 396 insertions(+), 19 deletions(-)
arch/arm/mach-exynos/include/mach/regs-clock.h +15 -0
@@ -363,6 +363,21 @@#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4)#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +/* For EXYNOS5420 */ +#define EXYNOS5420_CLKSRC_MASK_CPERI EXYNOS_CLKREG(0x04300) +#define EXYNOS5420_CLKSRC_MASK_TOP0 EXYNOS_CLKREG(0x10300) +#define EXYNOS5420_CLKSRC_MASK_TOP1 EXYNOS_CLKREG(0x10304) +#define EXYNOS5420_CLKSRC_MASK_TOP2 EXYNOS_CLKREG(0x10308) +#define EXYNOS5420_CLKSRC_MASK_TOP7 EXYNOS_CLKREG(0x1031C) +#define EXYNOS5420_CLKSRC_MASK_DISP10 EXYNOS_CLKREG(0x1032C) +#define EXYNOS5420_CLKSRC_MASK_MAU EXYNOS_CLKREG(0x10334) +#define EXYNOS5420_CLKSRC_MASK_FSYS EXYNOS_CLKREG(0x10340) +#define EXYNOS5420_CLKSRC_MASK_PERIC0 EXYNOS_CLKREG(0x10350) +#define EXYNOS5420_CLKSRC_MASK_PERIC1 EXYNOS_CLKREG(0x10354) +#define EXYNOS5420_CLKSRC_MASK_ISP EXYNOS_CLKREG(0x10370) +#define EXYNOS5420_CLKGATE_BUS_DISP1 EXYNOS_CLKREG(0x10728) +#define EXYNOS5420_CLKGATE_IP_PERIC EXYNOS_CLKREG(0x10950) +/* Compatibility defines and inclusion */ #include <mach/regs-pmu.h>
arch/arm/mach-exynos/include/mach/regs-pmu.h +84 -0
119 lines not on this page · raw message
arch/arm/mach-exynos/pm.c +132 -19
240 lines not on this page · raw message
arch/arm/mach-exynos/pmu.c +165 -0
195 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 2/2 ARM: dts: Add node for GPIO keys on SMDK5420
Add support for the suspend/resume button (SW7) on SMDK5420 using gpio-keys driver.
--- arch/arm/boot/dts/exynos5420-smdk5420.dts | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/arm/boot/dts/exynos5420-smdk5420.dts +11 -0
@@ -120,4 +120,15 @@ reg = <0x50>; }; }; + + gpio-keys { + compatible = "gpio-keys"; + + wakeup { + label = "SW7"; + gpios = <&gpx0 0 1>; + linux,code = <143>; /* KEY_WAKEUP */ + gpio-key,wakeup; + }; + }; };
Signature · 1 line
1.7.9.5
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Abhilash KesavanHi,
Quoted 7 lines · Abhilash Kesavan
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
Signed-off-by Abhilash Kesavan <[email protected]>---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.html
[...]
Quoted 5 lines
arch/arm/mach-exynos/pm.c +0
-1@@ -253,10 +316,20 @@ static int exynos_pm_suspend(void)/* Setting SEQ_OPTION register */ - tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 );
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 327
Quoted 10 lines
arch/arm/mach-exynos/pm.c +9
-1-__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); +if (soc_is_exynos5420 ()) { + cluster_id = (read_cpuid (CPUID_MPIDR ) >>8 ) &0xf ; +if (!cluster_id) +__raw_writel (EXYNOS5420_ARM_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); +else +__raw_writel (EXYNOS5420_KFC_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); + }else if (soc_is_exynos5250 ()) {
Adding a check here for EXYNOS5250 doesn't look correct (the old code behavior for older EXYNOYS SoCs should be preserved).
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 330
Quoted 3 lines
arch/arm/mach-exynos/pm.c +3
-0+ tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); +__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); + }
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Bartlomiej,
Quoted 18 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 7 lines · Abhilash Kesavan
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
Signed-off-by Abhilash Kesavan <[email protected]>---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.html[...]
Quoted 4 lines
arch/arm/mach-exynos/pm.c +0
-0@@ -253,10 +316,20 @@ static int exynos_pm_suspend(void)/* Setting SEQ_OPTION register */
Quoted 15 lines
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 327
Quoted 11 lines
arch/arm/mach-exynos/pm.c +9
-2- tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); -__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); +if (soc_is_exynos5420 ()) { + cluster_id = (read_cpuid (CPUID_MPIDR ) >>8 ) &0xf ; +if (!cluster_id) +__raw_writel (EXYNOS5420_ARM_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); +else +__raw_writel (EXYNOS5420_KFC_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); + }else if (soc_is_exynos5250 ()) {Adding a check here for EXYNOS5250 doesn't look correct (the old code behavior for older EXYNOYS SoCs should be preserved).
Yes, will fix this in the next version.
Quoted 5 lines
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 330
Quoted 4 lines
arch/arm/mach-exynos/pm.c +3
-0+ tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); +__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); + }
Quoted 7 lines
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Thanks,
Abhilash
Quoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..
Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit 95402d816b9f1a05ce633f7ff64b4c939c142482
Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700
arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
BUG=chrome-os-partner:20523
TEST=Run suspend_stress_test on Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error in exynos_cpu_suspend().
Reviewed-on: https://gerrit.chromium.org/gerrit/61948
arch/arm/mach-exynos/pm.c +1 -1
@@ -126,7 +126,7 @@ static int exynos_cpu_suspend(unsigned long arg)* Disable all interrupts. eints will still be active during * suspend so its ok to mask everything here */ -if (soc_is_exynos5250 ()) +if (soc_is_exynos5250 () ||soc_is_exynos5420 ())__raw_writel (0x0 ,S5P_VA_GIC_DIST +GIC_DIST_CTRL );
Quoted 63 lines · Abhilash Kesavan
Hi Bartlomiej,
Quoted 18 lines · Bartlomiej Zolnierkiewicz
Hi,
Quoted 7 lines · Abhilash Kesavan
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
Signed-off-by Abhilash Kesavan <[email protected]>---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.html[...]
Quoted 4 lines
(quoted diff) +0
-0@@ -253,10 +316,20 @@ static int exynos_pm_suspend(void) /* Setting SEQ_OPTION register */Quoted 15 lines
Review static int exynos_pm_suspend(void) · line 327
Quoted 11 lines
(quoted diff) +9
-2- tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0); - __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION); + if (soc_is_exynos5420()) { + cluster_id = (read_cpuid(CPUID_MPIDR) >> 8) & 0xf; + if (!cluster_id) + __raw_writel(EXYNOS5420_ARM_USE_STANDBY_WFI0, + S5P_CENTRAL_SEQ_OPTION); + else + __raw_writel(EXYNOS5420_KFC_USE_STANDBY_WFI0, + S5P_CENTRAL_SEQ_OPTION); + } else if (soc_is_exynos5250()) {Adding a check here for EXYNOS5250 doesn't look correct (the old code behavior for older EXYNOYS SoCs should be preserved).
Yes, will fix this in the next version.
Quoted 5 lines
Review static int exynos_pm_suspend(void) · line 330
Quoted 4 lines
(quoted diff) +3
-0+ tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0); + __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION); + }Quoted 7 lines
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung ElectronicsThanks,
AbhilashQuoted 4 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 18 lines
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().
Quoted 5 lines
Change-Id Ia2d963191f4e5485beb295b28f128f2ce256f987Signed-off-by Andrew Bresticker <[email protected]>Reviewed-on: https://gerrit.chromium.org/gerrit/61948
Reviewed-by Simon Glass <[email protected]>
Regards,
Abhilash
_______________________________________________
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Abhilash,
Quoted 15 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
Quoted 5 lines
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 1 line
Ok. Sure .. Thanks for details !
Quoted 33 lines
Quoted 17 lines
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().Quoted 5 lines
Change-Id Ia2d963191f4e5485beb295b28f128f2ce256f987Signed-off-by Andrew Bresticker <[email protected]>Reviewed-on: https://gerrit.chromium.org/gerrit/61948
Reviewed-by Simon Glass <[email protected]>Regards,
Abhilash
_______________________________________________Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Abhilash KesavanQuoted 15 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
Quoted 4 lines
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Hold on, you're claiming that this patch you've posted has only seen very limited testing, and that you are aware of failures?
Don't merge known-broken code into the mainline kernel.
-Olof
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Quoted 22 lines · On Friday 20 of December 2013 13:22:06 Olof Johansson wrote:
Quoted 15 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
Quoted 4 lines
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 4 lines
Hold on, you're claiming that this patch you've posted has only seen very limited testing, and that you are aware of failures?
Don't merge known-broken code into the mainline kernel.
I'm afraid that a "failed suspend" does not really mean a failure here, but let me wait for clarification of things I asked in another part of this thread.
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Quoted 23 lines · Tomasz Figa
Quoted 22 lines · On Friday 20 of December 2013 13:22:06 Olof Johansson wrote:
Quoted 19 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 8 lines
Quoted 4 lines
Hold on, you're claiming that this patch you've posted has only seen very limited testing, and that you are aware of failures?
Don't merge known-broken code into the mainline kernel.
I'm afraid that a "failed suspend" does not really mean a failure here, but let me wait for clarification of things I asked in another part of this thread.
Fair enough.
Still, I expect code that enters the kernel to actually be tested. We've got way too much code just sitting there in broken state because whomever posted it didn't care about it working at the time, and nobody knows better because you can't actually use the code/driver on any real hardware with a mainline kernel.
-Olof
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Quoted 33 lines · On Friday 20 of December 2013 13:25:06 Olof Johansson wrote:
Quoted 23 lines · Tomasz Figa
Quoted 22 lines · On Friday 20 of December 2013 13:22:06 Olof Johansson wrote:
Quoted 19 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 8 lines
Quoted 4 lines
Hold on, you're claiming that this patch you've posted has only seen very limited testing, and that you are aware of failures?
Don't merge known-broken code into the mainline kernel.
I'm afraid that a "failed suspend" does not really mean a failure here, but let me wait for clarification of things I asked in another part of this thread.
Quoted 7 lines
Fair enough.
Still, I expect code that enters the kernel to actually be tested. We've got way too much code just sitting there in broken state because whomever posted it didn't care about it working at the time, and nobody knows better because you can't actually use the code/driver on any real hardware with a mainline kernel.
Agreed.
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Olof JohanssonHi Olof,
Quoted 22 lines · Olof Johansson
Quoted 15 lines · Abhilash Kesavan
Hi Sunil,
Quoted 6 lines · sunil joshi
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
This has not been added for Exynos5250 in mainline yet. We did notice that the system would fail to suspend on the rare occasion (~1% of the time on exynos5250) when we repeatedly suspended and resumed the system.
Quoted 4 lines
I have not run s2r stress tests, but have had no issues suspending the system in my limited testing. We can probably let this be for now as the system would resume fine even on a failed suspend. I will do some stress testing and then post if needed.
Quoted 4 lines
Hold on, you're claiming that this patch you've posted has only seen very limited testing, and that you are aware of failures?
Don't merge known-broken code into the mainline kernel.
I have tested this patch on an 5250-snow and SMDK5420 through 30 cycles without any failure. Yes, I have seen failures on a 3.4 chromium kernel on an exynos5250 during stress testing. Mainline kernel is significantly different from what we are carrying in 3.4 or 3.8 chromium and the reason for me not adding the GIC patch was that it was a hack in the first place. The basic S2R functionality works fine, but if you'd rather have it pass a stress test of say a 1000 cycles then let me do the same and provide you with the results.
Quoted 3 lines
-Olof
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to sunil joshiHi,
Quoted 19 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 4 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().
A question about this for Chromium and LSI guys:
If you find out that there is already a pending interrupt before you enter the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Quoted 29 lines · Tomasz Figa
Hi,
Quoted 19 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 4 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().A question about this for Chromium and LSI guys:
Quoted 8 lines
If you find out that there is already a pending interrupt before you enter the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
If it's expected to be a rare or very rare event, it's not a given that the added complexity of dealing with the aborted suspend that late is worth it.
-Olof
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Quoted 34 lines · On Friday 20 of December 2013 13:37:36 Olof Johansson wrote:
Quoted 33 lines · Tomasz Figa
Hi,
Quoted 19 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 4 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().A question about this for Chromium and LSI guys:
If you find out that there is already a pending interrupt before you enter the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?
Quoted 8 lines
Quoted 4 lines
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
If it's expected to be a rare or very rare event, it's not a given that the added complexity of dealing with the aborted suspend that late is worth it.
I think that the code to support this is already in place, just printing an unfortunate message about "suspend failures". It doesn't add any significant complexity too.
I'm not sure about the frequency of such events, though, and any real effect of this or the other behavior in such case and so there is my question about this.
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Tomasz,
Quoted 44 lines · Tomasz Figa
Quoted 34 lines · On Friday 20 of December 2013 13:37:36 Olof Johansson wrote:
Quoted 33 lines · Tomasz Figa
Hi,
Quoted 19 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 4 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().A question about this for Chromium and LSI guys:
If you find out that there is already a pending interrupt before you enter the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?
Quoted 8 lines
Quoted 4 lines
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
If it's expected to be a rare or very rare event, it's not a given that the added complexity of dealing with the aborted suspend that late is worth it.
Quoted 7 lines
I think that the code to support this is already in place, just printing an unfortunate message about "suspend failures". It doesn't add any significant complexity too.
I'm not sure about the frequency of such events, though, and any real effect of this or the other behavior in such case and so there is my question about this.
Adding to what Doug already mentioned in the thread, in the cases where we saw cpu_do_idle fail we noticed the following:
1) No wake-up source as having woken up the system (by checking the WAKEUP_STAT)
2) On checking all the EINT Pend registers the values indicated no pending interrupts.
The UM says that the PMU may fail to go to suspend when there are pending interrupt events. The patch assumed that we have a non-wakeup interrupt pending causing "wfi" to fail, especially as we saw the failure more often with no_console_suspend.
Quoted 3 lines
Best regards,
Tomasz
Abhilash
Quoted 1 line
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Tomasz FigaTomasz,
Quoted 29 lines · Tomasz Figa
Hi,
Quoted 19 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 4 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering suspend no longer occasionally fails with the "Failed to suspend the system" error inexynos_cpu_suspend().A question about this for Chromium and LSI guys:
Quoted 8 lines
If you find out that there is already a pending interrupt before you enter the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
I'm not actually sure I know every last detail, but...
Quoted 1 line
From what I remember on 5250 there was some type of mystery interrupt
that was hitting in the system but that wasn't identifiable as any particular interrupt source. I think that this was an attempt to deal with that with a heavy hammer. I don't think it was a very elegant solution and it would be nice to do better.
Ah, here's the original CL:
<https://chromium-review.googlesource.com/#/c/34541/>. ...as you can see I wasn't super happy about it at the time but was OK with it going in since it was very late in the Chromebook release cycle and we needed suspend/resume to be reliable.
Another fairly questionable CL:
<https://chromium-review.googlesource.com/#/c/37991/>
It would be super great if we could get suspend/resume reliable upstream without those hacks.
-Doug
A message that is not in the archive (sent off-list or not yet received): CAPQV+nO=Xe=z669QxCJSerrm-xP0b=WtyPveyh2uTcM2B3i5KQ@mail.gmail.com
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi,
I have observed on an average 2 failures in 100 S2R cycles even with the mainline kernel on SMDK5420. The system resumes fine after an aborted suspend. I have isolated the problem to the MCT_L0 interrupt. On disabling the forwarding of just this interrupt from the distributor there are no failures for over 1000 cycles. Code exists to mask the system timer wake-up and post-resume in a failed case the WAKEUP_STAT register does not show the timer having woken up the system (I am checking this quite early post-resume). On suspending the system, the non-boot cores would free their timer irqs (in the MCT driver) but not the boot core. So, there is a possibility that L0 irq might wake the system if it races with suspend. Is this a possibility ? Please correct me if my understanding is wrong.
Abhilash
Quoted 86 lines · Jonathan Kliegman
Quoted 61 lines · Doug Anderson
Tomasz,
Quoted 37 lines · Tomasz Figa
Hi,
Quoted 20 lines · On Friday 20 of December 2013 15:56:38 sunil joshi wrote:
Hi Abhilash,
I saw another patch in chrome tree ..by Andrew Bresticker which may be relevant here ..Just wondering if you missed adding this ? or this is not needed ? You did not face any issue in getting core to suspend ?
------------------------------------------------------------------------------------------
commit95402d816b9f1a05ce633f7ff64b4c939c142482Author: Andrew Bresticker <[email protected]> Date: Mon Jul 15 13:14:36 2013 -0700arm: exynos: disable all interrupts on Exynos5420 before suspend
Disable all interrupts from the GIC before entering suspend on Exynos5420 as is done on Exynos5250. If interrupts are enabled, we may receive an interrupt after entering WFI but before the PMU has suspended the system, causing suspend to fail.
Quoted 6 lines
BUG=chrome-os-partner:20523
TEST=Runsuspend_stress_teston Pit and observe that entering
suspend
no longer occasionally fails with the "Failed to suspend the
system"
error inexynos_cpu_suspend().A question about this for Chromium and LSI guys:
If you find out that there is already a pending interrupt before you enter
the sleep mode, isn't it more reasonable to cancel the process ASAP and handle the event instead of entering the sleep just to leave it?Quoted 4 lines
I believe this should be both more efficient with respect to power usage and latency, because sleep-wakeup transition takes time and power.
Do you have any reason to think the opposite?
I'm not actually sure I know every last detail, but...
From what I remember on 5250 there was some type of mystery interrupt that was hitting in the system but that wasn't identifiable as any particular interrupt source. I think that this was an attempt to deal with that with a heavy hammer. I don't think it was a very elegant solution and it would be nice to do better.
Ah, here's the original CL:
<https://chromium-review.googlesource.com/#/c/34541/>. ...as you can see I wasn't super happy about it at the time but was OK with it going in since it was very late in the Chromebook release cycle and we needed suspend/resume to be reliable.Quoted 5 lines
Another fairly questionable CL:
<https://chromium-review.googlesource.com/#/c/37991/>It would be super great if we could get suspend/resume reliable upstream without those hacks.
My recollection is the first CL (34541 that I put in) didn't actually do anything itself, but had enough of a change in the timings that it made behavior better. The second CL (37991) is definitely a hack that covered up the issue and I don't think anyone was happy with but given the timing it was the best alternative.
I did a lot of debugging and don't believe I ever found an actual interrupt firing that caused this. I'm pretty sure this was related to power settings and it just failing to enter the suspend state.
Quoted 3 lines
-Doug
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Abhilash KesavanHi,
On Mon, Dec 16, 2013 at 7:01 AM, Abhilash Kesavan <[email protected]> wrote:
[...]
Quoted 15 lines
arch/arm/mach-exynos/include/mach/regs-clock.h +15
-0+/* For EXYNOS5420 */ +#define EXYNOS5420_CLKSRC_MASK_CPERI EXYNOS_CLKREG(0x04300) +#define EXYNOS5420_CLKSRC_MASK_TOP0 EXYNOS_CLKREG(0x10300) +#define EXYNOS5420_CLKSRC_MASK_TOP1 EXYNOS_CLKREG(0x10304) +#define EXYNOS5420_CLKSRC_MASK_TOP2 EXYNOS_CLKREG(0x10308) +#define EXYNOS5420_CLKSRC_MASK_TOP7 EXYNOS_CLKREG(0x1031C) +#define EXYNOS5420_CLKSRC_MASK_DISP10 EXYNOS_CLKREG(0x1032C) +#define EXYNOS5420_CLKSRC_MASK_MAU EXYNOS_CLKREG(0x10334) +#define EXYNOS5420_CLKSRC_MASK_FSYS EXYNOS_CLKREG(0x10340) +#define EXYNOS5420_CLKSRC_MASK_PERIC0 EXYNOS_CLKREG(0x10350) +#define EXYNOS5420_CLKSRC_MASK_PERIC1 EXYNOS_CLKREG(0x10354) +#define EXYNOS5420_CLKSRC_MASK_ISP EXYNOS_CLKREG(0x10370) +#define EXYNOS5420_CLKGATE_BUS_DISP1 EXYNOS_CLKREG(0x10728) +#define EXYNOS5420_CLKGATE_IP_PERIC EXYNOS_CLKREG(0x10950) +
[...]
Quoted 91 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +77
-0+#define EXYNOS5420_IROM_DATA2 S5P_PMUREG(0x0988) +#define EXYNOS5420_ARM_CORE2_SYS_PWR_REG S5P_PMUREG(0x1020) +#define EXYNOS5420_DIS_IRQ_ARM_CORE2_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1024) +#define EXYNOS5420_DIS_IRQ_ARM_CORE2_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1028) +#define EXYNOS5420_ARM_CORE3_SYS_PWR_REG S5P_PMUREG(0x1030) +#define EXYNOS5420_DIS_IRQ_ARM_CORE3_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1034) +#define EXYNOS5420_DIS_IRQ_ARM_CORE3_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1038) +#define EXYNOS5420_KFC_CORE0_SYS_PWR_REG S5P_PMUREG(0x1040) +#define EXYNOS5420_DIS_IRQ_KFC_CORE0_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1044) +#define EXYNOS5420_DIS_IRQ_KFC_CORE0_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1048) +#define EXYNOS5420_KFC_CORE1_SYS_PWR_REG S5P_PMUREG(0x1050) +#define EXYNOS5420_DIS_IRQ_KFC_CORE1_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1054) +#define EXYNOS5420_DIS_IRQ_KFC_CORE1_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1058) +#define EXYNOS5420_KFC_CORE2_SYS_PWR_REG S5P_PMUREG(0x1060) +#define EXYNOS5420_DIS_IRQ_KFC_CORE2_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1064) +#define EXYNOS5420_DIS_IRQ_KFC_CORE2_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1068) +#define EXYNOS5420_KFC_CORE3_SYS_PWR_REG S5P_PMUREG(0x1070) +#define EXYNOS5420_DIS_IRQ_KFC_CORE3_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1074) +#define EXYNOS5420_DIS_IRQ_KFC_CORE3_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1078) +#define EXYNOS5420_ISP_ARM_SYS_PWR_REG S5P_PMUREG(0x1090) +#define EXYNOS5420_DIS_IRQ_ISP_ARM_LOCAL_SYS_PWR_REG S5P_PMUREG(0x1094) +#define EXYNOS5420_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG S5P_PMUREG(0x1098) +#define EXYNOS5420_ARM_COMMON_SYS_PWR_REG S5P_PMUREG(0x10A0) +#define EXYNOS5420_KFC_COMMON_SYS_PWR_REG S5P_PMUREG(0x10B0) +#define EXYNOS5420_KFC_L2_SYS_PWR_REG S5P_PMUREG(0x10D0) +#define EXYNOS5420_DPLL_SYSCLK_SYS_PWR_REG S5P_PMUREG(0x1158) +#define EXYNOS5420_IPLL_SYSCLK_SYS_PWR_REG S5P_PMUREG(0x115C) +#define EXYNOS5420_KPLL_SYSCLK_SYS_PWR_REG S5P_PMUREG(0x1160) +#define EXYNOS5420_RPLL_SYSCLK_SYS_PWR_REG S5P_PMUREG(0x1174) +#define EXYNOS5420_SPLL_SYSCLK_SYS_PWR_REG S5P_PMUREG(0x1178) +#define EXYNOS5420_INTRAM_MEM_SYS_PWR_REG S5P_PMUREG(0x11B8) +#define EXYNOS5420_INTROM_MEM_SYS_PWR_REG S5P_PMUREG(0x11BC) +#define EXYNOS5420_ONENANDXL_MEM_SYS_PWR S5P_PMUREG(0x11C0) +#define EXYNOS5420_USBDEV_MEM_SYS_PWR S5P_PMUREG(0x11CC) +#define EXYNOS5420_USBDEV1_MEM_SYS_PWR S5P_PMUREG(0x11D0) +#define EXYNOS5420_SDMMC_MEM_SYS_PWR S5P_PMUREG(0x11D4) +#define EXYNOS5420_CSSYS_MEM_SYS_PWR S5P_PMUREG(0x11D8) +#define EXYNOS5420_SECSS_MEM_SYS_PWR S5P_PMUREG(0x11DC) +#define EXYNOS5420_ROTATOR_MEM_SYS_PWR S5P_PMUREG(0x11E0) +#define EXYNOS5420_INTRAM_MEM_SYS_PWR S5P_PMUREG(0x11E4) +#define EXYNOS5420_INTROM_MEM_SYS_PWR S5P_PMUREG(0x11E8) +#define EXYNOS5420_PAD_RETENTION_JTAG_SYS_PWR_REG S5P_PMUREG(0x1208) +#define EXYNOS5420_PAD_RETENTION_DRAM_SYS_PWR_REG S5P_PMUREG(0x1210) +#define EXYNOS5420_PAD_RETENTION_UART_SYS_PWR_REG S5P_PMUREG(0x1214) +#define EXYNOS5420_PAD_RETENTION_MMC0_SYS_PWR_REG S5P_PMUREG(0x1218) +#define EXYNOS5420_PAD_RETENTION_MMC1_SYS_PWR_REG S5P_PMUREG(0x121C) +#define EXYNOS5420_PAD_RETENTION_MMC2_SYS_PWR_REG S5P_PMUREG(0x1220) +#define EXYNOS5420_PAD_RETENTION_HSI_SYS_PWR_REG S5P_PMUREG(0x1224) +#define EXYNOS5420_PAD_RETENTION_EBIA_SYS_PWR_REG S5P_PMUREG(0x1228) +#define EXYNOS5420_PAD_RETENTION_EBIB_SYS_PWR_REG S5P_PMUREG(0x122C) +#define EXYNOS5420_PAD_RETENTION_SPI_SYS_PWR_REG S5P_PMUREG(0x1230) +#define EXYNOS5420_PAD_RETENTION_DRAM_COREBLK_SYS_PWR_REG S5P_PMUREG(0x1234) +#define EXYNOS5420_DISP1_SYS_PWR_REG S5P_PMUREG(0x1410) +#define EXYNOS5420_MAU_SYS_PWR_REG S5P_PMUREG(0x1414) +#define EXYNOS5420_G2D_SYS_PWR_REG S5P_PMUREG(0x1418) +#define EXYNOS5420_MSC_SYS_PWR_REG S5P_PMUREG(0x141C) +#define EXYNOS5420_FSYS_SYS_PWR_REG S5P_PMUREG(0x1420) +#define EXYNOS5420_FSYS2_SYS_PWR_REG S5P_PMUREG(0x1424) +#define EXYNOS5420_PSGEN_SYS_PWR_REG S5P_PMUREG(0x1428) +#define EXYNOS5420_PERIC_SYS_PWR_REG S5P_PMUREG(0x142C) +#define EXYNOS5420_WCORE_SYS_PWR_REG S5P_PMUREG(0x1430)#define EXYNOS5420_CMU_CLKSTOP_DISP1_SYS_PWR_REG S5P_PMUREG(0x1490)#define EXYNOS5420_CMU_CLKSTOP_MAU_SYS_PWR_REG S5P_PMUREG(0x1494)#define EXYNOS5420_CMU_CLKSTOP_G2D_SYS_PWR_REG S5P_PMUREG(0x1498)@@ -402,6 +465,7 @@#define EXYNOS5420_CMU_RESET_G2D_SYS_PWR_REG S5P_PMUREG(0x1598)#define EXYNOS5420_CMU_RESET_MSC_SYS_PWR_REG S5P_PMUREG(0x159C)#define EXYNOS5420_CMU_RESET_FSYS_SYS_PWR_REG S5P_PMUREG(0x15A0) +#define EXYNOS5420_SFR_AXI_CGDIS1 S5P_PMUREG(0x15E4)#define EXYNOS5420_ARM_COMMON_STATUS S5P_PMUREG(0x2504)#define EXYNOS5420_ARM_COMMON_OPTION S5P_PMUREG(0x2508)#define EXYNOS5420_KFC_COMMON_STATUS S5P_PMUREG(0x2584)@@ -410,7 +474,24 @@#define EXYNOS5420_KFC_L2_OPTION S5P_PMUREG(0x2688)#define EXYNOS5420_LOGIC_RESET_DURATION3 S5P_PMUREG(0x2D1C) +#define EXYNOS5420_PAD_RET_DRAM_OPTION S5P_PMUREG(0x3008) +#define EXYNOS5420_PAD_RET_MAUDIO_OPTION S5P_PMUREG(0x3028) +#define EXYNOS5420_PAD_RET_JTAG_OPTION S5P_PMUREG(0x3048) +#define EXYNOS5420_PAD_RET_GPIO_OPTION S5P_PMUREG(0x30C8) +#define EXYNOS5420_PAD_RET_UART_OPTION S5P_PMUREG(0x30E8) +#define EXYNOS5420_PAD_RET_MMCA_OPTION S5P_PMUREG(0x3108) +#define EXYNOS5420_PAD_RET_MMCB_OPTION S5P_PMUREG(0x3128) +#define EXYNOS5420_PAD_RET_MMCC_OPTION S5P_PMUREG(0x3148) +#define EXYNOS5420_PAD_RET_HSI_OPTION S5P_PMUREG(0x3168) +#define EXYNOS5420_PAD_RET_EBIA_OPTION S5P_PMUREG(0x3188) +#define EXYNOS5420_PAD_RET_EBIB_OPTION S5P_PMUREG(0x31A8) +#define EXYNOS5420_PAD_RET_SPI_OPTION S5P_PMUREG(0x31C8) +#define EXYNOS5420_PAD_RET_DRAM_COREBLK_OPTION S5P_PMUREG(0x31E8) + +
[...]
Quoted 136 lines
arch/arm/mach-exynos/pmu.c +135
-0+static struct exynos_pmu_conf exynos5420_pmu_config[] = { +/* { .reg = address, .val = { AFTR, LPA, SLEEP } */ + {EXYNOS5_ARM_CORE0_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ARM_CORE0_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ARM_CORE0_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_ARM_CORE1_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ARM_CORE1_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ARM_CORE1_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_ARM_CORE2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_ARM_CORE2_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_ARM_CORE2_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_ARM_CORE3_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_ARM_CORE3_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_ARM_CORE3_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_CORE0_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE0_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE0_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_CORE1_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE1_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE1_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_CORE2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE2_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE2_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_CORE3_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE3_LOCAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_DIS_IRQ_KFC_CORE3_CENTRAL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_ISP_ARM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ISP_ARM_LOCAL_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_ARM_COMMON_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_COMMON_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_ARM_L2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_KFC_L2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_CMU_RESET_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_CMU_ACLKSTOP_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SCLKSTOP_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_CMU_RESET_SYSMEM_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_DRAM_FREQ_DOWN_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_DDRPHY_DLLOFF_SYS_PWR_REG , {0x1 ,0x1 ,0x1 } }, + {EXYNOS5_DDRPHY_DLLLOCK_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_APLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_MPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_VPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_EPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_BPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_CPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_DPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_IPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_KPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_MPLLUSER_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_BPLLUSER_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_RPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_SPLL_SYSCLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_TOP_BUS_SYS_PWR_REG , {0x3 ,0x0 ,0x0 } }, + {EXYNOS5_TOP_RETENTION_SYS_PWR_REG , {0x1 ,0x1 ,0x1 } }, + {EXYNOS5_TOP_PWR_SYS_PWR_REG , {0x3 ,0x3 ,0x0 } }, + {EXYNOS5_TOP_BUS_SYSMEM_SYS_PWR_REG , {0x3 ,0x0 ,0x0 } }, + {EXYNOS5_TOP_RETENTION_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_TOP_PWR_SYSMEM_SYS_PWR_REG , {0x3 ,0x0 ,0x0 } }, + {EXYNOS5_LOGIC_RESET_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_OSCCLK_GATE_SYS_PWR_REG , {0x1 ,0x0 ,0x1 } }, + {EXYNOS5_LOGIC_RESET_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_OSCCLK_GATE_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_INTRAM_MEM_SYS_PWR_REG , {0x3 ,0x0 ,0x3 } }, + {EXYNOS5420_INTROM_MEM_SYS_PWR_REG , {0x3 ,0x0 ,0x3 } }, + {EXYNOS5_PAD_RETENTION_DRAM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_PAD_RETENTION_MAU_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_JTAG_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_DRAM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_UART_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_MMC0_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_MMC1_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_MMC2_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_HSI_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_EBIA_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_EBIB_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_SPI_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5420_PAD_RETENTION_DRAM_COREBLK_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_PAD_ISOLATION_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_PAD_ISOLATION_SYSMEM_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_PAD_ALV_SEL_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_XUSBXTI_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_XXTI_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_EXT_REGULATOR_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_GPIO_MODE_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_GPIO_MODE_SYSMEM_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_GPIO_MODE_MAU_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_TOP_ASB_RESET_SYS_PWR_REG , {0x1 ,0x1 ,0x0 } }, + {EXYNOS5_TOP_ASB_ISOLATION_SYS_PWR_REG , {0x1 ,0x0 ,0x0 } }, + {EXYNOS5_GSCL_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5_ISP_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5_MFC_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5_G3D_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_DISP1_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_MAU_SYS_PWR_REG , {0x7 ,0x7 ,0x0 } }, + {EXYNOS5420_G2D_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_MSC_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_FSYS_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_FSYS2_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_PSGEN_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_PERIC_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5420_WCORE_SYS_PWR_REG , {0x7 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_CLKSTOP_GSCL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_CLKSTOP_ISP_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_CLKSTOP_MFC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_CLKSTOP_G3D_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_DISP1_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_MAU_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_G2D_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_MSC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_FSYS_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_PSGEN_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_PERIC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_CLKSTOP_WCORE_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SYSCLK_GSCL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SYSCLK_ISP_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SYSCLK_MFC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_SYSCLK_G3D_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_DISP1_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_MAU_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_G2D_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_MSC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_FSYS_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_FSYS2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_PSGEN_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_PERIC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_SYSCLK_WCORE_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_RESET_FSYS2_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_RESET_PSGEN_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_RESET_PERIC_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5420_CMU_RESET_WCORE_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_RESET_GSCL_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } }, + {EXYNOS5_CMU_RESET_ISP_SYS_PWR_REG , {0x0 ,0x0 ,0x0 } },
arch/arm/mach-exynos/pmu.c static const struct exynos_pmu_conf exynos5250_pmu_config[] = { · line 467
Quoted 10 lines
arch/arm/mach-exynos/pmu.c +10
-0+ { EXYNOS5_CMU_RESET_MFC_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5_CMU_RESET_G3D_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_DISP1_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_MAU_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_G2D_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_MSC_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_FSYS_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { PMU_TABLE_END,}, +}; +
Looking at a rather long list of register defines and soc_is_* checks here makes me wonder how this is any different from the static data that the other SoC vendors (TI) are trying very hard to move out of arch/arm...
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi,
Quoted 3 lines · On Monday 16 of December 2013 08:27:17 Vaibhav Bedia wrote:
Hi,
On Mon, Dec 16, 2013 at 7:01 AM, Abhilash Kesavan <[email protected]> wrote:
[snip]
Quoted 8 lines
Quoted 8 lines
arch/arm/mach-exynos/pmu.c +8
-0+ { EXYNOS5_CMU_RESET_GSCL_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5_CMU_RESET_ISP_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5_CMU_RESET_MFC_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5_CMU_RESET_G3D_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_DISP1_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_MAU_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_G2D_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { EXYNOS5420_CMU_RESET_MSC_SYS_PWR_REG, { 0x0, 0x0, 0x0} },
Quoted 8 lines
arch/arm/mach-exynos/pmu.c static const struct exynos_pmu_conf exynos5250_pmu_config[] = { · line 467
Quoted 4 lines
arch/arm/mach-exynos/pmu.c +4
-0+ { EXYNOS5420_CMU_RESET_FSYS_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, + { PMU_TABLE_END,}, +}; +Looking at a rather long list of register defines and soc_is_* checks here makes me wonder how this is any different from the static data that the other SoC vendors (TI) are trying very hard to move out of
arch/arm...
Well, this data will eventually get moved to a PMU driver once drivers/syslib (as discussed on KS in Edinburgh) infrastructure shows up.
We can't get rid of these data from kernel sources, since there is no other place where they would fit. (No, DT is not such place.)
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
In reply to Abhilash KesavanHi Abhilash,
Please see my comments inline.
Quoted 26 lines · On Monday 16 of December 2013 17:31:10 Abhilash Kesavan wrote:
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
Signed-off-by Abhilash Kesavan <[email protected]>---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.htmlarch/arm/mach-exynos/include/mach/regs-clock.h | 15 +++ arch/arm/mach-exynos/include/mach/regs-pmu.h | 84 ++++++++++++ arch/arm/mach-exynos/pm.c | 151 +++++++++++++++++++--- arch/arm/mach-exynos/pmu.c | 165 ++++++++++++++++++++++++ 4 files changed, 396 insertions(+), 19 deletions(-)arch/arm/mach-exynos/include/mach/regs-clock.h +4
-0@@ -363,6 +363,21 @@#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4)#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +/* For EXYNOS5420 */ +#define EXYNOS5420_CLKSRC_MASK_CPERI EXYNOS_CLKREG(0x04300) +#define EXYNOS5420_CLKSRC_MASK_TOP0 EXYNOS_CLKREG(0x10300) +#define EXYNOS5420_CLKSRC_MASK_TOP1 EXYNOS_CLKREG(0x10304)
arch/arm/mach-exynos/include/mach/regs-clock.h line 379
Quoted 10 lines
arch/arm/mach-exynos/include/mach/regs-clock.h +10
-0+#define EXYNOS5420_CLKSRC_MASK_TOP2 EXYNOS_CLKREG(0x10308) +#define EXYNOS5420_CLKSRC_MASK_TOP7 EXYNOS_CLKREG(0x1031C) +#define EXYNOS5420_CLKSRC_MASK_DISP10 EXYNOS_CLKREG(0x1032C) +#define EXYNOS5420_CLKSRC_MASK_MAU EXYNOS_CLKREG(0x10334) +#define EXYNOS5420_CLKSRC_MASK_FSYS EXYNOS_CLKREG(0x10340) +#define EXYNOS5420_CLKSRC_MASK_PERIC0 EXYNOS_CLKREG(0x10350) +#define EXYNOS5420_CLKSRC_MASK_PERIC1 EXYNOS_CLKREG(0x10354) +#define EXYNOS5420_CLKSRC_MASK_ISP EXYNOS_CLKREG(0x10370) +#define EXYNOS5420_CLKGATE_BUS_DISP1 EXYNOS_CLKREG(0x10728) +#define EXYNOS5420_CLKGATE_IP_PERIC EXYNOS_CLKREG(0x10950)
This looks suspicious. Let me see below if this is really needed for what I think it is.
arch/arm/mach-exynos/include/mach/regs-pmu.h line 232
Quoted 13 lines
arch/arm/mach-exynos/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <mach/regs-pmu.h> arch/arm/mach-exynos/include/mach/regs-pmu.h +1
-0@@ -229,6 +229,7 @@/* For EXYNOS5 */ +#define EXYNOS5_SYS_DISP1_BLK_CFG S5P_SYSREG(0x0214)
Is it really a definition common for all Exynos5 SoCs?
arch/arm/mach-exynos/include/mach/regs-pmu.h line 364
Quoted 8 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +1
-0#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234)#define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408)@@ -360,6 +361,7 @@#define EXYNOS5_USE_SC_COUNTER (1 << 0)#define EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL (1 << 2) +#define EXYNOS5_L2RSTDISABLE_VALUE (1 << 3)
Ditto.
Quoted 3 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +0
-0#define EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN (1 << 7)#define EXYNOS5_OPTION_USE_STANDBYWFE (1 << 24)
[snip]
Quoted 14 lines
arch/arm/mach-exynos/pm.c +6
-0@@ -52,6 +52,22 @@ static const struct sleep_save exynos4210_set_clksrc[] = { { .reg = EXYNOS4210_CLKSRC_MASK_LCD1 , .val = 0x00001111, }, }; +static struct sleep_save exynos5420_set_clksrc[] = { + { .reg =EXYNOS5420_CLKSRC_MASK_CPERI , .val =0xffffffff , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP0 , .val =0x11111111 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP1 , .val =0x11101111 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP2 , .val =0x11111110 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP7 , .val =0x00111100 , },
arch/arm/mach-exynos/pm.c static const struct sleep_save exynos4210_set_clksrc[] = { · line 70
Quoted 10 lines
arch/arm/mach-exynos/pm.c +10
-0+ { .reg = EXYNOS5420_CLKSRC_MASK_DISP10, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_MAU, .val = 0x10000000, }, + { .reg = EXYNOS5420_CLKSRC_MASK_FSYS, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_PERIC0, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_PERIC1, .val = 0x11111100, }, + { .reg = EXYNOS5420_CLKSRC_MASK_ISP, .val = 0x11111000, }, + { .reg = EXYNOS5420_CLKGATE_BUS_DISP1, .val = 0xffffffff, }, + { .reg = EXYNOS5420_CLKGATE_IP_PERIC, .val = 0xffffffff, }, +}; +
OK, just as I thought...
NAK. Clock registers should be accessed only inside clock driver. Please see my patch implementing similar thing for Exynos 4:
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/24078/focus=24087
Quoted 41 lines
arch/arm/mach-exynos/pm.c +17
-2static struct sleep_save exynos4_epll_save[] = {SAVE_ITEM (EXYNOS4_EPLL_CON0 ),SAVE_ITEM (EXYNOS4_EPLL_CON1 ),@@ -66,6 +82,14 @@ static struct sleep_save exynos5_sys_save[] = { SAVE_ITEM(EXYNOS5_SYS_I2C_CFG), }; +static struct sleep_save exynos5420_sys_save[] = { +SAVE_ITEM (EXYNOS5_SYS_DISP1_BLK_CFG ), +}; + +static struct sleep_save exynos5420_cpustate_save[] = { +SAVE_ITEM (S5P_VA_SYSRAM +0x28 ), +}; +static struct sleep_save exynos_core_save[] = {/* SROM side */ SAVE_ITEM (S5P_SROM_BW ),@@ -84,8 +108,15 @@ static int exynos_cpu_suspend(unsigned long arg)#ifdef CONFIG_CACHE_L2X0 outer_flush_all ();#endif +/* +* Clear the IRAM register that holds a low power flag. The presence +* of this flag decides if the primary cpu starts executing the low +* power function at wake-up or not. +*/ +if (soc_is_exynos5420 ()) +__raw_writel (0x0 ,S5P_VA_SYSRAM +0x28 ); -if (soc_is_exynos5250 ()) +if (soc_is_exynos5250 () ||soc_is_exynos5420 ())flush_cache_all ();/* issue the standby signal into the pm unit. */ @@ -101,9 +132,14 @@ static void exynos_pm_prepare(void)s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {
arch/arm/mach-exynos/pm.c static void exynos_pm_prepare(void) · line 145
Quoted 10 lines
arch/arm/mach-exynos/pm.c +5
-0s3c_pm_do_save (exynos4_epll_save,ARRAY_SIZE (exynos4_epll_save));s3c_pm_do_save (exynos4_vpll_save,ARRAY_SIZE (exynos4_vpll_save)); + }else if (soc_is_exynos5420 ()) { +s3c_pm_do_save (exynos5420_sys_save, +ARRAY_SIZE (exynos5420_sys_save)); +s3c_pm_do_save (exynos5420_cpustate_save, +ARRAY_SIZE (exynos5420_cpustate_save)); }else {s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save));/* Disable USE_RETENTION of JPEG_MEM_OPTION */
What about rewriting this code as follows:
if (soc_is_exynos5420()) {
// exynos5420 specific code
} else if (soc_is_exynos5250()) {
// exynos5250 specific code
} else {
// exynos4 specific code
}Still, I'd prefer this to be based on top of my series I mentioned above which removes any clock handling from this file and so makes the exynos4 branch above disappear.
Quoted 44 lines
arch/arm/mach-exynos/pm.c +24
-4@@ -123,12 +159,32 @@ static void exynos_pm_prepare(void)/* Before enter central sequence mode, clock src register have to set */ -if (!soc_is_exynos5250 ()) +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ()))s3c_pm_do_restore_core (exynos4_set_clksrc,ARRAY_SIZE (exynos4_set_clksrc));if (soc_is_exynos4210 ())s3c_pm_do_restore_core (exynos4210_set_clksrc,ARRAY_SIZE (exynos4210_set_clksrc)); +if (soc_is_exynos5420 ()) { +s3c_pm_do_restore_core (exynos5420_set_clksrc, +ARRAY_SIZE (exynos5420_set_clksrc)); + + tmp =__raw_readl (EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp |=EXYNOS5420_UFS ; +__raw_writel (tmp,EXYNOS5420_SFR_AXI_CGDIS1 ); + + tmp =__raw_readl (EXYNOS5420_ARM_COMMON_OPTION ); + tmp &= ~EXYNOS5_L2RSTDISABLE_VALUE ; +__raw_writel (tmp,EXYNOS5420_ARM_COMMON_OPTION ); + + tmp =__raw_readl (EXYNOS5420_FSYS2_OPTION ); + tmp |=EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_FSYS2_OPTION ); + + tmp =__raw_readl (EXYNOS5420_PSGEN_OPTION ); + tmp |=EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_PSGEN_OPTION ); + } }static int exynos_pm_add (struct device *dev,struct subsys_interface *sif)@@ -224,11 +280,17 @@ static __init int exynos_pm_drvinit(void)/* All wakeup disable */ - tmp =__raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); -__raw_writel (tmp,S5P_WAKEUP_MASK ); +if (soc_is_exynos5420 ()) { + tmp =__raw_readl (S5P_WAKEUP_MASK ); + tmp |= ((0x7F <<7 ) | (0x1F <<1 ));
arch/arm/mach-exynos/pm.c static __init int exynos_pm_drvinit(void) · line 294
Quoted 10 lines
arch/arm/mach-exynos/pm.c +7
-1+__raw_writel (tmp,S5P_WAKEUP_MASK ); + }else { + tmp =__raw_readl (S5P_WAKEUP_MASK ); + tmp |= ((0xFF <<8 ) | (0x1F <<1 )); +__raw_writel (tmp,S5P_WAKEUP_MASK ); + } -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) { pll_base =clk_get (NULL ,"xtal" );
This code is also removed by my series.
Quoted 15 lines
arch/arm/mach-exynos/pm.c +1
-1if (!IS_ERR (pll_base)) {@@ -244,6 +306,7 @@ arch_initcall(exynos_pm_drvinit);static int exynos_pm_suspend (void ) {unsigned long tmp; +unsigned int cluster_id;/* Setting Central Sequence Register for power down mode */ @@ -253,10 +316,20 @@ static int exynos_pm_suspend(void)/* Setting SEQ_OPTION register */ - tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 );
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 327
Quoted 10 lines
arch/arm/mach-exynos/pm.c +9
-1-__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); +if (soc_is_exynos5420 ()) { + cluster_id = (read_cpuid (CPUID_MPIDR ) >>8 ) &0xf ; +if (!cluster_id) +__raw_writel (EXYNOS5420_ARM_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); +else +__raw_writel (EXYNOS5420_KFC_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); + }else if (soc_is_exynos5250 ()) {
This code should be also called on other Exynos SoCs, not just 5250.
Quoted 36 lines
arch/arm/mach-exynos/pm.c +14
-2+ tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); +__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); + } -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {/* Save Power control register */ asm ("mrc p15, 0, %0, c15, c0, 0" :"=r" (tmp) : :"cc" );@@ -275,6 +348,15 @@ static void exynos_pm_resume(void) {unsigned long tmp; +if (soc_is_exynos5420 ()) { +/* Restore the low power flag */ +s3c_pm_do_restore (exynos5420_cpustate_save, +ARRAY_SIZE (exynos5420_cpustate_save)); + +__raw_writel (EXYNOS5420_USE_STANDBY_WFI_ALL , +S5P_CENTRAL_SEQ_OPTION ); + } +/* * If PMU failed while entering sleep mode, WFI will be * ignored by PMU and then exiting cpu_do_idle(). @@ -290,7 +372,7 @@ static void exynos_pm_resume(void)/* No need to perform below restore code */ goto early_wakeup; } -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {/* Restore Power control register */ tmp = save_arm_register[0 ]; asm volatile ("mcr p15, 0, %0, c15, c0, 0"@@ -306,21 +388,40 @@ static void exynos_pm_resume(void)
arch/arm/mach-exynos/pm.c static void exynos_pm_resume(void) · line 391
Quoted 10 lines
arch/arm/mach-exynos/pm.c +1
-7/* For release retention */ -__raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); +if (soc_is_exynos5420 ()) {
Indentation issue.
Quoted 70 lines
arch/arm/mach-exynos/pm.c +38
-1+__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_DRAM_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MAUDIO_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_JTAG_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_GPIO_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_UART_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCA_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCB_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCC_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_HSI_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_EBIA_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_EBIB_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_SPI_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_DRAM_COREBLK_OPTION ); + }else { +__raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); + }if (soc_is_exynos5250 ())s3c_pm_do_restore (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); +else if (soc_is_exynos5420 ()) +s3c_pm_do_restore (exynos5420_sys_save, +ARRAY_SIZE (exynos5420_sys_save));s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {exynos4_restore_pll ();#ifdef CONFIG_SMP @@ -330,6 +431,18 @@ static void exynos_pm_resume(void) early_wakeup: +if (soc_is_exynos5420 ()) { + tmp =__raw_readl (EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp &= ~EXYNOS5420_UFS ; +__raw_writel (tmp,EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp =__raw_readl (EXYNOS5420_FSYS2_OPTION ); + tmp &= ~EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_FSYS2_OPTION ); + tmp =__raw_readl (EXYNOS5420_PSGEN_OPTION ); + tmp &= ~EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_PSGEN_OPTION ); + } +/* Clear SLEEP mode set in INFORM1 */ __raw_writel (0x0 ,S5P_INFORM1 );arch/arm/mach-exynos/pmu.c +2
-0@@ -16,6 +16,8 @@#include <mach/regs-clock.h> #include <mach/regs-pmu.h> +#include <asm/cputype.h> +#include "common.h" static const struct exynos_pmu_conf *exynos_pmu_config;
arch/arm/mach-exynos/pmu.c static const struct exynos_pmu_conf exynos5250_pmu_config[] = { · line 323
Quoted 4 lines
arch/arm/mach-exynos/pmu.c +1
-0@@ -318,6 +320,151 @@ static const struct exynos_pmu_conf exynos5250_pmu_config[] = { { PMU_TABLE_END,}, }; +static struct exynos_pmu_conf exynos5420_pmu_config[] = {
static const?
Best regards,
Tomasz
PATCH 1/2 ARM: EXYNOS: Support Suspend-to-RAM on EXYNOS5420
Hi Tomasz,
Quoted 55 lines · Tomasz Figa
Hi Abhilash,
Please see my comments inline.
Quoted 26 lines · On Monday 16 of December 2013 17:31:10 Abhilash Kesavan wrote:
Add PMU configuration table for various low power modes - AFTR/LPA/SLEEP. Also, add core s2r support for Exynos5420.
Signed-off-by Abhilash Kesavan <[email protected]>---
This patch depends on "ARM: EXYNOS5: Add PMU settings for exynos5420"
http://www.spinics.net/lists/linux-samsung-soc/msg24902.htmlarch/arm/mach-exynos/include/mach/regs-clock.h | 15 +++ arch/arm/mach-exynos/include/mach/regs-pmu.h | 84 ++++++++++++ arch/arm/mach-exynos/pm.c | 151 +++++++++++++++++++--- arch/arm/mach-exynos/pmu.c | 165 ++++++++++++++++++++++++ 4 files changed, 396 insertions(+), 19 deletions(-)arch/arm/mach-exynos/include/mach/regs-clock.h +4
-0@@ -363,6 +363,21 @@#define PWR_CTRL2_CORE2_UP_RATIO (1 << 4)#define PWR_CTRL2_CORE1_UP_RATIO (1 << 0) +/* For EXYNOS5420 */ +#define EXYNOS5420_CLKSRC_MASK_CPERI EXYNOS_CLKREG(0x04300) +#define EXYNOS5420_CLKSRC_MASK_TOP0 EXYNOS_CLKREG(0x10300) +#define EXYNOS5420_CLKSRC_MASK_TOP1 EXYNOS_CLKREG(0x10304)arch/arm/mach-exynos/include/mach/regs-clock.h line 379
Quoted 10 lines
arch/arm/mach-exynos/include/mach/regs-clock.h +10
-0+#define EXYNOS5420_CLKSRC_MASK_TOP2 EXYNOS_CLKREG(0x10308) +#define EXYNOS5420_CLKSRC_MASK_TOP7 EXYNOS_CLKREG(0x1031C) +#define EXYNOS5420_CLKSRC_MASK_DISP10 EXYNOS_CLKREG(0x1032C) +#define EXYNOS5420_CLKSRC_MASK_MAU EXYNOS_CLKREG(0x10334) +#define EXYNOS5420_CLKSRC_MASK_FSYS EXYNOS_CLKREG(0x10340) +#define EXYNOS5420_CLKSRC_MASK_PERIC0 EXYNOS_CLKREG(0x10350) +#define EXYNOS5420_CLKSRC_MASK_PERIC1 EXYNOS_CLKREG(0x10354) +#define EXYNOS5420_CLKSRC_MASK_ISP EXYNOS_CLKREG(0x10370) +#define EXYNOS5420_CLKGATE_BUS_DISP1 EXYNOS_CLKREG(0x10728) +#define EXYNOS5420_CLKGATE_IP_PERIC EXYNOS_CLKREG(0x10950)This looks suspicious. Let me see below if this is really needed for what I think it is.
Quoted 10 lines
arch/arm/mach-exynos/include/mach/regs-clock.h +1
-0+/* Compatibility defines and inclusion */ #include <mach/regs-pmu.h> arch/arm/mach-exynos/include/mach/regs-pmu.h +0
-0@@ -229,6 +229,7 @@
Quoted 5 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h line 232
Quoted 3 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +1
-0/* For EXYNOS5 */ +#define EXYNOS5_SYS_DISP1_BLK_CFG S5P_SYSREG(0x0214)Is it really a definition common for all Exynos5 SoCs?
I do see the register in both 5250 and 5420 even though the bits differ.
Quoted 11 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h line 364
Quoted 9 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +1
-0#define EXYNOS5_SYS_I2C_CFG S5P_SYSREG(0x0234)#define EXYNOS5_AUTO_WDTRESET_DISABLE S5P_PMUREG(0x0408)@@ -360,6 +361,7 @@#define EXYNOS5_USE_SC_COUNTER (1 << 0)#define EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL (1 << 2) +#define EXYNOS5_L2RSTDISABLE_VALUE (1 << 3)Ditto.
No, I will make this 5420 specific.
Quoted 32 lines
Quoted 4 lines
arch/arm/mach-exynos/include/mach/regs-pmu.h +0
-0#define EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN (1 << 7)#define EXYNOS5_OPTION_USE_STANDBYWFE (1 << 24)[snip]
Quoted 14 lines
arch/arm/mach-exynos/pm.c +6
-0@@ -52,6 +52,22 @@ static const struct sleep_save exynos4210_set_clksrc[] = { { .reg = EXYNOS4210_CLKSRC_MASK_LCD1 , .val = 0x00001111, }, }; +static struct sleep_save exynos5420_set_clksrc[] = { + { .reg =EXYNOS5420_CLKSRC_MASK_CPERI , .val =0xffffffff , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP0 , .val =0x11111111 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP1 , .val =0x11101111 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP2 , .val =0x11111110 , }, + { .reg =EXYNOS5420_CLKSRC_MASK_TOP7 , .val =0x00111100 , },arch/arm/mach-exynos/pm.c static const struct sleep_save exynos4210_set_clksrc[] = { · line 70
Quoted 10 lines
arch/arm/mach-exynos/pm.c +10
-0+ { .reg = EXYNOS5420_CLKSRC_MASK_DISP10, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_MAU, .val = 0x10000000, }, + { .reg = EXYNOS5420_CLKSRC_MASK_FSYS, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_PERIC0, .val = 0x11111110, }, + { .reg = EXYNOS5420_CLKSRC_MASK_PERIC1, .val = 0x11111100, }, + { .reg = EXYNOS5420_CLKSRC_MASK_ISP, .val = 0x11111000, }, + { .reg = EXYNOS5420_CLKGATE_BUS_DISP1, .val = 0xffffffff, }, + { .reg = EXYNOS5420_CLKGATE_IP_PERIC, .val = 0xffffffff, }, +}; +OK, just as I thought...
Quoted 4 lines
NAK. Clock registers should be accessed only inside clock driver. Please see my patch implementing similar thing for Exynos 4:
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/24078/focus=24087
I had not seen these changes, will re-base it on your changes.
Quoted 64 lines
Quoted 43 lines
arch/arm/mach-exynos/pm.c +17
-2static struct sleep_save exynos4_epll_save[] = {SAVE_ITEM (EXYNOS4_EPLL_CON0 ),SAVE_ITEM (EXYNOS4_EPLL_CON1 ),@@ -66,6 +82,14 @@ static struct sleep_save exynos5_sys_save[] = { SAVE_ITEM(EXYNOS5_SYS_I2C_CFG), }; +static struct sleep_save exynos5420_sys_save[] = { +SAVE_ITEM (EXYNOS5_SYS_DISP1_BLK_CFG ), +}; + +static struct sleep_save exynos5420_cpustate_save[] = { +SAVE_ITEM (S5P_VA_SYSRAM +0x28 ), +}; +static struct sleep_save exynos_core_save[] = {/* SROM side */ SAVE_ITEM (S5P_SROM_BW ),@@ -84,8 +108,15 @@ static int exynos_cpu_suspend(unsigned long arg)#ifdef CONFIG_CACHE_L2X0 outer_flush_all ();#endif +/* +* Clear the IRAM register that holds a low power flag. The presence +* of this flag decides if the primary cpu starts executing the low +* power function at wake-up or not. +*/ +if (soc_is_exynos5420 ()) +__raw_writel (0x0 ,S5P_VA_SYSRAM +0x28 ); -if (soc_is_exynos5250 ()) +if (soc_is_exynos5250 () ||soc_is_exynos5420 ())flush_cache_all ();/* issue the standby signal into the pm unit. */ @@ -101,9 +132,14 @@ static void exynos_pm_prepare(void)s3c_pm_do_save (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {arch/arm/mach-exynos/pm.c static void exynos_pm_prepare(void) · line 145
Quoted 10 lines
arch/arm/mach-exynos/pm.c +5
-0s3c_pm_do_save (exynos4_epll_save,ARRAY_SIZE (exynos4_epll_save));s3c_pm_do_save (exynos4_vpll_save,ARRAY_SIZE (exynos4_vpll_save)); + }else if (soc_is_exynos5420 ()) { +s3c_pm_do_save (exynos5420_sys_save, +ARRAY_SIZE (exynos5420_sys_save)); +s3c_pm_do_save (exynos5420_cpustate_save, +ARRAY_SIZE (exynos5420_cpustate_save)); }else {s3c_pm_do_save (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save));/* Disable USE_RETENTION of JPEG_MEM_OPTION */ What about rewriting this code as follows:
if (soc_is_exynos5420()) { // exynos5420 specific code } else if (soc_is_exynos5250()) { // exynos5250 specific code } else { // exynos4 specific code }
Quoted 3 lines
Still, I'd prefer this to be based on top of my series I mentioned above which removes any clock handling from this file and so makes the exynos4 branch above disappear.
OK..will re-base on your patches.
Quoted 52 lines
Quoted 52 lines
arch/arm/mach-exynos/pm.c +30
-4@@ -123,12 +159,32 @@ static void exynos_pm_prepare(void)/* Before enter central sequence mode, clock src register have to set */ -if (!soc_is_exynos5250 ()) +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ()))s3c_pm_do_restore_core (exynos4_set_clksrc,ARRAY_SIZE (exynos4_set_clksrc));if (soc_is_exynos4210 ())s3c_pm_do_restore_core (exynos4210_set_clksrc,ARRAY_SIZE (exynos4210_set_clksrc)); +if (soc_is_exynos5420 ()) { +s3c_pm_do_restore_core (exynos5420_set_clksrc, +ARRAY_SIZE (exynos5420_set_clksrc)); + + tmp =__raw_readl (EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp |=EXYNOS5420_UFS ; +__raw_writel (tmp,EXYNOS5420_SFR_AXI_CGDIS1 ); + + tmp =__raw_readl (EXYNOS5420_ARM_COMMON_OPTION ); + tmp &= ~EXYNOS5_L2RSTDISABLE_VALUE ; +__raw_writel (tmp,EXYNOS5420_ARM_COMMON_OPTION ); + + tmp =__raw_readl (EXYNOS5420_FSYS2_OPTION ); + tmp |=EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_FSYS2_OPTION ); + + tmp =__raw_readl (EXYNOS5420_PSGEN_OPTION ); + tmp |=EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_PSGEN_OPTION ); + } }static int exynos_pm_add (struct device *dev,struct subsys_interface *sif)@@ -224,11 +280,17 @@ static __init int exynos_pm_drvinit(void)/* All wakeup disable */ - tmp =__raw_readl (S5P_WAKEUP_MASK ); - tmp |= ((0xFF <<8 ) | (0x1F <<1 )); -__raw_writel (tmp,S5P_WAKEUP_MASK ); +if (soc_is_exynos5420 ()) { + tmp =__raw_readl (S5P_WAKEUP_MASK ); + tmp |= ((0x7F <<7 ) | (0x1F <<1 )); +__raw_writel (tmp,S5P_WAKEUP_MASK ); + }else { + tmp =__raw_readl (S5P_WAKEUP_MASK ); + tmp |= ((0xFF <<8 ) | (0x1F <<1 )); +__raw_writel (tmp,S5P_WAKEUP_MASK ); + }
Quoted 5 lines
arch/arm/mach-exynos/pm.c static __init int exynos_pm_drvinit(void) · line 294
Quoted 3 lines
arch/arm/mach-exynos/pm.c +1
-1-if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) { pll_base =clk_get (NULL ,"xtal" );This code is also removed by my series.
Ok
Quoted 15 lines
Quoted 15 lines
arch/arm/mach-exynos/pm.c +1
-0if (!IS_ERR (pll_base)) {@@ -244,6 +306,7 @@ arch_initcall(exynos_pm_drvinit);static int exynos_pm_suspend (void ) {unsigned long tmp; +unsigned int cluster_id;/* Setting Central Sequence Register for power down mode */ @@ -253,10 +316,20 @@ static int exynos_pm_suspend(void)/* Setting SEQ_OPTION register */
Quoted 13 lines
arch/arm/mach-exynos/pm.c static int exynos_pm_suspend(void) · line 327
Quoted 11 lines
arch/arm/mach-exynos/pm.c +9
-2- tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); -__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); +if (soc_is_exynos5420 ()) { + cluster_id = (read_cpuid (CPUID_MPIDR ) >>8 ) &0xf ; +if (!cluster_id) +__raw_writel (EXYNOS5420_ARM_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); +else +__raw_writel (EXYNOS5420_KFC_USE_STANDBY_WFI0 , +S5P_CENTRAL_SEQ_OPTION ); + }else if (soc_is_exynos5250 ()) {This code should be also called on other Exynos SoCs, not just 5250.
Yes, Bartlomiej caught this in an earlier review.
Quoted 118 lines
Quoted 37 lines
arch/arm/mach-exynos/pm.c +14
-2+ tmp = (S5P_USE_STANDBY_WFI0 |S5P_USE_STANDBY_WFE0 ); +__raw_writel (tmp,S5P_CENTRAL_SEQ_OPTION ); + } -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {/* Save Power control register */ asm ("mrc p15, 0, %0, c15, c0, 0" :"=r" (tmp) : :"cc" );@@ -275,6 +348,15 @@ static void exynos_pm_resume(void) {unsigned long tmp; +if (soc_is_exynos5420 ()) { +/* Restore the low power flag */ +s3c_pm_do_restore (exynos5420_cpustate_save, +ARRAY_SIZE (exynos5420_cpustate_save)); + +__raw_writel (EXYNOS5420_USE_STANDBY_WFI_ALL , +S5P_CENTRAL_SEQ_OPTION ); + } +/* * If PMU failed while entering sleep mode, WFI will be * ignored by PMU and then exiting cpu_do_idle(). @@ -290,7 +372,7 @@ static void exynos_pm_resume(void)/* No need to perform below restore code */ goto early_wakeup; } -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {/* Restore Power control register */ tmp = save_arm_register[0 ]; asm volatile ("mcr p15, 0, %0, c15, c0, 0"@@ -306,21 +388,40 @@ static void exynos_pm_resume(void)arch/arm/mach-exynos/pm.c static void exynos_pm_resume(void) · line 391
Quoted 10 lines
arch/arm/mach-exynos/pm.c +1
-7/* For release retention */ -__raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); -__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); +if (soc_is_exynos5420 ()) {Indentation issue.
Quoted 68 lines
arch/arm/mach-exynos/pm.c +38
-1+__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_DRAM_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MAUDIO_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_JTAG_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_GPIO_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_UART_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCA_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCB_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_MMCC_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_HSI_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_EBIA_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_EBIB_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_SPI_OPTION ); +__raw_writel ((1 <<28 ),EXYNOS5420_PAD_RET_DRAM_COREBLK_OPTION ); + }else { +__raw_writel ((1 <<28 ),S5P_PAD_RET_MAUDIO_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_GPIO_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_UART_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCA_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_MMCB_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIA_OPTION ); +__raw_writel ((1 <<28 ),S5P_PAD_RET_EBIB_OPTION ); + }if (soc_is_exynos5250 ())s3c_pm_do_restore (exynos5_sys_save,ARRAY_SIZE (exynos5_sys_save)); +else if (soc_is_exynos5420 ()) +s3c_pm_do_restore (exynos5420_sys_save, +ARRAY_SIZE (exynos5420_sys_save));s3c_pm_do_restore_core (exynos_core_save,ARRAY_SIZE (exynos_core_save)); -if (!soc_is_exynos5250 ()) { +if (!(soc_is_exynos5250 () ||soc_is_exynos5420 ())) {exynos4_restore_pll ();#ifdef CONFIG_SMP @@ -330,6 +431,18 @@ static void exynos_pm_resume(void) early_wakeup: +if (soc_is_exynos5420 ()) { + tmp =__raw_readl (EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp &= ~EXYNOS5420_UFS ; +__raw_writel (tmp,EXYNOS5420_SFR_AXI_CGDIS1 ); + tmp =__raw_readl (EXYNOS5420_FSYS2_OPTION ); + tmp &= ~EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_FSYS2_OPTION ); + tmp =__raw_readl (EXYNOS5420_PSGEN_OPTION ); + tmp &= ~EXYNOS5420_EMULATION ; +__raw_writel (tmp,EXYNOS5420_PSGEN_OPTION ); + } +/* Clear SLEEP mode set in INFORM1 */ __raw_writel (0x0 ,S5P_INFORM1 );arch/arm/mach-exynos/pmu.c +2
-0@@ -16,6 +16,8 @@#include <mach/regs-clock.h> #include <mach/regs-pmu.h> +#include <asm/cputype.h> +#include "common.h"
Quoted 8 lines
arch/arm/mach-exynos/pmu.c static const struct exynos_pmu_conf exynos5250_pmu_config[] = { · line 323
Quoted 6 lines
arch/arm/mach-exynos/pmu.c +1
-0static const struct exynos_pmu_conf *exynos_pmu_config;@@ -318,6 +320,151 @@ static const struct exynos_pmu_conf exynos5250_pmu_config[] = { { PMU_TABLE_END,}, }; +static struct exynos_pmu_conf exynos5420_pmu_config[] = {static const?
Will fix.
Quoted 3 lines
Best regards,
Tomasz
Abhilash
Quoted 6 lines
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel