From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 25 Jun 2021 12:01:57 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwier-0001zD-73 for lore@lore.pengutronix.de; Fri, 25 Jun 2021 12:01:57 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwiep-0001cw-GG for lore@pengutronix.de; Fri, 25 Jun 2021 12:01:57 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=5e5NY7vDu/NafDfEdU3XamJNcZDMZLUKvT69z+kRh14=; b=AxxvteMoqOC0bY O+wnjiALCX9XyFtHNdd7lsLCGZwPSg4sEaOcpqCbcUSfqlWyvW/YodH1cQOQalAxqmSNd4XoXmzFf zYxVWli6+tz//K9yUlPJyviahoHp98iCsDntJjTO6K71ZPaATljSTwgVcVto6t/SoNld9/tsDXbV2 JTJgkATn84JMO0mdse53Cn0MPiN/ieWMpfEfpCm4ifWoiuBHtgePJh60+zLqyFC+TVez5fAJB+XP+ qc70opYsDOMu6HOwiR3R6NN7QLX1Mhgid9TyWmhCkTZBPxBIVSS1etO4BcKkUG6dqtjY5F6EI0qO8 1oKjZyXItvQ6Y7DR4Rmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwics-000oii-Vs; Fri, 25 Jun 2021 09:59:55 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwhgn-000XcA-1t for barebox@lists.infradead.org; Fri, 25 Jun 2021 08:59:55 +0000 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lwhgj-0001aU-Cu for barebox@lists.infradead.org; Fri, 25 Jun 2021 10:59:49 +0200 Received: from str by dude02.hi.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1lwhgj-0006W2-2k for barebox@lists.infradead.org; Fri, 25 Jun 2021 10:59:49 +0200 From: Steffen Trumtrar To: Barebox List Date: Fri, 25 Jun 2021 10:59:44 +0200 Message-Id: <20210625085944.11260-1-s.trumtrar@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210625_015953_174679_D6A5AAA4 X-CRM114-Status: GOOD ( 18.10 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:e::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.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-4.9 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, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH v2] firmware: socfpga: set APPLYCFG after loading bitstream X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) To make changes to the SDRAM controller effective, the APPLYCFG bit must be set after programming the bitstream to the FPGA. This has to be done without any SDRAM usage. Therefore copy the function to execute to the OCRAM and execute it from there. Signed-off-by: Steffen Trumtrar --- Notes: v1: Link: https://lore.barebox.org/20210618080939.15343-2-s.trumtrar@pengutronix.de Changes since v1: - include feedback from Ahmad .../mach-socfpga/include/mach/cyclone5-regs.h | 1 + drivers/firmware/Makefile | 2 +- drivers/firmware/socfpga.c | 21 +++++++++++++++++++ drivers/firmware/socfpga_sdr.S | 20 ++++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 drivers/firmware/socfpga_sdr.S diff --git a/arch/arm/mach-socfpga/include/mach/cyclone5-regs.h b/arch/arm/mach-socfpga/include/mach/cyclone5-regs.h index e88daf718917..1a7d787a27bf 100644 --- a/arch/arm/mach-socfpga/include/mach/cyclone5-regs.h +++ b/arch/arm/mach-socfpga/include/mach/cyclone5-regs.h @@ -18,5 +18,6 @@ #define CYCLONE5_SYSMGR_ADDRESS 0xffd08000 #define CYCLONE5_SCANMGR_ADDRESS 0xfff02000 #define CYCLONE5_SMP_TWD_ADDRESS 0xfffec600 +#define CYCLONE5_OCRAM_ADDRESS 0xffff0000 #endif /* __MACH_SOCFPGA_REGS_H */ diff --git a/drivers/firmware/Makefile b/drivers/firmware/Makefile index b162b08b0a80..bbd2bcda9780 100644 --- a/drivers/firmware/Makefile +++ b/drivers/firmware/Makefile @@ -1,3 +1,3 @@ obj-$(CONFIG_FIRMWARE_ALTERA_SERIAL) += altera_serial.o -obj-$(CONFIG_FIRMWARE_ALTERA_SOCFPGA) += socfpga.o +obj-$(CONFIG_FIRMWARE_ALTERA_SOCFPGA) += socfpga.o socfpga_sdr.o obj-$(CONFIG_FIRMWARE_ZYNQMP_FPGA) += zynqmp-fpga.o diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c index 61c2b02eca42..b16bd33de408 100644 --- a/drivers/firmware/socfpga.c +++ b/drivers/firmware/socfpga.c @@ -39,6 +39,9 @@ #include #include #include +#include +#include +#include #define FPGAMGRREGS_STAT 0x0 #define FPGAMGRREGS_CTRL 0x4 @@ -78,6 +81,10 @@ #define CDRATIO_x4 0x2 #define CDRATIO_x8 0x3 +extern void socfpga_sdram_apply_static_cfg(void __iomem *sdrctrlgrp); +extern void socfpga_sdram_apply_static_cfg_end(void *); +extern const u32 socfpga_sdram_apply_static_cfg_sz; + struct fpgamgr { struct firmware_handler fh; struct device_d dev; @@ -345,6 +352,7 @@ static int socfpga_fpgamgr_program_finish(struct firmware_handler *fh) { struct fpgamgr *mgr = container_of(fh, struct fpgamgr, fh); int status; + void (*ocram_func)(void __iomem *ocram_base); /* Ensure the FPGA entering config done */ status = socfpga_fpgamgr_program_poll_cd(mgr); @@ -374,6 +382,19 @@ static int socfpga_fpgamgr_program_finish(struct firmware_handler *fh) return status; } + remap_range((void *)CYCLONE5_OCRAM_ADDRESS, PAGE_SIZE, MAP_CACHED); + + dev_dbg(&mgr->dev, "Setting APPLYCFG bit...\n"); + + ocram_func = fncpy((void __iomem *)CYCLONE5_OCRAM_ADDRESS, + &socfpga_sdram_apply_static_cfg, + socfpga_sdram_apply_static_cfg_sz); + + sync_caches_for_execution(); + + ocram_func((void __iomem *) (CYCLONE5_SDR_ADDRESS + + SDR_CTRLGRP_STATICCFG_ADDRESS)); + return 0; } diff --git a/drivers/firmware/socfpga_sdr.S b/drivers/firmware/socfpga_sdr.S new file mode 100644 index 000000000000..b895fb293cbd --- /dev/null +++ b/drivers/firmware/socfpga_sdr.S @@ -0,0 +1,20 @@ +#include + + .arch armv7-a + .arm + +/* + * r0 : sdram controller staticcfg + */ + +ENTRY(socfpga_sdram_apply_static_cfg) + push {ip,lr} + ldr r1, [r0] + orr r1, r1, #8 + str r1, [r0] + pop {ip,pc} + .align +ENDPROC(socfpga_sdram_apply_static_cfg) + +ENTRY(socfpga_sdram_apply_static_cfg_sz) + .word . - socfpga_sdram_apply_static_cfg; -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox