From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 01 Feb 2024 00:00:17 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rVJZ2-00EZhK-2D for lore@lore.pengutronix.de; Thu, 01 Feb 2024 00:00:17 +0100 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rVJZ3-0007cN-7f for lore@pengutronix.de; Thu, 01 Feb 2024 00:00:17 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=jgbayl7DW7QHVdMCpIC7HnmNJh+a6zfUcBCH96vDvCM=; b=RjWK0d6o4qLEzmXQko6yswh4Yq G3HDI8UFbhJLQ1vYei2XGUEQaemQKiBb/z8zl42ch/HUOvAKQEDGzk6wAetn/nz8rLXK84dZwS4Vo yVFHW3YbeI6E6gQDP4OJE/7CT233reZ2kiwoi2t8IthlBId5arNDA/OM5U4riQmHttytWo9OPmHSQ SsZeL/xy9eBRbK7tBlxZf/huxdyBdaSV8UVbN49HeUjEtq8QJLLuWh6I2/QjTc9lvKb8hYYuHCYxt GTN5895zHIfwIB5uMitNF//qd5Jf+Y/nqIGfppZSHA+/HUkkOZ96ERNJBIwt1ZPB1Hdzr295mH6QX EXsxUgzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVJYb-00000005lRg-1AY1; Wed, 31 Jan 2024 22:59:49 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVJYU-00000005lOu-049S for barebox@lists.infradead.org; Wed, 31 Jan 2024 22:59:44 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rVJYR-0007LA-VP; Wed, 31 Jan 2024 23:59:39 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rVJYR-003j6k-C0; Wed, 31 Jan 2024 23:59:39 +0100 Received: from localhost ([::1] helo=dude05.red.stw.pengutronix.de) by dude05.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1rVJYR-007KFg-0u; Wed, 31 Jan 2024 23:59:39 +0100 From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: str@pengutronix.de, ske@pengutronix.de, Gwenhael Goavec-Merou , Ahmad Fatoum Date: Wed, 31 Jan 2024 23:59:36 +0100 Message-Id: <20240131225938.1746123-3-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240131225938.1746123-1-a.fatoum@pengutronix.de> References: <20240131225938.1746123-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240131_145942_137832_ABE0A62B X-CRM114-Status: GOOD ( 10.14 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.7 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master 2/4] ARM: socfpga: populate HANDOFF_FPGA2SDR with Quartus value X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) The Terasic DE10-Nano is the only upstream board that has a non-zero value for CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST in the headers generated by Quartus. Yet, barebox ignored this value, with the effect that either: - The Linux bridge driver reads a zero value from the handoff3 register and keeps all fpga2sdram ports in reset - The barebox bridge driver uses its hardcoded mask of 0x3fff, when the bridge is enabled, which is different than the Quartus value of 0x1FF. Fix the first point by populating the handoff3 register, so an enabled Linux driver can enable the correct ports. A fix for barebox configurations with CONFIG_SOCFPGA_FPGA_BRIDGE=y follows in the follow-up commit. Cc: Gwenhael Goavec-Merou Signed-off-by: Ahmad Fatoum --- include/mach/socfpga/cyclone5-sdram-config.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/mach/socfpga/cyclone5-sdram-config.h b/include/mach/socfpga/cyclone5-sdram-config.h index 06f06ef5d78f..2abef7f31121 100644 --- a/include/mach/socfpga/cyclone5-sdram-config.h +++ b/include/mach/socfpga/cyclone5-sdram-config.h @@ -155,6 +155,9 @@ static inline void socfpga_sdram_mmr_init(void) CONFIG_HPS_SDR_CTRLCFG_DRAMODT_WRITE << SDR_CTRLGRP_DRAMODT_WRITE_LSB; sdram_write(SDR_CTRLGRP_DRAMODT_ADDRESS, val); + val = CONFIG_HPS_SDR_CTRLCFG_FPGAPORTRST; + writel(val, ISWGRP_HANDOFF_FPGA2SDR); + val = readl(CYCLONE5_SDR_ADDRESS + SDR_CTRLGRP_STATICCFG_ADDRESS); val &= ~(SDR_CTRLGRP_STATICCFG_APPLYCFG_MASK); val |= 1 << SDR_CTRLGRP_STATICCFG_APPLYCFG_LSB; -- 2.39.2