ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

PATCH New Paul Walmsley 3 participants 10 messages Sep 5, 2012 – Sep 11, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures OMAP2+ support

lore

Share & tools

lore

Paul Walmsley

author

2012-09-05 23:34 UTC #0 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

The wakeupgen context-save code reads and stores the AUXCOREBOOT0 and AUXCOREBOOT1 register contents twice. This seems like a waste of time, so, remove the duplicates.

Signed-off-by Paul Walmsley <[email protected]>

Cc Santosh Shilimkar <[email protected]>

---

Santosh, care to review/ack this one?

 arch/arm/mach-omap2/omap-wakeupgen.c |    6 ------
 1 file changed, 6 deletions(-)

arch/arm/mach-omap2/omap-wakeupgen.c +0 -6

index 05fdebf..b55432d 100644
@@ -233,12 +233,6 @@ static inline void omap4_irq_save_context(void)
 	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
 
 	/* Save SyncReq generation logic */
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
-
-	/* Save SyncReq generation logic */
 	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);
 	__raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET);
 	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN);

Signature · 1 line

1.7.10.4

Shilimkar, Santosh

2012-09-06 06:35 UTC #1 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 8 lines · Paul Walmsley

The wakeupgen context-save code reads and stores the AUXCOREBOOT0 and AUXCOREBOOT1 register contents twice. This seems like a waste of time, so, remove the duplicates.
Signed-off-by Paul Walmsley <[email protected]>
Cc Santosh Shilimkar <[email protected]>
---

Looks fine to me. Thanks Paul.
Reviewed-by: Santosh Shilimkar ,santosh.shilimkar at ti.com>

While reviewing your patch, i noticed a typo in the code. Since the patch fixes nearby code as the subject patch, I generated that patch on top of yours. Same is end of the email as well as attachment. The patch applies on top of your patch.

Regards
Santosh

Quoted 1 line

From 5fcd24e5782e502aa607b73de78be68b394f9639 Mon Sep 17 00:00:00 2001

From: Santosh Shilimkar <[email protected]>
Date: Thu, 6 Sep 2012 11:51:34 +0530
Subject: [PATCH] ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register
save

The wakeupgen context-save code reads AUXCOREBOOT0 register instead of AUXCOREBOOT1 register contents while saving AUXCOREBOOT1.

Fix the same.

Signed-off-by Santosh Shilimkar <[email protected]>

---
 arch/arm/mach-omap2/omap-wakeupgen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(quoted diff) +0 -0

b/arch/arm/mach-omap2/omap-wakeupgen.c
index b55432d..567f672 100644

arch/arm/mach-omap2/omap-wakeupgen.c +1 -1

@@ -229,7 +229,7 @@ static inline void omap4_irq_save_context(void)
 	/* Save AuxBoot* registers */
 	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
 	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1);
 	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
 
 	/* Save SyncReq generation logic */

Signature · 8 lines

1.7.9.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-OMAP4-wakeupgen-Fix-the-typo-in-AUXCOREBOOT-regi.patch
Type: application/octet-stream
Size: 1192 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120906/e294aa02/attachment.obj>

Shilimkar, Santosh

2012-09-08 08:18 UTC #2 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Tony,

Quoted 28 lines · Santosh

Quoted 8 lines · Paul Walmsley
The wakeupgen context-save code reads and stores the AUXCOREBOOT0 and AUXCOREBOOT1 register contents twice. This seems like a waste of time, so, remove the duplicates.
Signed-off-by Paul Walmsley <[email protected]>
Cc Santosh Shilimkar <[email protected]>
---
Looks fine to me. Thanks Paul.
Reviewed-by: Santosh Shilimkar ,santosh.shilimkar at ti.com>
While reviewing your patch, i noticed a typo in the code. Since the patch fixes nearby code as the subject patch, I generated that patch on top of yours. Same is end of the email as well as attachment. The patch applies on top of your patch.
Regards
Santosh
From 5fcd24e5782e502aa607b73de78be68b394f9639 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <[email protected]>
Date: Thu, 6 Sep 2012 11:51:34 +0530
Subject: [PATCH] ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register
save

Quoted 7 lines

The wakeupgen context-save code reads AUXCOREBOOT0 register instead of AUXCOREBOOT1 register contents while saving AUXCOREBOOT1.
Fix the same.
Signed-off-by Santosh Shilimkar <[email protected]>
---

Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6

Regards
Santosh

Tony Lindgren

maintainer

2012-09-10 18:55 UTC #3 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 3 lines · Shilimkar, Santosh

Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6

I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).

Regards,

Tony

Shilimkar, Santosh

2012-09-11 06:19 UTC #4 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 9 lines · Tony Lindgren

Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).

Fixes non critical is fine. No major issue without these patches.

Regards
Santosh

Paul Walmsley

author

2012-09-11 06:37 UTC #5 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 11 lines · Santosh

Quoted 9 lines · Tony Lindgren
Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).
Fixes non critical is fine. No major issue without these patches.

There's an ordering constraint though: Santosh's patch needs to go in first, then mine.

- Paul

Shilimkar, Santosh

2012-09-11 06:40 UTC #6 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 8 lines · Paul Walmsley

Quoted 6 lines · Santosh
Quoted 5 lines · Tony Lindgren
Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6

Quoted 9 lines

Quoted 5 lines
Quoted 4 lines
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).
Fixes non critical is fine. No major issue without these patches.
There's an ordering constraint though: Santosh's patch needs to go in first, then mine.

Its other way round ;-)
Mine I created after applying your change.

Regards
Santosh

Paul Walmsley

author

2012-09-11 06:43 UTC #7 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 13 lines · Santosh

Quoted 12 lines · Paul Walmsley
Quoted 10 lines · Santosh
Quoted 9 lines · Tony Lindgren
Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
Fixes non critical is fine. No major issue without these patches.
There's an ordering constraint though: Santosh's patch needs to go in first, then mine.
Its other way round ;-)
Mine I created after applying your change.

The problem is that if my patch is applied first, then there will be a point after my patch where the AUXCOREBOOT1 register won't be saved, which might break PM. So the patches may need to be updated.

- Paul

Shilimkar, Santosh

2012-09-11 07:19 UTC #8 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 20 lines · Paul Walmsley

Quoted 18 lines · Santosh
Quoted 17 lines · Paul Walmsley
Quoted 11 lines · Santosh
Quoted 9 lines · Tony Lindgren
Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).
Fixes non critical is fine. No major issue without these patches.
There's an ordering constraint though: Santosh's patch needs to go in first, then mine.

Quoted 7 lines

Quoted 2 lines
Its other way round ;-)
Mine I created after applying your change.
The problem is that if my patch is applied first, then there will be a point after my patch where the AUXCOREBOOT1 register won't be saved, which might break PM. So the patches may need to be updated.

Good point. It's trivial to re-order them.

Tony,
Updated patches in the end of the email. Also attached.

Regards
Santosh

Quoted 1 line

From 4e1da2a44d92b956c3a740f5af6a45ff1c2dc294 Mon Sep 17 00:00:00 2001

From: Paul Walmsley <[email protected]>
Date: Tue, 11 Sep 2012 12:43:18 +0530
Subject: [PATCH 2/2] ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT*
read/write

The wakeupgen context-save code reads and stores the AUXCOREBOOT0 and AUXCOREBOOT1 register contents twice. This seems like a waste of time, so, remove the duplicates.

Acked-by Santosh Shilimkar <[email protected]>

Signed-off-by Paul Walmsley <[email protected]>

---
 arch/arm/mach-omap2/omap-wakeupgen.c |    6 ------
 1 file changed, 6 deletions(-)

(quoted diff) +0 -0

b/arch/arm/mach-omap2/omap-wakeupgen.c
index c3795c2..567f672 100644

arch/arm/mach-omap2/omap-wakeupgen.c +0 -6

@@ -233,12 +233,6 @@ static inline void omap4_irq_save_context(void)
 	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
 
 	/* Save SyncReq generation logic */
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
-	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
-
-	/* Save SyncReq generation logic */
 	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_MASK);
 	__raw_writel(val, sar_base + PTMSYNCREQ_MASK_OFFSET);
 	val = __raw_readl(wakeupgen_base + OMAP_PTMSYNCREQ_EN);

Signature · 1 line

1.7.9.5

Quoted 1 line

From 6e3b8a3f6ec231f588b860d87b7a80f6ba38ce98 Mon Sep 17 00:00:00 2001

From: Santosh Shilimkar <[email protected]>
Date: Thu, 6 Sep 2012 11:51:34 +0530
Subject: [PATCH 1/2] ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT
register save

The wakeupgen context-save code reads AUXCOREBOOT0 register instead of AUXCOREBOOT1 register contents while saving AUXCOREBOOT1.

Fix the same.

Signed-off-by Santosh Shilimkar <[email protected]>

---
 arch/arm/mach-omap2/omap-wakeupgen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(quoted diff) +0 -0

b/arch/arm/mach-omap2/omap-wakeupgen.c
index 05fdebf..c3795c2 100644

arch/arm/mach-omap2/omap-wakeupgen.c +1 -1

@@ -229,7 +229,7 @@ static inline void omap4_irq_save_context(void)
 	/* Save AuxBoot* registers */
 	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
 	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);
-	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);
+	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1);
 	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);
 
 	/* Save SyncReq generation logic */

Signature · 15 lines

1.7.9.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-ARM-OMAP4-wakeupgen-remove-duplicate-AUXCOREBOOT-rea.patch
Type: application/octet-stream
Size: 1413 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120911/8e624e0f/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ARM-OMAP4-wakeupgen-Fix-the-typo-in-AUXCOREBOOT-regi.patch
Type: application/octet-stream
Size: 1196 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120911/8e624e0f/attachment-0003.obj>

Tony Lindgren

maintainer

2012-09-11 18:49 UTC #9 lore raw

PATCH 1/1 ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write

Quoted 24 lines · Shilimkar, Santosh

Quoted 23 lines · Paul Walmsley
Quoted 20 lines · Santosh
Quoted 8 lines · Paul Walmsley
Quoted 6 lines · Santosh
Quoted 5 lines · Tony Lindgren
Quoted 3 lines · Shilimkar, Santosh
Will you able to pick up these couple of wakeupgen fixes from here or do you want me to send you a pull request for 3.6-rc5/6
Quoted 9 lines
Quoted 5 lines
Quoted 4 lines
I can pick them into fixes-noncritical. But if the second one is a major bug for the -rc series, the patch should be describe what breaks (regression? oops?).
Fixes non critical is fine. No major issue without these patches.
There's an ordering constraint though: Santosh's patch needs to go in first, then mine.
Its other way round ;-)
Mine I created after applying your change.

Quoted 8 lines

Quoted 4 lines
The problem is that if my patch is applied first, then there will be a point after my patch where the AUXCOREBOOT1 register won't be saved, which might break PM. So the patches may need to be updated.
Good point. It's trivial to re-order them.
Tony,
Updated patches in the end of the email. Also attached.

Thanks applying into fixes-non-critical.

Regards,

Tony