From patchwork Thu Dec 29 10:46:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Bornyakov X-Patchwork-Id: 37360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2338163wrt; Thu, 29 Dec 2022 02:51:19 -0800 (PST) X-Google-Smtp-Source: AMrXdXtQRjMnBFzf/xQrc2PxXPpbHAf8HV4TywFKP75adGrEZMKlQEpcZrPXCppsiR2J+nPIgGwD X-Received: by 2002:a17:902:db05:b0:192:7c38:4842 with SMTP id m5-20020a170902db0500b001927c384842mr20453723plx.53.1672311079588; Thu, 29 Dec 2022 02:51:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672311079; cv=none; d=google.com; s=arc-20160816; b=OFl34UCHLD1IJLUk12+lD6hPOHFQ6OIXmo4MJTuwNUxfgfbqQ/X2JdWahj66d//+xW TR/p0tK4BopsNKi3wCEB7G6MVOHS9g7NE8SsxqvxfxMCK64sN0csIvWmrK3mJXeld9PJ M12wWCetdV4xmUidCynlSuaazJK2EhE5iAAlZ1l2+ZjDa0xQMAhvmsGQobtKm2ecGN1s WMrR7dQpD5BL8gars2RxUAHYfJ+reeralofeXy+HwQhAfOprUlJj7bjKP/NeXwSfrqPZ kpFpLJyduHcIu6sSuCjZ9wyfCxC9kQ1llNA6T+fpgkkptMJroZY+G3zeOr1Xf+FiuWmU Ynew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lMC0TaTz0zW4RqoDylFHZqSCqJlhVay6PEFgr8vhhx0=; b=CQ6/nLoY5D8Kr1LyPne1MgbJEFaT08nKDKxVk7pQJR6C1W55oVR2xvfnjnW0UIEmZh Cy86Ozza8VXNjgflIY+7+wg9D7ntRN7YFTgzLZTOes0AmHX2CHFdnKQTxAfwSeV4MwhW QCCnGALIBoj+uB035yeZ3rXmNA2mova+D6nke9Z21jc2hXIZKsmbINRE3pp8b5TzR1UX olO44mC+hETsN8F1vgB9XY+jZHVqBRL4ak8t6M1McFPGoPO/LiaL4F1OCM7ROVLdAevb TM1zbGRMfrKpi5gbeUXY118YX7syiyiirJLy9Iqr3W7P7hFI/3GE6XgYUjJjYATZslm/ FfNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@metrotek.ru header.s=mail header.b=Ns25fgEf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ix6-20020a170902f80600b0019144f5893dsi17273928plb.518.2022.12.29.02.51.07; Thu, 29 Dec 2022 02:51:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@metrotek.ru header.s=mail header.b=Ns25fgEf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233237AbiL2Ktd (ORCPT + 99 others); Thu, 29 Dec 2022 05:49:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229669AbiL2KtL (ORCPT ); Thu, 29 Dec 2022 05:49:11 -0500 Received: from mail.pr-group.ru (mail.pr-group.ru [178.18.215.3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFED912A9D; Thu, 29 Dec 2022 02:49:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=metrotek.ru; s=mail; h=from:subject:date:message-id:to:cc:mime-version:content-transfer-encoding: in-reply-to:references; bh=GI2mMm/uGWkE5p1bnryw0SBqR2l3kOJ73Yw+GoVPPS8=; b=Ns25fgEfZqwQ0qPGTbBDXXH4yrc27AJGxDDF5VY9tiHLsYdQdGKCzx/YYnNTzcDcAoTQwg8Q+/8hW mXfbCClyshrSVJ1uGHBmeTGnB2MhKlVnJOZvgFPs8MWDYnkkltDtcWGb61A3TmFeSgKLY7WgPlRmIw diujQR3S1gaI3kQ2nx/S5Cc6iFulnMZI6Mn51355hdxu5GT56L73JCAeYny5fNtG8lvqNJZeYTheuH dxods8/DW+XcokBkAiOH858xK1Pbi70+eoGb2msb2kJn2f7sO6z0PDDD+1rTJ4YgkOiJa8haaDJC07 g2/Rau2UFBuNhR5qKvIgeOHglx/qONg== X-Kerio-Anti-Spam: Build: [Engines: 2.16.5.1460, Stamp: 3], Multi: [Enabled, t: (0.000009,0.010010)], BW: [Enabled, t: (0.000021,0.000001)], RTDA: [Enabled, t: (0.090851), Hit: No, Details: v2.42.0; Id: 15.52k4ev.1glenvctm.3mn1; mclb], total: 0(700) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Level: X-Footer: bWV0cm90ZWsucnU= Received: from h-e2.ddg ([85.143.252.66]) (authenticated user i.bornyakov@metrotek.ru) by mail.pr-group.ru with ESMTPSA (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)); Thu, 29 Dec 2022 13:48:45 +0300 From: Ivan Bornyakov To: linux-fpga@vger.kernel.org Cc: Ivan Bornyakov , Conor Dooley , Moritz Fischer , Wu Hao , Xu Yilun , Tom Rix , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , linux-kernel@vger.kernel.org, system@metrotek.ru Subject: [PATCH v4 3/3] fpga: microchip-spi: separate data frame write routine Date: Thu, 29 Dec 2022 13:46:04 +0300 Message-Id: <20221229104604.2496-4-i.bornyakov@metrotek.ru> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20221229104604.2496-1-i.bornyakov@metrotek.ru> References: <20221229104604.2496-1-i.bornyakov@metrotek.ru> MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753545262946094124?= X-GMAIL-MSGID: =?utf-8?q?1753545262946094124?= mpf_ops_write() function writes bitstream data to the FPGA by a smaller frames. Introduce mpf_spi_frame_write() function which is for writing a single data frame and use it in mpf_ops_write(). No functional changes intended. Signed-off-by: Ivan Bornyakov Acked-by: Conor Dooley Acked-by: Xu Yilun --- drivers/fpga/microchip-spi.c | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/drivers/fpga/microchip-spi.c b/drivers/fpga/microchip-spi.c index 995b1964e0fe..8a541986f6f2 100644 --- a/drivers/fpga/microchip-spi.c +++ b/drivers/fpga/microchip-spi.c @@ -280,9 +280,30 @@ static int mpf_ops_write_init(struct fpga_manager *mgr, return 0; } +static int mpf_spi_frame_write(struct mpf_priv *priv, const char *buf) +{ + struct spi_transfer xfers[2] = { + { + .tx_buf = &priv->tx, + .len = 1, + }, { + .tx_buf = buf, + .len = MPF_SPI_FRAME_SIZE, + }, + }; + int ret; + + ret = mpf_poll_status(priv, 0); + if (ret < 0) + return ret; + + priv->tx = MPF_SPI_FRAME; + + return spi_sync_transfer(priv->spi, xfers, ARRAY_SIZE(xfers)); +} + static int mpf_ops_write(struct fpga_manager *mgr, const char *buf, size_t count) { - struct spi_transfer xfers[2] = { 0 }; struct mpf_priv *priv = mgr->priv; struct device *dev = &mgr->dev; int ret, i; @@ -293,19 +314,8 @@ static int mpf_ops_write(struct fpga_manager *mgr, const char *buf, size_t count return -EINVAL; } - xfers[0].tx_buf = &priv->tx; - xfers[0].len = 1; - for (i = 0; i < count / MPF_SPI_FRAME_SIZE; i++) { - xfers[1].tx_buf = buf + i * MPF_SPI_FRAME_SIZE; - xfers[1].len = MPF_SPI_FRAME_SIZE; - - ret = mpf_poll_status(priv, 0); - if (ret >= 0) { - priv->tx = MPF_SPI_FRAME; - ret = spi_sync_transfer(priv->spi, xfers, ARRAY_SIZE(xfers)); - } - + ret = mpf_spi_frame_write(priv, buf + i * MPF_SPI_FRAME_SIZE); if (ret) { dev_err(dev, "Failed to write bitstream frame %d/%zu\n", i, count / MPF_SPI_FRAME_SIZE);