* [PATCH 0/2] Manage OMAP34xx ES3.1.2 rev to resume from suspend
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: tony; +Cc: linux, linux-omap, linux-arm-kernel, linux-kernel
Hi,
My kernel crashed when my OMAP34xx ES3.1.2 leave suspend mode. The first
patch seems to solve the issue, and the second one corrects Linux kernel
coding style problems.
Jeremy Vial (2):
ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX
rev3.1.2 case.
ARM: OMAP3: Fix coding style problems in
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 0/2] Manage OMAP34xx ES3.1.2 rev to resume from suspend
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
My kernel crashed when my OMAP34xx ES3.1.2 leave suspend mode. The first
patch seems to solve the issue, and the second one corrects Linux kernel
coding style problems.
Jeremy Vial (2):
ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX
rev3.1.2 case.
ARM: OMAP3: Fix coding style problems in
arch/arm/mach-omap2/control.c
arch/arm/mach-omap2/control.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/2] ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case.
2014-07-31 13:10 ` Jeremy Vial
(?)
@ 2014-07-31 13:10 ` Jeremy Vial
-1 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: tony; +Cc: linux-omap, linux, linux-kernel, linux-arm-kernel
According to the comment “restore_es3: applies to 34xx >= ES3.0" in
"arch/arm/mach-omap2/sleep34xx.S”, omap3_restore_es3 should be used
if the revision of an OMAP34xx is ES3.1.2.
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 751f354..acadac0 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -314,7 +314,8 @@ void omap3_save_scratchpad_contents(void)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore_3630);
else if (omap_rev() != OMAP3430_REV_ES3_0 &&
- omap_rev() != OMAP3430_REV_ES3_1)
+ omap_rev() != OMAP3430_REV_ES3_1 &&
+ omap_rev() != OMAP3430_REV_ES3_1_2)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore);
else
--
1.7.9.5
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 1/2] ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case.
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: tony; +Cc: linux, linux-omap, linux-arm-kernel, linux-kernel
According to the comment “restore_es3: applies to 34xx >= ES3.0" in
"arch/arm/mach-omap2/sleep34xx.S”, omap3_restore_es3 should be used
if the revision of an OMAP34xx is ES3.1.2.
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 751f354..acadac0 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -314,7 +314,8 @@ void omap3_save_scratchpad_contents(void)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore_3630);
else if (omap_rev() != OMAP3430_REV_ES3_0 &&
- omap_rev() != OMAP3430_REV_ES3_1)
+ omap_rev() != OMAP3430_REV_ES3_1 &&
+ omap_rev() != OMAP3430_REV_ES3_1_2)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore);
else
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 1/2] ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case.
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: linux-arm-kernel
According to the comment ?restore_es3: applies to 34xx >= ES3.0" in
"arch/arm/mach-omap2/sleep34xx.S?, omap3_restore_es3 should be used
if the revision of an OMAP34xx is ES3.1.2.
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 751f354..acadac0 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -314,7 +314,8 @@ void omap3_save_scratchpad_contents(void)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore_3630);
else if (omap_rev() != OMAP3430_REV_ES3_0 &&
- omap_rev() != OMAP3430_REV_ES3_1)
+ omap_rev() != OMAP3430_REV_ES3_1 &&
+ omap_rev() != OMAP3430_REV_ES3_1_2)
scratchpad_contents.public_restore_ptr =
virt_to_phys(omap3_restore);
else
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] ARM: OMAP3: Fix coding style problems in arch/arm/mach-omap2/control.c
2014-07-31 13:10 ` Jeremy Vial
(?)
@ 2014-07-31 13:10 ` Jeremy Vial
-1 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: tony; +Cc: linux-omap, linux, linux-kernel, linux-arm-kernel
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index acadac0..cc5d767 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -281,6 +281,7 @@ void omap3_clear_scratchpad_contents(void)
u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
void __iomem *v_addr;
u32 offset = 0;
+
v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
OMAP3430_GLOBAL_COLD_RST_MASK) {
@@ -475,7 +476,6 @@ void omap3_control_save_context(void)
control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
control_context.padconf_sys_nirq =
omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3_control_restore_context(void)
@@ -533,7 +533,6 @@ void omap3_control_restore_context(void)
omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
omap_ctrl_writel(control_context.padconf_sys_nirq,
OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3630_ctrl_disable_rta(void)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/2] ARM: OMAP3: Fix coding style problems in arch/arm/mach-omap2/control.c
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: tony; +Cc: linux, linux-omap, linux-arm-kernel, linux-kernel
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index acadac0..cc5d767 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -281,6 +281,7 @@ void omap3_clear_scratchpad_contents(void)
u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
void __iomem *v_addr;
u32 offset = 0;
+
v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
OMAP3430_GLOBAL_COLD_RST_MASK) {
@@ -475,7 +476,6 @@ void omap3_control_save_context(void)
control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
control_context.padconf_sys_nirq =
omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3_control_restore_context(void)
@@ -533,7 +533,6 @@ void omap3_control_restore_context(void)
omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
omap_ctrl_writel(control_context.padconf_sys_nirq,
OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3630_ctrl_disable_rta(void)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/2] ARM: OMAP3: Fix coding style problems in arch/arm/mach-omap2/control.c
@ 2014-07-31 13:10 ` Jeremy Vial
0 siblings, 0 replies; 11+ messages in thread
From: Jeremy Vial @ 2014-07-31 13:10 UTC (permalink / raw)
To: linux-arm-kernel
Signed-off-by: Jeremy Vial <jvial@adeneo-embedded.com>
---
arch/arm/mach-omap2/control.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index acadac0..cc5d767 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -281,6 +281,7 @@ void omap3_clear_scratchpad_contents(void)
u32 max_offset = OMAP343X_SCRATCHPAD_ROM_OFFSET;
void __iomem *v_addr;
u32 offset = 0;
+
v_addr = OMAP2_L4_IO_ADDRESS(OMAP343X_SCRATCHPAD_ROM);
if (omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP3_PRM_RSTST_OFFSET) &
OMAP3430_GLOBAL_COLD_RST_MASK) {
@@ -475,7 +476,6 @@ void omap3_control_save_context(void)
control_context.csi = omap_ctrl_readl(OMAP343X_CONTROL_CSI);
control_context.padconf_sys_nirq =
omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3_control_restore_context(void)
@@ -533,7 +533,6 @@ void omap3_control_restore_context(void)
omap_ctrl_writel(control_context.csi, OMAP343X_CONTROL_CSI);
omap_ctrl_writel(control_context.padconf_sys_nirq,
OMAP343X_CONTROL_PADCONF_SYSNIRQ);
- return;
}
void omap3630_ctrl_disable_rta(void)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Manage OMAP34xx ES3.1.2 rev to resume from suspend
2014-07-31 13:10 ` Jeremy Vial
@ 2014-08-01 8:21 ` Tony Lindgren
-1 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2014-08-01 8:21 UTC (permalink / raw)
To: Jeremy Vial; +Cc: linux-omap, linux, linux-kernel, linux-arm-kernel
* Jeremy Vial <jvial@adeneo-embedded.com> [140731 06:16]:
> Hi,
>
> My kernel crashed when my OMAP34xx ES3.1.2 leave suspend mode. The first
> patch seems to solve the issue, and the second one corrects Linux kernel
> coding style problems.
>
> Jeremy Vial (2):
> ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX
> rev3.1.2 case.
> ARM: OMAP3: Fix coding style problems in
> arch/arm/mach-omap2/control.c
>
> arch/arm/mach-omap2/control.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks applying these fixes for the merge window. I've tagged
the first patch also for stable.
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 0/2] Manage OMAP34xx ES3.1.2 rev to resume from suspend
@ 2014-08-01 8:21 ` Tony Lindgren
0 siblings, 0 replies; 11+ messages in thread
From: Tony Lindgren @ 2014-08-01 8:21 UTC (permalink / raw)
To: linux-arm-kernel
* Jeremy Vial <jvial@adeneo-embedded.com> [140731 06:16]:
> Hi,
>
> My kernel crashed when my OMAP34xx ES3.1.2 leave suspend mode. The first
> patch seems to solve the issue, and the second one corrects Linux kernel
> coding style problems.
>
> Jeremy Vial (2):
> ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX
> rev3.1.2 case.
> ARM: OMAP3: Fix coding style problems in
> arch/arm/mach-omap2/control.c
>
> arch/arm/mach-omap2/control.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
Thanks applying these fixes for the merge window. I've tagged
the first patch also for stable.
Regards,
Tony
^ permalink raw reply [flat|nested] 11+ messages in thread