Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A9947C433F5 for ; Thu, 26 May 2022 14:44:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DDBD8435B; Thu, 26 May 2022 16:44:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=semihalf.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=semihalf-com.20210112.gappssmtp.com header.i=@semihalf-com.20210112.gappssmtp.com header.b="75OpbSrA"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F3E5A842C4; Thu, 26 May 2022 16:44:08 +0200 (CEST) Received: from mail-lf1-x132.google.com (mail-lf1-x132.google.com [IPv6:2a00:1450:4864:20::132]) (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 D9D4D8438D for ; Thu, 26 May 2022 16:38:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=semihalf.com Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=pan@semihalf.com Received: by mail-lf1-x132.google.com with SMTP id p4so2710219lfg.4 for ; Thu, 26 May 2022 07:38:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dhDqdSOJn/AFtevSIOi68mSJ2Tu7CdG7pooC43Ix57k=; b=75OpbSrAdANNkVzSpQXNaWmV4EutohXdblKSCNB9axek8HCCEz4/CFv5X7vaSdcvFT Ij3gVUWV+b6dhuq0pD2KD4zGiuiE4RhzfzYpGN4/wH6PDTqvuAMwYnxZvxlb2yDLy7XD a1E5HUXrQ/SrG7coGwaJleUqTksn0k3LT244ER7x+NkgbdLJ0p+CYq5FKdajsAlsPzg9 nrcF9C3boufxgbMVB3ItV9Yreq1Z1YwkkK/5CZgzFaizDcTuLlJoWFsxKr5R4kSPuh5s 3iiYgbop/TopH8tVRxrHJkBOOgdFF9pY3qskMaG/QfAQluHVBcSCmRdQnxrFOVyB+bRO 0hkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dhDqdSOJn/AFtevSIOi68mSJ2Tu7CdG7pooC43Ix57k=; b=qyk9vmpZ86F2l8qksQ0e61gl+df1b5b/EN3WJ2Dru36ZigZmKbykoGx9eCf+LLziwJ v+Vizy76z3+ZEJSCYcTtqiba5FzZqI45/xAoGuHG8cQFLhW0X6q+3AEAwDBLKdU6otrj Vje0Y2OuDS5Cre5GNplF+RPOKSny2rhAbdP8/OZcEkW6gP2kj2Y0h0YjSFvFveNTn8S0 aU1IeUj2eAtxLEw03SS9FVt7jJgvi5GN5J4a4SshWnsfJluG8o/g96zgs8R1iXDQHpkR sZWcUk03ZpkVJUYrF8b7+FvPNM/A3dCsbhD0oqXSOfvHFQgJVu9L7XHST9Riwi5ZlHg2 BHdg== X-Gm-Message-State: AOAM530ItRULHLqvUC8Kb8h4Vf4ASyX96LPdA6ACc9xkztoA512P3Uza TSUAsizldi2Wr59o7ux7bIXq1w== X-Google-Smtp-Source: ABdhPJw5vNt09H+jPFd9ph6kbOA1Skx55ji0b5OyRaGIs1KLPEHgRQ4LT0LWA5VOxzOrJdzTSEH3cQ== X-Received: by 2002:ac2:4c4f:0:b0:478:6dd9:a405 with SMTP id o15-20020ac24c4f000000b004786dd9a405mr14394369lfk.438.1653575881978; Thu, 26 May 2022 07:38:01 -0700 (PDT) Received: from panikiel.wifi.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id s28-20020a05651c049c00b0024f3d1daea2sm464194ljc.42.2022.05.26.07.38.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 May 2022 07:38:01 -0700 (PDT) From: =?UTF-8?q?Pawe=C5=82=20Anikiel?= To: marex@denx.de, simon.k.r.goldschmidt@gmail.com, tien.fong.chee@intel.com, michal.simek@xilinx.com Cc: u-boot@lists.denx.de, sjg@chromium.org, festevam@denx.de, jagan@amarulasolutions.com, andre.przywara@arm.com, narmstrong@baylibre.com, pbrobinson@gmail.com, tharvey@gateworks.com, paul.liu@linaro.org, christianshewitt@gmail.com, adrian.fiergolski@fastree3d.com, marek.behun@nic.cz, wd@denx.de, elly.siew.chin.lim@intel.com, mw@semihalf.com, =?UTF-8?q?Pawe=C5=82=20Anikiel?= Subject: [PATCH v2 09/11] socfpga: arria10: Improve bitstream loading speed Date: Thu, 26 May 2022 16:37:13 +0200 Message-Id: <20220526143715.277342-10-pan@semihalf.com> X-Mailer: git-send-email 2.36.1.124.g0e6072fb45-goog In-Reply-To: <20220526143715.277342-1-pan@semihalf.com> References: <20220526143715.277342-1-pan@semihalf.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean Apply some optimizations to speed up bitstream loading (both for full and split periph/core bitstreams): * Change the size of the first fs read, so that all the subsequent reads are aligned to a specific value (called MAX_FIRST_LOAD_SIZE). This value was chosen so that in subsequent reads the fat fs driver doesn't have to allocate a temporary buffer in get_contents (assuming 8KiB clusters). * Change the buffer size to a larger value when reading to ddr (but not too large, because large transfers cause a stack overflow in the dwmmc driver). Signed-off-by: Paweł Anikiel --- drivers/fpga/socfpga_arria10.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index 798e3a3f90..07bfe3060e 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -30,6 +30,14 @@ #define FPGA_TIMEOUT_MSEC 1000 /* timeout in ms */ #define FPGA_TIMEOUT_CNT 0x1000000 #define DEFAULT_DDR_LOAD_ADDRESS 0x400 +#define DDR_BUFFER_SIZE 0x100000 + +/* When reading bitstream from a filesystem, the size of the first read is + * changed so that the subsequent reads are aligned to this value. This value + * was chosen so that in subsequent reads the fat fs driver doesn't have to + * allocate a temporary buffer in get_contents (assuming 8KiB clusters). + */ +#define MAX_FIRST_LOAD_SIZE 0x2000 DECLARE_GLOBAL_DATA_PTR; @@ -526,7 +534,8 @@ static void get_rbf_image_info(struct rbf_info *rbf, u16 *buffer) #ifdef CONFIG_FS_LOADER static int first_loading_rbf_to_buffer(struct udevice *dev, struct fpga_loadfs_info *fpga_loadfs, - u32 *buffer, size_t *buffer_bsize) + u32 *buffer, size_t *buffer_bsize, + size_t *buffer_bsize_ori) { u32 *buffer_p = (u32 *)*buffer; u32 *loadable = buffer_p; @@ -674,6 +683,7 @@ static int first_loading_rbf_to_buffer(struct udevice *dev, } buffer_size = rbf_size; + *buffer_bsize_ori = DDR_BUFFER_SIZE; } debug("FPGA: External data: offset = 0x%x, size = 0x%x.\n", @@ -686,11 +696,16 @@ static int first_loading_rbf_to_buffer(struct udevice *dev, * chunk by chunk transfer is required due to smaller buffer size * compare to bitstream */ + + if (buffer_size > MAX_FIRST_LOAD_SIZE) + buffer_size = MAX_FIRST_LOAD_SIZE; + if (rbf_size <= buffer_size) { /* Loading whole bitstream into buffer */ buffer_size = rbf_size; fpga_loadfs->remaining = 0; } else { + buffer_size -= rbf_offset % buffer_size; fpga_loadfs->remaining -= buffer_size; } @@ -806,7 +821,8 @@ int socfpga_loadfs(fpga_fs_info *fpga_fsinfo, const void *buf, size_t bsize, * function below. */ ret = first_loading_rbf_to_buffer(dev, &fpga_loadfs, &buffer, - &buffer_sizebytes); + &buffer_sizebytes, + &buffer_sizebytes_ori); if (ret == 1) { printf("FPGA: Skipping configuration ...\n"); return 0; -- 2.36.1.124.g0e6072fb45-goog