Revert "sunxi: psci: avoid error address-of-packed-member"
diff mbox series

Message ID 20200216121716.4084-1-tduszyns@gmail.com
State Accepted
Delegated to: Jagannadha Sutradharudu Teki
Headers show
Series
  • Revert "sunxi: psci: avoid error address-of-packed-member"
Related show

Commit Message

Tomasz Duszynski Feb. 16, 2020, 12:17 p.m. UTC
Using memcpy() for some MMIO access is generally frowned upon and might
break things on some platforms. Allwinner H3, which fails to boot, being
an example here.

Moreover, fields being accessed are naturally aligned and warnings
produced by GCC have been quiesced for some time already by:

53dc8ae ("gcc-9: silence 'address-of-packed-member' warning")

That said, it should be okay to revert this commit.

This reverts commit 9bd34a69a453d409792e08c00953ce8862145e65.
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
Cc: Jagan Teki <jagan@amarulasolutions.com>

Signed-off-by: Tomasz Duszynski <tduszyns@gmail.com>
---
 arch/arm/cpu/armv7/sunxi/psci.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

--
2.24.1

Patch
diff mbox series

diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index 5b689004e8..2c5d99e9ac 100644
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -75,7 +75,7 @@  static void __secure __mdelay(u32 ms)
 	isb();
 }

-static void __secure clamp_release(void __maybe_unused *clamp)
+static void __secure clamp_release(u32 __maybe_unused *clamp)
 {
 #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
 	defined(CONFIG_MACH_SUN8I_H3) || \
@@ -90,7 +90,7 @@  static void __secure clamp_release(void __maybe_unused *clamp)
 #endif
 }

-static void __secure clamp_set(void __maybe_unused *clamp)
+static void __secure clamp_set(u32 __maybe_unused *clamp)
 {
 #if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN7I) || \
 	defined(CONFIG_MACH_SUN8I_H3) || \
@@ -99,28 +99,22 @@  static void __secure clamp_set(void __maybe_unused *clamp)
 #endif
 }

-static void __secure sunxi_power_switch(void *clamp, void *pwroff_ptr, bool on,
+static void __secure sunxi_power_switch(u32 *clamp, u32 *pwroff, bool on,
 					int cpu)
 {
-	u32 pwroff;
-
-	memcpy(&pwroff, pwroff_ptr, sizeof(u32));
-
 	if (on) {
 		/* Release power clamp */
 		clamp_release(clamp);

 		/* Clear power gating */
-		clrbits_le32(&pwroff, BIT(cpu));
+		clrbits_le32(pwroff, BIT(cpu));
 	} else {
 		/* Set power gating */
-		setbits_le32(&pwroff, BIT(cpu));
+		setbits_le32(pwroff, BIT(cpu));

 		/* Activate power clamp */
 		clamp_set(clamp);
 	}
-
-	memcpy(pwroff_ptr, &pwroff, sizeof(u32));
 }

 #ifdef CONFIG_MACH_SUN8I_R40