Skip to contentSkip to conversation

ARM: omap: fix warning with LPAE build

PATCH New Olof Johansson 2 participants 6 messages Nov 13, 2013 – Nov 17, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +1 -1
index 93b80e5..1f3770a 100644
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
 		 * will hang the system.
 		 */
 		pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-		ret = _omap_save_secure_sram((u32 *)
+		ret = _omap_save_secure_sram((u32 *)(unsigned long)
 				__pa(omap3_secure_ram_storage));
 		pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
 		/* Following is for error tracking, it should not happen */
Signature · 1 line
1.7.10.4
maintainer
#1 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Quoted 23 lines · Olof Johansson

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +0 -0
index 93b80e5..1f3770a 100644

arch/arm/mach-omap2/pm34xx.c static void omap3_save_secure_ram_context(void) · line 126

Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
 		 * will hang the system.
 		 */
 		pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-		ret = _omap_save_secure_sram((u32 *)
+		ret = _omap_save_secure_sram((u32 *)(unsigned long)
 				__pa(omap3_secure_ram_storage));
 		pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
 		/* Following is for error tracking, it should not happen */

Hmm maybe the function prototype should be changed instead if it takes the physical address.

How do you you reproduce this warning? I did not get it after enabling LPAE in multi_v7_defconfig with current mainline.

Regards,

Tony

#2 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Quoted 36 lines · Tony Lindgren
Quoted 23 lines · Olof Johansson

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +0 -0
index 93b80e5..1f3770a 100644

arch/arm/mach-omap2/pm34xx.c static void omap3_save_secure_ram_context(void) · line 126

Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
               * will hang the system.
               */
              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-             ret = _omap_save_secure_sram((u32 *)
+             ret = _omap_save_secure_sram((u32 *)(unsigned long)
                              __pa(omap3_secure_ram_storage));
              pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
              /* Following is for error tracking, it should not happen */

Hmm maybe the function prototype should be changed instead if it takes the physical address.

Quoted 2 lines

How do you you reproduce this warning? I did not get it after enabling LPAE in multi_v7_defconfig with current mainline.

Of course. No more late night patching for me. :)

I saw it in last night's -next.

-Olof

#3 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Quoted 37 lines · Olof Johansson
Quoted 36 lines · Tony Lindgren
Quoted 23 lines · Olof Johansson

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +0 -0
index 93b80e5..1f3770a 100644

arch/arm/mach-omap2/pm34xx.c static void omap3_save_secure_ram_context(void) · line 126

Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
               * will hang the system.
               */
              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-             ret = _omap_save_secure_sram((u32 *)
+             ret = _omap_save_secure_sram((u32 *)(unsigned long)
                              __pa(omap3_secure_ram_storage));
              pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
              /* Following is for error tracking, it should not happen */

Hmm maybe the function prototype should be changed instead if it takes the physical address.

Quoted 4 lines
Quoted 2 lines

How do you you reproduce this warning? I did not get it after enabling LPAE in multi_v7_defconfig with current mainline.

Of course. No more late night patching for me. :)

Actually, that is getting a little hairy. It's a function pointer to an assembly function, so we'd need to make it deal with the size of phys_addr_t there. It's probably easier to just go with the original patch here, at least I don't see much payoff from doing it the other way.

-Olof

maintainer
#4 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Quoted 38 lines · Olof Johansson
Quoted 37 lines · Olof Johansson
Quoted 36 lines · Tony Lindgren
Quoted 23 lines · Olof Johansson

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +0 -0
index 93b80e5..1f3770a 100644

arch/arm/mach-omap2/pm34xx.c static void omap3_save_secure_ram_context(void) · line 126

Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
               * will hang the system.
               */
              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-             ret = _omap_save_secure_sram((u32 *)
+             ret = _omap_save_secure_sram((u32 *)(unsigned long)
                              __pa(omap3_secure_ram_storage));
              pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
              /* Following is for error tracking, it should not happen */

Hmm maybe the function prototype should be changed instead if it takes the physical address.

Quoted 4 lines
Quoted 4 lines
Quoted 2 lines

How do you you reproduce this warning? I did not get it after enabling LPAE in multi_v7_defconfig with current mainline.

Of course. No more late night patching for me. :)

Ah OK so it's in next.

Quoted 5 lines

Actually, that is getting a little hairy. It's a function pointer to an assembly function, so we'd need to make it deal with the size of phys_addr_t there. It's probably easier to just go with the original patch here, at least I don't see much payoff from doing it the other way.

OK, please go ahead and apply:

I'm still sorting out my fixes, and so far it looks like I don't need to touch this file.

Regards,

Tony

#5 lore raw

PATCH 1/1 ARM: omap: fix warning with LPAE build

Quoted 52 lines · Tony Lindgren
Quoted 38 lines · Olof Johansson
Quoted 37 lines · Olof Johansson
Quoted 36 lines · Tony Lindgren
Quoted 23 lines · Olof Johansson

Some omap3 code is throwing a warning:
arch/arm/mach-omap2/pm34xx.c: In function 'omap3_save_secure_ram_context':
arch/arm/mach-omap2/pm34xx.c:123:32: warning: cast to pointer from
integer of different size [-Wint-to-pointer-cast]

In reality this code will never actually execute with LPAE=y, since Cortex-A8 doesn't support it. So downcasting the __pa() is safe in this case.

---

Tony, queue up if you have a fixes branch please, otherwise I can apply directly.

 arch/arm/mach-omap2/pm34xx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap2/pm34xx.c +0 -0
index 93b80e5..1f3770a 100644

arch/arm/mach-omap2/pm34xx.c static void omap3_save_secure_ram_context(void) · line 126

Quoted 8 lines
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -120,7 +120,7 @@ static void omap3_save_secure_ram_context(void)
               * will hang the system.
               */
              pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON);
-             ret = _omap_save_secure_sram((u32 *)
+             ret = _omap_save_secure_sram((u32 *)(unsigned long)
                              __pa(omap3_secure_ram_storage));
              pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state);
              /* Following is for error tracking, it should not happen */

Hmm maybe the function prototype should be changed instead if it takes the physical address.

Quoted 4 lines
Quoted 4 lines
Quoted 2 lines

How do you you reproduce this warning? I did not get it after enabling LPAE in multi_v7_defconfig with current mainline.

Of course. No more late night patching for me. :)

Ah OK so it's in next.

Quoted 5 lines

Actually, that is getting a little hairy. It's a function pointer to an assembly function, so we'd need to make it deal with the size of phys_addr_t there. It's probably easier to just go with the original patch here, at least I don't see much payoff from doing it the other way.

Quoted 6 lines

OK, please go ahead and apply:

I'm still sorting out my fixes, and so far it looks like I don't need to touch this file.

I forgot to include this in the last batch, but I've applied it now. Thanks for the ack.

-Olof