From patchwork Wed Oct 26 07:58:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 11105 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp125311wru; Wed, 26 Oct 2022 01:18:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6U0Mo/k6nveeZDSTZZmMVc9jcFOpYANre2wcRp1ydxjOkSyT7WkovE5lKeA8s5SrN55wIr X-Received: by 2002:a17:906:8a4a:b0:78d:5ff6:7507 with SMTP id gx10-20020a1709068a4a00b0078d5ff67507mr36013129ejc.194.1666772286045; Wed, 26 Oct 2022 01:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666772286; cv=none; d=google.com; s=arc-20160816; b=vLX8YBejOjhdEOX0znnI2T5Z7EU2cVp12KIHCNnVBFxB2WcfreiqphJC0Dzo8JGFxB dVcCd97w88cWchs83gb8cMOunefec1444pFoomBMvVNVrP6SLQGYQ3FVDHK3Bv8wFcSc mCPrZyenomZzJe9PYb6daogU1iXh1r5m2EfF7+iEnIDRFKD/W9RfuqymiiXq3R8V6Mle ZWQUsPAPsSrx2fZtSivfqzTqjqwKfu1J7FJHSiD6IFUd8E+l+pBF1aMjsFAMB+1PA62I a0Lh2WeuvturTfN/w6AlYeVD0ko3K1gYO5fmCtnI93cmR+zjlzFPzrSWohsJbrolE9o3 V5AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=+jyjrbZo+ELkTQHp1UO8qB1tgFnSatDzGs6yA5dAalk=; b=nRIO+Fygxw3S/JS7o+HnbGdjVQfcF+m3ic+MSbQVn00nauJVNkVus4E6i+yQZ+trPV /TOtyuSKa7X73otynR1mfpGRRYLG1hbSzgkOurvDjwESiWbiAif3LYYzaHW7FxLjrX8O 4imfBR08udcPSmLwHinGz8FBlARntOqDNL14ma2xsNsOo3ipyUD5L1bXTJPDEqJAYfhk HevVVBuvt+JGDIJ3dlk9/Jj5LwfyhSU599gFv7BQabTyvFMjDeBKIblel/myOMrMH5kT Q2K7Gxq+6y/sgHVqjH5eb0LzDTgZcYg5x0aTaGI1fJrlJJz1gHR19ieel4FP0IG2Ce0N TXZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D+lIzuFm; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fe5-20020a056402390500b00450c1de6234si4436088edb.587.2022.10.26.01.17.40; Wed, 26 Oct 2022 01:18:06 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=D+lIzuFm; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233318AbiJZH6i (ORCPT + 99 others); Wed, 26 Oct 2022 03:58:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232954AbiJZH6f (ORCPT ); Wed, 26 Oct 2022 03:58:35 -0400 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87B3AA98E9 for ; Wed, 26 Oct 2022 00:58:34 -0700 (PDT) Received: by mail-wm1-x32e.google.com with SMTP id m29-20020a05600c3b1d00b003c6bf423c71so902063wms.0 for ; Wed, 26 Oct 2022 00:58:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=+jyjrbZo+ELkTQHp1UO8qB1tgFnSatDzGs6yA5dAalk=; b=D+lIzuFmmhNmptsvaY8BGQUNGKXCtzv9MHCJaBqvK9nBESL8oazEgpAqhXJVAJywpB i0qxXytK2Dwz3lYx3b2byIBa7MjTi4+3R/V3Jt+8aDopFCPUPRQVDBddysrWAA0Phax+ GsYYY4ORqfBeJ0gh58fwYn4mOe9jZKXpaONekw+G4azlTm6jgFc3k+AqCucxptEumHuc liQt7PiNML/sEXGIyXfUbanAFC9/tbEOA3DkJTRlKddeRB5fVya50nxVvbfV6LinPlC1 h3/iWju6Wi1Po0962nuxTwR6MKDELIciU2qzNQA7vRW34v/ASomx6+uoD/vRzRiOITSX RO0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+jyjrbZo+ELkTQHp1UO8qB1tgFnSatDzGs6yA5dAalk=; b=EdW9aJc98ezTizbLa1cXWkQZsnKfxqi/dsZ/XQmpcJF6qBgBQ36pSmJy/XOgNS3MUn AQsXb4Bg4cVTIUcD6uCahvyI3w8gqTH/0nTDaYWZaiOE2PnUa9xaSGr4VxYNgA0o2XT8 gWqVul8Mo0NutVIzPA+ZdqOuD2YfJEdt5n1m+HlACE4xoO+xtgpY9KOo8ct1xBEYAWal FOz2XXgx33RQ4ajjfZZlOyF+0ES5iCQGWYMgG1pBrLdJGzKXb03YBYBCLbKvoh56sTn0 kphQB6yQtjb8cRvRLY8Vy1j6Y+qENSqiXBk8L9cQhG+Yl7PV17o5qUfcPHtxKdfI67bp SAzA== X-Gm-Message-State: ACrzQf39NT8EmaO62dna9qrgCCM19LWP/zP+lCyYdV5JXe0God8DGRKU MBwXrYx3Bn5d7f/sf2Ji81sg5w== X-Received: by 2002:a05:600c:1e28:b0:3c6:e046:9da7 with SMTP id ay40-20020a05600c1e2800b003c6e0469da7mr1497424wmb.43.1666771113122; Wed, 26 Oct 2022 00:58:33 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id k1-20020a5d6e81000000b0022cc3e67fc5sm4562593wrz.65.2022.10.26.00.58.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 00:58:32 -0700 (PDT) From: Neil Armstrong Date: Wed, 26 Oct 2022 09:58:28 +0200 Subject: [PATCH] spi: meson-spicc: move wait completion in driver to take bursts delay in account MIME-Version: 1.0 Message-Id: <20221026-spicc-burst-delay-v1-0-1be5ffb7051a@linaro.org> To: Jerome Brunet , Martin Blumenstingl , Mark Brown , Kevin Hilman Cc: linux-arm-kernel@lists.infradead.org, Da Xue , linux-kernel@vger.kernel.org, linux-amlogic@lists.infradead.org, Neil Armstrong , linux-spi@vger.kernel.org X-Mailer: b4 0.10.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 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?1747737416547219896?= X-GMAIL-MSGID: =?utf-8?q?1747737416547219896?= Some delay occurs between each bursts, thus the default delay is wrong and a timeout will occur with big enough transfers. The solution is to handle the timeout management in the driver and add some delay for each bursts in the timeout calculation. Reported-by: Da Xue Signed-off-by: Neil Armstrong --- To: Mark Brown To: Kevin Hilman To: Jerome Brunet To: Martin Blumenstingl Cc: linux-spi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-amlogic@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/spi/spi-meson-spicc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) --- base-commit: 247f34f7b80357943234f93f247a1ae6b6c3a740 change-id: 20221026-spicc-burst-delay-ea0526602760 Best regards, diff --git a/drivers/spi/spi-meson-spicc.c b/drivers/spi/spi-meson-spicc.c index bad201510a99..52bffab18329 100644 --- a/drivers/spi/spi-meson-spicc.c +++ b/drivers/spi/spi-meson-spicc.c @@ -160,6 +160,7 @@ struct meson_spicc_device { struct clk *clk; struct spi_message *message; struct spi_transfer *xfer; + struct completion done; const struct meson_spicc_data *data; u8 *tx_buf; u8 *rx_buf; @@ -282,7 +283,7 @@ static irqreturn_t meson_spicc_irq(int irq, void *data) /* Disable all IRQs */ writel(0, spicc->base + SPICC_INTREG); - spi_finalize_current_transfer(spicc->master); + complete(&spicc->done); return IRQ_HANDLED; } @@ -386,6 +387,7 @@ static int meson_spicc_transfer_one(struct spi_master *master, struct spi_transfer *xfer) { struct meson_spicc_device *spicc = spi_master_get_devdata(master); + unsigned long timeout; /* Store current transfer */ spicc->xfer = xfer; @@ -410,13 +412,29 @@ static int meson_spicc_transfer_one(struct spi_master *master, /* Setup burst */ meson_spicc_setup_burst(spicc); + /* Setup wait for completion */ + reinit_completion(&spicc->done); + + /* For each byte we wait for 8 cycles of the SPI clock */ + timeout = 8LL * MSEC_PER_SEC * xfer->len; + do_div(timeout, xfer->speed_hz); + + /* Add 10us delay between each fifo bursts */ + timeout += ((xfer->len >> 4) * 10) / MSEC_PER_SEC; + + /* Increase it twice and add 200 ms tolerance */ + timeout += timeout + 200; + /* Start burst */ writel_bits_relaxed(SPICC_XCH, SPICC_XCH, spicc->base + SPICC_CONREG); /* Enable interrupts */ writel_relaxed(SPICC_TC_EN, spicc->base + SPICC_INTREG); - return 1; + if (!wait_for_completion_timeout(&spicc->done, msecs_to_jiffies(timeout))) + return -ETIMEDOUT; + + return 0; } static int meson_spicc_prepare_message(struct spi_master *master, @@ -743,6 +761,8 @@ static int meson_spicc_probe(struct platform_device *pdev) spicc->pdev = pdev; platform_set_drvdata(pdev, spicc); + init_completion(&spicc->done); + spicc->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(spicc->base)) { dev_err(&pdev->dev, "io resource mapping failed\n");