From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 510EEC432BE for ; Fri, 27 Aug 2021 20:57:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2375C60F4F for ; Fri, 27 Aug 2021 20:57:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2375C60F4F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AF20F832AD; Fri, 27 Aug 2021 22:57:37 +0200 (CEST) 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="hAt6Nc+z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 26F91832C2; Fri, 27 Aug 2021 22:57:36 +0200 (CEST) Received: from mail-il1-x136.google.com (mail-il1-x136.google.com [IPv6:2607:f8b0:4864:20::136]) (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 AB97483212 for ; Fri, 27 Aug 2021 22:57:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aford173@gmail.com Received: by mail-il1-x136.google.com with SMTP id z2so8358255iln.0 for ; Fri, 27 Aug 2021 13:57:32 -0700 (PDT) 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=A/PRB/RS/8MpMa4dk/mcXpsaCYiZFIS8VY5vAvpjY4M=; b=hAt6Nc+z3pyldB5JXAotCRfbW43ONexjFNhVCPJYaEPIHXxKeS2G6IQYyjZNoTvdut aPyeqWYfJHuPiNM1avSQZ023lITNd5zUn7GkMXwn7uazLHibJ9gy8ZdgD4YiGyVLAi3l FrrtsTPyYWvWVMsQd5xlS5ZTrONHBLsLGkmuMYmaXBf/OYNO5e+hEYh+5omFHe5wiHpm aHC+VtOmbeQO5GpjH7vzmdeOlsQjHf9/VEVVpK57+pI5Wh/o0zckSKnQ0VQLg5QmtVgO si5FBMlcF/l6haSjN+WvDb0/F7yNE2+6NBswnhsG68qk0UFd0p0GzlOoPK7uep1BudZF HNBg== 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=A/PRB/RS/8MpMa4dk/mcXpsaCYiZFIS8VY5vAvpjY4M=; b=A5a3PFFebiqBM2hxYNfEcxpKDBER4iOkGM3TER/7h3dHC/YqcpJd1rOtaZOgrQ7r0L Nh+nGURH7s57j747q/RdYLJJTeg2jjc5BoY+D00BPaq3a9+3fm7AAJFGC7gfN94Ht6Ey MEi9RgSYwWwNVlzM5813ceWeU7Of1Rb/Lc7sZWiOGmgiDEDuQJhSweqvdn6flV6+7DEg gK8nbcS70eNTVQdxCvvmXcU784IniuWMkUlc3w7y+x2VAZSqVkp9/NVUs4oNqknazOWc syaivZznKwDxMuU5P2AU1b1MGTkAd0nyd4Nl33gPyRH3S86Ky+jM81knvB7GTEGw9Dv8 fAJA== X-Gm-Message-State: AOAM533fE4itetrH8jx8z7bpxVVkFq4D4L+XfPTx7qJRzb38R5sEXhcH DvOpea7CKdTcODlXwm6OSCJvFQJ7ocudLw== X-Google-Smtp-Source: ABdhPJwoVfOFYijfj0z2cJyFGDLo1bn5iH7WyS9SFG2fmqGuR6r5Cd6kxtn8FJGQtXHM9Lzhj0W1xA== X-Received: by 2002:a92:cb04:: with SMTP id s4mr7862182ilo.130.1630097850642; Fri, 27 Aug 2021 13:57:30 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id u10sm4238203ilg.15.2021.08.27.13.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 13:57:30 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: marek.vasut+renesas@gmail.com, biju.das.jz@bp.renesas.com, Adam Ford Subject: [PATCH 1/2] arm: mach-rmobile: Move cpu_reset to rzg2-reset.c Date: Fri, 27 Aug 2021 15:57:17 -0500 Message-Id: <20210827205718.536008-1-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.103.2 at phobos.denx.de X-Virus-Status: Clean Various RZ/G2[MNH] boards have copies of cpu_reset which creates duplicate code, so move this to a common file shared among all users of the RZG2 and declare it weak so it can be overwritten if necessary. Signed-off-by: Adam Ford diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-rmobile/Makefile index 195bbeb5c8..2bd173ec3a 100644 --- a/arch/arm/mach-rmobile/Makefile +++ b/arch/arm/mach-rmobile/Makefile @@ -13,7 +13,7 @@ obj-$(CONFIG_SH73A0) += lowlevel_init.o cpu_info-sh73a0.o pfc-sh73a0.o obj-$(CONFIG_R8A7740) += lowlevel_init.o cpu_info-r8a7740.o pfc-r8a7740.o obj-$(CONFIG_RCAR_GEN2) += lowlevel_init_ca15.o cpu_info-rcar.o obj-$(CONFIG_RCAR_GEN3) += lowlevel_init_gen3.o cpu_info-rcar.o memmap-gen3.o -obj-$(CONFIG_RZ_G2) += cpu_info-rzg.o +obj-$(CONFIG_RZ_G2) += cpu_info-rzg.o rzg2-reset.o ifneq ($(CONFIG_R8A779A0),) obj-$(CONFIG_ARMV8_PSCI) += psci-r8a779a0.o diff --git a/arch/arm/mach-rmobile/rzg2-reset.c b/arch/arm/mach-rmobile/rzg2-reset.c new file mode 100644 index 0000000000..8c3608f34a --- /dev/null +++ b/arch/arm/mach-rmobile/rzg2-reset.c @@ -0,0 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Renesas Electronics Corporation + */ + +#include + +#define RST_BASE 0xE6160000 +#define RST_CA57RESCNT (RST_BASE + 0x40) +#define RST_CA53RESCNT (RST_BASE + 0x44) +#define RST_CA57_CODE 0xA5A5000F +#define RST_CA53_CODE 0x5A5A000F + +__weak void reset_cpu(void) +{ + unsigned long midr, cputype; + + asm volatile("mrs %0, midr_el1" : "=r" (midr)); + cputype = (midr >> 4) & 0xfff; + + if (cputype == 0xd03) + writel(RST_CA53_CODE, RST_CA53RESCNT); + else + writel(RST_CA57_CODE, RST_CA57RESCNT); +} + -- 2.25.1