From patchwork Thu Aug 6 10:53:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 1341587 X-Patchwork-Delegate: trini@ti.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=none (p=none dis=none) header.from=aries-embedded.de Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=aries-embedded.de header.i=@aries-embedded.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=dFol/qP2; 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 4BMlhZ6kn3z9sTM for ; Thu, 6 Aug 2020 20:53:18 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B3DC821B2; Thu, 6 Aug 2020 12:53:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=aries-embedded.de 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=aries-embedded.de header.i=@aries-embedded.de header.b="dFol/qP2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 46028821D0; Thu, 6 Aug 2020 12:53:10 +0200 (CEST) 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,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7F4C281F2D for ; Thu, 6 Aug 2020 12:53:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=aries-embedded.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=wg@aries-embedded.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1596711187; s=strato-dkim-0002; d=aries-embedded.de; h=Date:Message-ID:Subject:From:Cc:To:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=0p3Zkm0FsrFEG5Pz6W97IGY8K+8TLU5BFQAWoVFf2yQ=; b=dFol/qP2V4kkY/5nxzd51HfK6cswk5Af9x6z+/2Q4+wZRla48TkjViIZecD4SlYsjn O/K7QK22FpBp9rfdo+OWLDo7R6Q6Hf0Et76WwCYq+QYB+r+wlF36PPRQQMZUrZsAF6Tq 7I5oQJTS5HsenNqmhrOPiJCJ4dz1R51zUJr0fIk4RNt8g4SXi3oiUpJIm3p6cjBbNK2+ TKBJ1C4fv02+sQYmNbLcAA5++i4r01WsLQgGdRVZqzLHgiWkSkfzbvmHW502Om4SeCbt lh8MJon5Kw84nG6FKudW6++zjx8CausOivLIAq24krzxA4gktkKgdxOnzYsBPmjo2dWt JJ/A== X-RZG-AUTH: ":O2skdFKhfuz21dw9Xid368n6nTAlVRCUfGlb9GDbxEjgBCc0vcCXFl8k0xlDyz1phQF53rWMfRXSsaZX7Xkp29BysVlPHmXcVKXcUhGt" X-RZG-CLASS-ID: mo01 Received: from [IPv6:2003:c4:d71c:7100:f1e5:4d21:8627:bc11] by smtp.strato.de (RZmta 46.10.5 AUTH) with ESMTPSA id J09927w76Ar7qGm (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Thu, 6 Aug 2020 12:53:07 +0200 (CEST) To: U-Boot Mailing List Cc: Marek Vasut , Simon Goldschmidt From: Wolfgang Grandegger Openpgp: preference=signencrypt Autocrypt: addr=wg@aries-embedded.de; prefer-encrypt=mutual; keydata= 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 caP9sHg88B9851WpveNE6Q== Subject: Revert "ARM: socfpga: Remove socfpga_sdram_apply_static_cfg() Message-ID: <03387b53-b517-0d54-a620-71ce39c4e903@aries-embedded.de> Date: Thu, 6 Aug 2020 12:53:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 Content-Language: en-US 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.102.3 at phobos.denx.de X-Virus-Status: Clean This reverts commit c5f4b805755912a3d2fe20f014b6b6ab0473bd73. Conflicts: arch/arm/mach-socfpga/misc_gen5.c Without socfpga_sdram_apply_static_cfg(), the system hangs when Linux calls altvipfb2_start_hw() of the Intel Video and Image Processing(VIP) Frame Buffer II driver (drivers/video/fbdev/altvipfb2.c), but only after a power cycle (cold boot). The issue does not show up after a soft reset (warm boot) and with v2018.11. Signed-off-by: Wolfgang Grandegger CC: Marek Vasut CC: Simon Goldschmidt --- arch/arm/mach-socfpga/misc_gen5.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/arch/arm/mach-socfpga/misc_gen5.c b/arch/arm/mach-socfpga/misc_gen5.c index 7209e8d..c1ecd92 100644 --- a/arch/arm/mach-socfpga/misc_gen5.c +++ b/arch/arm/mach-socfpga/misc_gen5.c @@ -216,6 +216,35 @@ int arch_early_init_r(void) static struct socfpga_sdr_ctrl *sdr_ctrl = (struct socfpga_sdr_ctrl *)SDR_CTRLGRP_ADDRESS; +static void socfpga_sdram_apply_static_cfg(void) +{ + const u32 applymask = 0x8; + u32 val = readl(&sdr_ctrl->static_cfg) | applymask; + + /* + * SDRAM staticcfg register specific: + * When applying the register setting, the CPU must not access + * SDRAM. Luckily for us, we can abuse i-cache here to help us + * circumvent the SDRAM access issue. The idea is to make sure + * that the code is in one full i-cache line by branching past + * it and back. Once it is in the i-cache, we execute the core + * of the code and apply the register settings. + * + * The code below uses 7 instructions, while the Cortex-A9 has + * 32-byte cachelines, thus the limit is 8 instructions total. + */ + asm volatile( + ".align 5 \n" + " b 2f \n" + "1: str %0, [%1] \n" + " dsb \n" + " isb \n" + " b 3f \n" + "2: b 1b \n" + "3: nop \n" + : : "r"(val), "r"(&sdr_ctrl->static_cfg) : "memory", "cc"); +} + void do_bridge_reset(int enable, unsigned int mask) { int i; @@ -233,6 +262,7 @@ void do_bridge_reset(int enable, unsigned int mask) writel(iswgrp_handoff[2], socfpga_get_sysmgr_addr() + SYSMGR_GEN5_FPGAINFGRP_MODULE); + socfpga_sdram_apply_static_cfg(); writel(iswgrp_handoff[3], &sdr_ctrl->fpgaport_rst); writel(iswgrp_handoff[0], socfpga_get_rstmgr_addr() + RSTMGR_GEN5_BRGMODRST); @@ -245,6 +275,7 @@ void do_bridge_reset(int enable, unsigned int mask) writel(0, socfpga_get_sysmgr_addr() + SYSMGR_GEN5_FPGAINFGRP_MODULE); writel(0, &sdr_ctrl->fpgaport_rst); + socfpga_sdram_apply_static_cfg(); writel(0x7, socfpga_get_rstmgr_addr() + RSTMGR_GEN5_BRGMODRST); writel(1, &nic301_regs->remap); }