From patchwork Mon May 13 19:16:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1099099 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.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.b="Ej93glhN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 452rD03945z9s00 for ; Tue, 14 May 2019 05:17:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 27AFBC21C38; Mon, 13 May 2019 19:16:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 411CDC21C51; Mon, 13 May 2019 19:16:57 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2BDF0C21C51; Mon, 13 May 2019 19:16:55 +0000 (UTC) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by lists.denx.de (Postfix) with ESMTPS id D9392C21C38 for ; Mon, 13 May 2019 19:16:54 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id w8so14097558wrl.6 for ; Mon, 13 May 2019 12:16:54 -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=kHur1rh6XWsBPG5V222wZBYas/yHirmR0DQdEPyxGvg=; b=Ej93glhNieFp4rJztdOqvy9sOX/EB8QWi09is1ZZfkLkcQ9j+IeOPbTvjUS8Qj4vB9 wwSn+Xv0YJ8IWbnzLocD7JrDJ6zPazTc8Jd/sHBbYsSd2T9AZ7Fp45Ro7T0NpYZ7uA2t hi+LvJajWlMt4K31K59FF+SvR5n+k81z1tW7yELWBWZckoU+8QaBbU11uEhdGVl7cosA hL5Zxx0rNwSyNF5CaQCPqpTvJL8oZnzJig3M+FonnfEp3pUir8PLL1uUk5nL/wBeoNJ0 KbBMgwst5gAyqfDdx7+7PaY23aTpYPAnFZsFQtjtO//dacfQO7b6zQfPLM7XD75YtKzY EAmg== 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=kHur1rh6XWsBPG5V222wZBYas/yHirmR0DQdEPyxGvg=; b=h45XelQtdpu9cbQeXSzQxZSCMwIHPqw/XRgcgMnXM52LAK5LMFkbNymwhcP6NwckaX f6YpNZc6CUz2j1utF4WZCGW9LZO7CL+rraZbmQQOjMhuBt0Hzi+U0LzZgEYo9rmx5hLf 4jycsLwZK2cgDR+O0EICt+C9vJypNv9T4ZjPQtxGGPU3tLuXetInku2qZWiHSCUrB20o OgSIGV83y02NNf5OIsx8ceTStD8lrvJjKTszxF4zQrFHGUYa8ih7PKxVZ6O0lZsArewu QGucO/F1YF9bJ/qUOTQp5UWges7Pi+xWTxRogV0luTppI2UmWZ7XLMbO8Vxp3/S5bqu3 RTlw== X-Gm-Message-State: APjAAAUsupMULQxJ5K+D2i+0KaXh/7mHoCe3/PO6uUl0/vo7v+QGlgZK KpLj8R5T6tw3/AhM/7FUl44= X-Google-Smtp-Source: APXvYqzzt6JLKRfnPfzanFbpIc9FM+UFFccByfA2Gtl/k6u+bJgSSZGKTA/oNlxDc/pKwVPYNrQElQ== X-Received: by 2002:adf:9bd8:: with SMTP id e24mr13741154wrc.1.1557775014559; Mon, 13 May 2019 12:16:54 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:2df8:99ba:e50f:756b]) by smtp.gmail.com with ESMTPSA id n15sm19915061wru.67.2019.05.13.12.16.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 12:16:54 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut Date: Mon, 13 May 2019 21:16:43 +0200 Message-Id: <20190513191644.15329-1-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Tom Rini Subject: [U-Boot] [PATCH 1/2] arm: socfpga: remove re-added ad-hoc reset code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" commit c5de2b7eae68 ("arm: socfpga: implement proper peripheral reset") has removed the call to 'reset_deassert_peripherals_handoff()' from socfpga gen5 SPL since the reset driver now handles resets. However, commit c1d4b464c8b8 ("ARM: socfpga: Disable bridges in SPL unless booting from FPGA") has re-added this ad-hoc reset code, so that all peripherals were now again enabled instead of letting the drivers enable them by request. While at it, remove this function for gen5 as it should not be used. Fixes: commit c1d4b464c8b8 ("ARM: socfpga: Disable bridges in SPL unless booting from FPGA") Signed-off-by: Simon Goldschmidt --- arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h | 1 - arch/arm/mach-socfpga/reset_manager_gen5.c | 8 -------- arch/arm/mach-socfpga/spl_gen5.c | 3 +-- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h index 5e490d182e..f4dcb14623 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h @@ -8,7 +8,6 @@ #include -void reset_deassert_peripherals_handoff(void); void socfpga_bridges_set_handoff_regs(bool h2f, bool lwh2f, bool f2h); void socfpga_bridges_reset(int enable); diff --git a/arch/arm/mach-socfpga/reset_manager_gen5.c b/arch/arm/mach-socfpga/reset_manager_gen5.c index 89a384b59c..9a32f5abfe 100644 --- a/arch/arm/mach-socfpga/reset_manager_gen5.c +++ b/arch/arm/mach-socfpga/reset_manager_gen5.c @@ -61,14 +61,6 @@ void socfpga_per_reset_all(void) writel(0xffffffff, &reset_manager_base->per2_mod_reset); } -/* - * Release peripherals from reset based on handoff - */ -void reset_deassert_peripherals_handoff(void) -{ - writel(0, &reset_manager_base->per_mod_reset); -} - #define L3REGS_REMAP_LWHPS2FPGA_MASK 0x10 #define L3REGS_REMAP_HPS2FPGA_MASK 0x08 #define L3REGS_REMAP_OCRAM_MASK 0x01 diff --git a/arch/arm/mach-socfpga/spl_gen5.c b/arch/arm/mach-socfpga/spl_gen5.c index bd2a9fe5ae..1a60cdc897 100644 --- a/arch/arm/mach-socfpga/spl_gen5.c +++ b/arch/arm/mach-socfpga/spl_gen5.c @@ -175,8 +175,7 @@ void board_init_f(ulong dummy) sysmgr_pinmux_init(); sysmgr_config_warmrstcfgio(0); - /* De-assert reset for peripherals and bridges based on handoff */ - reset_deassert_peripherals_handoff(); + /* Set bridges handoff value */ socfpga_bridges_set_handoff_regs(true, true, true); debug("Unfreezing/Thaw all I/O banks\n"); From patchwork Mon May 13 19:16:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Goldschmidt X-Patchwork-Id: 1099100 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.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.b="N6zP7cwu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 452rDQ1k2mz9s00 for ; Tue, 14 May 2019 05:17:26 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id DD126C21E0B; Mon, 13 May 2019 19:17:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C05C7C21E2C; Mon, 13 May 2019 19:17:13 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0D12BC21E26; Mon, 13 May 2019 19:17:01 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by lists.denx.de (Postfix) with ESMTPS id 5AA0AC21C38 for ; Mon, 13 May 2019 19:16:58 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id d12so16504272wrm.8 for ; Mon, 13 May 2019 12:16:58 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=WnMReM0blUQSyS8rEvqk3XXPVMANIW5HsOrGLaweG+E=; b=N6zP7cwuYzfM2rZL7DMODRKQoW00b+tS3S2PfQ/BDpG9/4cCLilyiV+VAiYNmvzfWd lsky1hUnLUZ8FNPvYfU4MokrjjQt8FWfgzJXS51JS3XcGbHMzL5H/J9vLu0WPEbLbBbw bWHnznrtSX1euBrGzxCoFisn/9UuiJkgApkrIInCLohOFF9jljQwpvy2XB7yi8nmS77d ckXl/SiMmGVD3UIRER8ZSmJxR0aopN5UUxE2VnpcoxC7B4LpMgg/N3r5Ym1jkDsLRj9u lNnSnAnKlogw14VjwcWnMZgSwx0AoSHEA1fxJiYPaVTzfLES+6Ii5MQLGwi7d+0TP7aw gLtg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=WnMReM0blUQSyS8rEvqk3XXPVMANIW5HsOrGLaweG+E=; b=RxINTztT53k4tBNd8FrwNzEKb92iG3xSYmLQx18C62RiAUEFZZMIZRr1aVd5RFtPNi sos0p9syIi4Dv/Z4VJpfjtPpmHz0DqwqW6BjyNIDHx43ONAIdm3f1Zcje8ZnAMTrMteF IFn9XRjuzDvpPIiyFL9VO2+fmzX3EhBs01J9hprcXUKl9HCERoPSmflggpHybEdbfxsN ClE/MFAyBfOh91roHkDlfiko1dlKLIqRsjDwDe/CxBG5YHEtf2M6voWL2lH5peVdLNyl lorfBEb6q91Qq1kdwcmvnjXRE1bdJm8IzO+kIuhN6rsIzehgMPGHE+OXtX8IIRJJH5TA JMnQ== X-Gm-Message-State: APjAAAUNGF7UZS6gz85G5JODoSvZ1B9TsfTahmT2yz3oR4174vb13788 wa8t0f2gM2Apvdt2kkw4yDo= X-Google-Smtp-Source: APXvYqwvV1ZBuWk+3/qf+UokIi0HiKdBh1Ina04OnQXIYKPpMlUGzbgRLVapEsah9JcYjq6ZdUlgNw== X-Received: by 2002:adf:f487:: with SMTP id l7mr19423283wro.127.1557775018073; Mon, 13 May 2019 12:16:58 -0700 (PDT) Received: from ubuntu.home ([2a02:8071:6a3:700:2df8:99ba:e50f:756b]) by smtp.gmail.com with ESMTPSA id n15sm19915061wru.67.2019.05.13.12.16.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 May 2019 12:16:57 -0700 (PDT) From: Simon Goldschmidt To: Marek Vasut Date: Mon, 13 May 2019 21:16:44 +0200 Message-Id: <20190513191644.15329-2-simon.k.r.goldschmidt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190513191644.15329-1-simon.k.r.goldschmidt@gmail.com> References: <20190513191644.15329-1-simon.k.r.goldschmidt@gmail.com> MIME-Version: 1.0 Cc: u-boot@lists.denx.de, Tom Rini Subject: [U-Boot] [PATCH 2/2] arm: sofcpga: s10: remove unused ad-hoc reset code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The stratix 10 reset manager ad-hoc code in arch/arm contains an unused function 'reset_deassert_peripherals_handoff' that has been added from the beginning. As this is probably a result of copying the gen5 reset manager and this function has never been used, remove it. Signed-off-by: Simon Goldschmidt --- .../arm/mach-socfpga/include/mach/reset_manager_s10.h | 1 - arch/arm/mach-socfpga/reset_manager_s10.c | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h index b93bbaf537..452147b017 100644 --- a/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h +++ b/arch/arm/mach-socfpga/include/mach/reset_manager_s10.h @@ -8,7 +8,6 @@ #define _RESET_MANAGER_S10_ void reset_cpu(ulong addr); -void reset_deassert_peripherals_handoff(void); int cpu_has_been_warmreset(void); void socfpga_bridges_reset(int enable); diff --git a/arch/arm/mach-socfpga/reset_manager_s10.c b/arch/arm/mach-socfpga/reset_manager_s10.c index 39753a13c4..499a84aff5 100644 --- a/arch/arm/mach-socfpga/reset_manager_s10.c +++ b/arch/arm/mach-socfpga/reset_manager_s10.c @@ -94,17 +94,6 @@ void socfpga_bridges_reset(int enable) } } -/* - * Release peripherals from reset based on handoff - */ -void reset_deassert_peripherals_handoff(void) -{ - writel(0, &reset_manager_base->per1modrst); - /* Enable OCP first */ - writel(~RSTMGR_PER0MODRST_OCP_MASK, &reset_manager_base->per0modrst); - writel(0, &reset_manager_base->per0modrst); -} - /* * Return non-zero if the CPU has been warm reset */