From patchwork Sun Feb 16 12:17:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Duszynski X-Patchwork-Id: 1238753 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=sDjd22Ew; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 48L5jb5q4Wz9sRh for ; Sun, 16 Feb 2020 23:17:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E3E6A808AB; Sun, 16 Feb 2020 13:17:43 +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=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sDjd22Ew"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C010280911; Sun, 16 Feb 2020 13:17:41 +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=-2.0 required=5.0 tests=BAYES_00,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-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (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 E00E380899 for ; Sun, 16 Feb 2020 13:17:38 +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-x243.google.com with SMTP id v17so15654104ljg.4 for ; Sun, 16 Feb 2020 04:17:38 -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=sDjd22EwC4HPEqq1o5TrXBg8MIg8CEn4mN/qAj5xBz/Ta6YzdyItK4Vg96+/rYnuAb DyuUtjcjdghnUxGIZ52Ho1YLKkUiSFekxjpXiDdqS6DlkaLoY6clR3OR0M2keFqEdm+J B/rdR7PG3IkqAuRb6mxGzddqj8On0QxmYzuRg9/vFRcGkAmMG8vIkU+ykl4xuVsxVaD2 9ei+fNtqqxsudAPJ1H8FJWmedq1T80vpAN3uasGlj99/vtrHD2Y7z1MLgoxrVP4Z5f1m mnP01ImloU9ziQ3ofxFFTbeT0Lo2ueL9nqa7Dj3NdDlhSdNrdESJgRNO+IbGpdcAXj4G L2hw== 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=Wlv7OPlH5luUByNfgjrFH0uh43T0BUzWdlpDXryknfnLRfpKztwx5728t8/GzrDrP2 E3NLCgAf2K/hemJj88taY9APEAlFLsnpJf6a3TTH6U3QIX//cxKQ9YeYhFrWivWLNPA4 jwvtw495foPZBlcy8hJ2heKYbHQ9RYGT3IlKcTAu6Caj+JjQaf3l0dJO6iZER0GjF/U1 uZU2TCmp7vG6lG2EfhIxpADIrB5F/w4aCI5MMhArqUUDOUcJSQWAsW+Vxqsgjjpi4x6z 6+DpbpcxN29bDkS9kjjFn1wm8eIP541QHQcU6p6M34FzV+m+DrMp77fvac7vY8OWLMau 9Itw== X-Gm-Message-State: APjAAAW0jQNdqS+VzI9neqgURzdNpzNTFu0ee3Bp4bCOR3tyixCCMUjX v4Ynu4Ex4WMmcQc5YLVga9yY1sutvJc= X-Google-Smtp-Source: APXvYqz9aPi45HPcNhH/K+u9Qtl7w2h0I4HqoGzbNV9DDbuCHsK7zq8JlHPY2eDVMnpwE0fLpKAR7g== X-Received: by 2002:a2e:9b05:: with SMTP id u5mr7208304lji.59.1581855457914; Sun, 16 Feb 2020 04:17:37 -0800 (PST) Received: from arch.lan (89-70-31-203.dynamic.chello.pl. [89.70.31.203]) by smtp.gmail.com with ESMTPSA id l22sm6640251lje.40.2020.02.16.04.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Feb 2020 04:17:37 -0800 (PST) From: Tomasz Duszynski To: u-boot@lists.denx.de Cc: mripard@kernel.org, Tomasz Duszynski , Heinrich Schuchardt , Jagan Teki Subject: [PATCH] Revert "sunxi: psci: avoid error address-of-packed-member" Date: Sun, 16 Feb 2020 13:17:16 +0100 Message-Id: <20200216121716.4084-1-tduszyns@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.1 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