* [PATCH 3.9-stable] ARM: EXYNOS5: Fix kernel dump in AFTR idle mode @ 2013-05-10 0:28 Jonghwan Choi 2013-05-17 10:37 ` Luis Henriques 0 siblings, 1 reply; 3+ messages in thread From: Jonghwan Choi @ 2013-05-10 0:28 UTC (permalink / raw) To: 'Jonghwan Choi', linux-kernel Cc: stable, 'Inderpal Singh', 'Chander Kashyap' This patch looks like it should be in the 3.9-stable tree, should we apply it? ------------------ From: "Inderpal Singh <inderpal.singh@linaro.org>" commit 088584618836b159947bc4ab5011a5cf1f081a62 upstream The kernel crashes while resuming from AFTR idle mode. It happens because L2 cache was not going into retention state. This patch configures the USE_RETENTION bit of ARM_L2_OPTION register so that it does not depend on MANUAL_L2RSTDISABLE_CONTROL of ARM_COMMON_OPTION register for L2RSTDISABLE signal. Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> Tested-by: Chander Kashyap <chander.kashyap@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> --- arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 + arch/arm/mach-exynos/pmu.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/regs-pmu.h b/arch/arm/mach-exynos/include/mach/regs-pmu.h index 3f30aa1..57344b7 100644 --- a/arch/arm/mach-exynos/include/mach/regs-pmu.h +++ b/arch/arm/mach-exynos/include/mach/regs-pmu.h @@ -344,6 +344,7 @@ #define EXYNOS5_FSYS_ARM_OPTION S5P_PMUREG(0x2208) #define EXYNOS5_ISP_ARM_OPTION S5P_PMUREG(0x2288) #define EXYNOS5_ARM_COMMON_OPTION S5P_PMUREG(0x2408) +#define EXYNOS5_ARM_L2_OPTION S5P_PMUREG(0x2608) #define EXYNOS5_TOP_PWR_OPTION S5P_PMUREG(0x2C48) #define EXYNOS5_TOP_PWR_SYSMEM_OPTION S5P_PMUREG(0x2CC8) #define EXYNOS5_JPEG_MEM_OPTION S5P_PMUREG(0x2F48) diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c index daebc1a..97d6885 100644 --- a/arch/arm/mach-exynos/pmu.c +++ b/arch/arm/mach-exynos/pmu.c @@ -228,6 +228,7 @@ static struct exynos_pmu_conf exynos5250_pmu_config[] = { { EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, { EXYNOS5_ARM_COMMON_SYS_PWR_REG, { 0x0, 0x0, 0x2} }, { EXYNOS5_ARM_L2_SYS_PWR_REG, { 0x3, 0x3, 0x3} }, + { EXYNOS5_ARM_L2_OPTION, { 0x10, 0x10, 0x0 } }, { EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, { EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, { EXYNOS5_CMU_RESET_SYS_PWR_REG, { 0x1, 0x1, 0x0} }, @@ -353,11 +354,9 @@ static void exynos5_init_pmu(void) /* * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable - * MANUAL_L2RSTDISABLE_CONTROL_BITFIELD Enable */ tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION); - tmp |= (EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL | - EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN); + tmp |= EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN; __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION); /* -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 3.9-stable] ARM: EXYNOS5: Fix kernel dump in AFTR idle mode 2013-05-10 0:28 [PATCH 3.9-stable] ARM: EXYNOS5: Fix kernel dump in AFTR idle mode Jonghwan Choi @ 2013-05-17 10:37 ` Luis Henriques [not found] ` <CAGZ6kuPriyi07eAagK00K4iYepSp1j+Z5qTjC_0z_BTToGRumQ@mail.gmail.com> 0 siblings, 1 reply; 3+ messages in thread From: Luis Henriques @ 2013-05-17 10:37 UTC (permalink / raw) To: Jonghwan Choi Cc: linux-kernel, stable, 'Inderpal Singh', 'Chander Kashyap' On Fri, May 10, 2013 at 09:28:36AM +0900, Jonghwan Choi wrote: > This patch looks like it should be in the 3.9-stable tree, should we apply > it? Would you agree that this could also be applied to the 3.5 kernel as well? Cheers, -- Luis > > ------------------ > > From: "Inderpal Singh <inderpal.singh@linaro.org>" > > commit 088584618836b159947bc4ab5011a5cf1f081a62 upstream > > The kernel crashes while resuming from AFTR idle mode. It happens > because L2 cache was not going into retention state. > > This patch configures the USE_RETENTION bit of ARM_L2_OPTION register > so that it does not depend on MANUAL_L2RSTDISABLE_CONTROL of > ARM_COMMON_OPTION register for L2RSTDISABLE signal. > > Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> > Tested-by: Chander Kashyap <chander.kashyap@linaro.org> > Signed-off-by: Olof Johansson <olof@lixom.net> > Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> > --- > arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 + > arch/arm/mach-exynos/pmu.c | 5 ++--- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm/mach-exynos/include/mach/regs-pmu.h > b/arch/arm/mach-exynos/include/mach/regs-pmu.h > index 3f30aa1..57344b7 100644 > --- a/arch/arm/mach-exynos/include/mach/regs-pmu.h > +++ b/arch/arm/mach-exynos/include/mach/regs-pmu.h > @@ -344,6 +344,7 @@ > #define EXYNOS5_FSYS_ARM_OPTION > S5P_PMUREG(0x2208) > #define EXYNOS5_ISP_ARM_OPTION > S5P_PMUREG(0x2288) > #define EXYNOS5_ARM_COMMON_OPTION > S5P_PMUREG(0x2408) > +#define EXYNOS5_ARM_L2_OPTION > S5P_PMUREG(0x2608) > #define EXYNOS5_TOP_PWR_OPTION > S5P_PMUREG(0x2C48) > #define EXYNOS5_TOP_PWR_SYSMEM_OPTION > S5P_PMUREG(0x2CC8) > #define EXYNOS5_JPEG_MEM_OPTION > S5P_PMUREG(0x2F48) > diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c > index daebc1a..97d6885 100644 > --- a/arch/arm/mach-exynos/pmu.c > +++ b/arch/arm/mach-exynos/pmu.c > @@ -228,6 +228,7 @@ static struct exynos_pmu_conf exynos5250_pmu_config[] = > { > { EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, > { EXYNOS5_ARM_COMMON_SYS_PWR_REG, { 0x0, 0x0, 0x2} }, > { EXYNOS5_ARM_L2_SYS_PWR_REG, { 0x3, 0x3, 0x3} }, > + { EXYNOS5_ARM_L2_OPTION, { 0x10, 0x10, 0x0 } > }, > { EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, > { EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, > { EXYNOS5_CMU_RESET_SYS_PWR_REG, { 0x1, 0x1, 0x0} }, > @@ -353,11 +354,9 @@ static void exynos5_init_pmu(void) > > /* > * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable > - * MANUAL_L2RSTDISABLE_CONTROL_BITFIELD Enable > */ > tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION); > - tmp |= (EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL | > - EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN); > + tmp |= EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN; > __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION); > > /* > -- > 1.7.9.5 > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <CAGZ6kuPriyi07eAagK00K4iYepSp1j+Z5qTjC_0z_BTToGRumQ@mail.gmail.com>]
* Re: [PATCH 3.9-stable] ARM: EXYNOS5: Fix kernel dump in AFTR idle mode [not found] ` <CAGZ6kuPriyi07eAagK00K4iYepSp1j+Z5qTjC_0z_BTToGRumQ@mail.gmail.com> @ 2013-05-17 13:05 ` Luis Henriques 0 siblings, 0 replies; 3+ messages in thread From: Luis Henriques @ 2013-05-17 13:05 UTC (permalink / raw) To: jonghwan Choi Cc: Jonghwan Choi, linux-kernel, stable, Inderpal Singh, Chander Kashyap On Fri, May 17, 2013 at 09:59:10PM +0900, jonghwan Choi wrote: > > Would you agree that this could also be applied to the 3.5 kernel as well? > > I believe this is applicable to the 3.5.x kernel tree. > > Thanks. Great, thanks. I'll queue it for 3.5 kernel. Cheers, -- Luis > > > On Fri, May 17, 2013 at 7:37 PM, Luis Henriques < > luis.henriques@canonical.com> wrote: > > > On Fri, May 10, 2013 at 09:28:36AM +0900, Jonghwan Choi wrote: > > > This patch looks like it should be in the 3.9-stable tree, should we > > apply > > > it? > > > > Would you agree that this could also be applied to the 3.5 kernel as well? > > > > Cheers, > > -- > > Luis > > > > > > > > > > ------------------ > > > > > > From: "Inderpal Singh <inderpal.singh@linaro.org>" > > > > > > commit 088584618836b159947bc4ab5011a5cf1f081a62 upstream > > > > > > The kernel crashes while resuming from AFTR idle mode. It happens > > > because L2 cache was not going into retention state. > > > > > > This patch configures the USE_RETENTION bit of ARM_L2_OPTION register > > > so that it does not depend on MANUAL_L2RSTDISABLE_CONTROL of > > > ARM_COMMON_OPTION register for L2RSTDISABLE signal. > > > > > > Signed-off-by: Inderpal Singh <inderpal.singh@linaro.org> > > > Tested-by: Chander Kashyap <chander.kashyap@linaro.org> > > > Signed-off-by: Olof Johansson <olof@lixom.net> > > > Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> > > > --- > > > arch/arm/mach-exynos/include/mach/regs-pmu.h | 1 + > > > arch/arm/mach-exynos/pmu.c | 5 ++--- > > > 2 files changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/arch/arm/mach-exynos/include/mach/regs-pmu.h > > > b/arch/arm/mach-exynos/include/mach/regs-pmu.h > > > index 3f30aa1..57344b7 100644 > > > --- a/arch/arm/mach-exynos/include/mach/regs-pmu.h > > > +++ b/arch/arm/mach-exynos/include/mach/regs-pmu.h > > > @@ -344,6 +344,7 @@ > > > #define EXYNOS5_FSYS_ARM_OPTION > > > S5P_PMUREG(0x2208) > > > #define EXYNOS5_ISP_ARM_OPTION > > > S5P_PMUREG(0x2288) > > > #define EXYNOS5_ARM_COMMON_OPTION > > > S5P_PMUREG(0x2408) > > > +#define EXYNOS5_ARM_L2_OPTION > > > S5P_PMUREG(0x2608) > > > #define EXYNOS5_TOP_PWR_OPTION > > > S5P_PMUREG(0x2C48) > > > #define EXYNOS5_TOP_PWR_SYSMEM_OPTION > > > S5P_PMUREG(0x2CC8) > > > #define EXYNOS5_JPEG_MEM_OPTION > > > S5P_PMUREG(0x2F48) > > > diff --git a/arch/arm/mach-exynos/pmu.c b/arch/arm/mach-exynos/pmu.c > > > index daebc1a..97d6885 100644 > > > --- a/arch/arm/mach-exynos/pmu.c > > > +++ b/arch/arm/mach-exynos/pmu.c > > > @@ -228,6 +228,7 @@ static struct exynos_pmu_conf > > exynos5250_pmu_config[] = > > > { > > > { EXYNOS5_DIS_IRQ_ISP_ARM_CENTRAL_SYS_PWR_REG, { 0x0, 0x0, 0x0} }, > > > { EXYNOS5_ARM_COMMON_SYS_PWR_REG, { 0x0, 0x0, 0x2} }, > > > { EXYNOS5_ARM_L2_SYS_PWR_REG, { 0x3, 0x3, 0x3} }, > > > + { EXYNOS5_ARM_L2_OPTION, { 0x10, 0x10, 0x0 } > > > }, > > > { EXYNOS5_CMU_ACLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, > > > { EXYNOS5_CMU_SCLKSTOP_SYS_PWR_REG, { 0x1, 0x0, 0x1} }, > > > { EXYNOS5_CMU_RESET_SYS_PWR_REG, { 0x1, 0x1, 0x0} }, > > > @@ -353,11 +354,9 @@ static void exynos5_init_pmu(void) > > > > > > /* > > > * SKIP_DEACTIVATE_ACEACP_IN_PWDN_BITFIELD Enable > > > - * MANUAL_L2RSTDISABLE_CONTROL_BITFIELD Enable > > > */ > > > tmp = __raw_readl(EXYNOS5_ARM_COMMON_OPTION); > > > - tmp |= (EXYNOS5_MANUAL_L2RSTDISABLE_CONTROL | > > > - EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN); > > > + tmp |= EXYNOS5_SKIP_DEACTIVATE_ACEACP_IN_PWDN; > > > __raw_writel(tmp, EXYNOS5_ARM_COMMON_OPTION); > > > > > > /* > > > -- > > > 1.7.9.5 > > > > > > -- > > > To unsubscribe from this list: send the line "unsubscribe stable" in > > > the body of a message to majordomo@vger.kernel.org > > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > -- > > To unsubscribe from this list: send the line "unsubscribe stable" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-17 13:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-10 0:28 [PATCH 3.9-stable] ARM: EXYNOS5: Fix kernel dump in AFTR idle mode Jonghwan Choi
2013-05-17 10:37 ` Luis Henriques
[not found] ` <CAGZ6kuPriyi07eAagK00K4iYepSp1j+Z5qTjC_0z_BTToGRumQ@mail.gmail.com>
2013-05-17 13:05 ` Luis Henriques
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox