From patchwork Mon Jan 27 18:28:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 1230024 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Fh2auA6Y; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4860tG41CYz9sNF for ; Tue, 28 Jan 2020 06:58:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 09C0E818C4; Mon, 27 Jan 2020 20:58:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Fh2auA6Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C28B818AB; Mon, 27 Jan 2020 19:28:31 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, SPF_HELO_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 3870C8189D for ; Mon, 27 Jan 2020 19:28:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tduszyns@gmail.com Received: by mail-lj1-x242.google.com with SMTP id o11so11888094ljc.6 for ; Mon, 27 Jan 2020 10:28:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UMGQdXYpatL8XptvH9BkFbkJVHpZ+AglMKV1OjufTqw=; b=Fh2auA6YUaPMfbCDW7BLxILd2yJZpHmRIJaJI5FIcl13Z6pZeJNvRyjc64EZ7XcTXe qkXKIkv4oiuspOkrNq9PaMdKUs3432j3oSWyV/sD8LA15QhPYt0ERegwUiTOgA8Wry5j 2j4afVI673Io6wj74nlU39C7GPK1ZhZ9e+u95LcfwZ0uwlhvVKXGg9iuic9lNNvRrksl PbbqgaJBp9nLVEc4S0cs2wtc1wAF0lYIWmR7hTdrOcBNj9PtMqxVHeyXNUdsbbkpI29w S1eaYnX0LXGLFsXfuR2TzgWE0eMp5eFtzLFaenaamPO4RUU77Pr0pDi96qIQrNqK3hnp dJ4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=UMGQdXYpatL8XptvH9BkFbkJVHpZ+AglMKV1OjufTqw=; b=pA2joUzzvOjKBM6jcMaSGrr5o8Q+UFXYx3yjvAAkUGUDORMZmdQP0ehZTpAxLz+mWD smLowZ/mbP6VdLc6j/Ye6d1Ee4vChX+owvuqj+t5BPUigk/4ICHNxJrY/vWpjht4SFbh pq1s1eC/FGw05Wy/pcAyQrZYxF754rlqi1NqFnmo/w9nGWs0srRqGbLWmhvkSReCewGy 9CDdF1FZpHtTeXeviuEW8JO+h4bJvs/w6X6n9xQ75TDshGqwKkf+lhQg/eEMPCvT6CXJ 1JVboyHEgEk8gcfY/u5TzBqd27NPzazpophwAVRb2pcWIt/enDPmlkMyZMlbf0ZDUSwx +Rqw== X-Gm-Message-State: APjAAAU/taj5YI6KLmgQAv9pSFacC59+m/5QsfL5LrOfeIVtstyATFWg J+ZVkMhcmjDZ+GtndIsRgrEyLzv9068Zkg== X-Google-Smtp-Source: APXvYqxXtMSO2R8mgsjTjsFgOOmpMvrPJYlp0e5B6h0IHq6WlnNfFlxfMYrpODsdaR3INIkSkQUf1g== X-Received: by 2002:a2e:9d89:: with SMTP id c9mr3399586ljj.212.1580149707095; Mon, 27 Jan 2020 10:28:27 -0800 (PST) Received: from arch.lan (89-70-31-203.dynamic.chello.pl. [89.70.31.203]) by smtp.gmail.com with ESMTPSA id n1sm8427612lfq.16.2020.01.27.10.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 10:28:25 -0800 (PST) From: Tomasz Duszynski To: u-boot@lists.denx.de Subject: [PATCH] Revert "sunxi: psci: avoid error address-of-packed-member" Date: Mon, 27 Jan 2020 19:28:04 +0100 Message-Id: <20200127182804.98359-1-tduszyns@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 27 Jan 2020 20:58:12 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Heinrich Schuchardt Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean 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 Cc: Jagan Teki Signed-off-by: Tomasz Duszynski --- arch/arm/cpu/armv7/sunxi/psci.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) -- 2.24.1 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