From patchwork Mon Nov 14 08:13:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bayi Cheng X-Patchwork-Id: 19584 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2027877wru; Mon, 14 Nov 2022 00:15:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf6JikcdKnjzwvj90tjYH4mxlyMUppYMfSVInUwBMhkYzM9KeYb/DB8MRUKPEwnp94DbI93/ X-Received: by 2002:a17:907:2111:b0:7ae:e887:d5bd with SMTP id qn17-20020a170907211100b007aee887d5bdmr5204203ejb.715.1668413711663; Mon, 14 Nov 2022 00:15:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668413711; cv=none; d=google.com; s=arc-20160816; b=iCIvBafty9nIbRhCDdVu1hqKBSc8glcK4RY4gRWmDdhAk8c+GaZ4AxfNJG+2W6lSnk erjjsDPdmU7g1Q6r7/2zXrqLWPdkraPTxk8wagezFVyoJ9w1zZoWPmVXDX7QGxugyJM5 QNGHiqfaHc2HmTSO57NbYWSaGOC6IDe0xe0B8+lipFN+X9Iqqb3V74VeyLby4YNdyFu5 H9+2r1y1dX+a6CQgHhGeefL/DEQLSq5gJ9988wX/yfbZ3ouwtH5bWlwnzPu0dpHF5hn9 YQn3KFVR2Z4ltvz6acHdC7g0mLoidblxwtVJf+g2cnakLwO1+u2pzOAwOusTx9vjKjQ0 rPbw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=16ql8s7UXjz7QayRZm19LzIg6ERRvCYLZDA5lHE/kUI=; b=xrl6mEBjwgu+qQiO39MGZJJ7+cE2M5tyRr0P2Bl1gUoESWkmnOzqHSwi0f+82w82T5 ozhSGKSsgJsMhh2BeAtNS/P+zH4AHIXIVJzM9iLql0CWDjt5hzqY4rB9yf5MX57Rxi6y 3cd75Kcp6ttdMxaQ7DoelMsQVA2waSv18IdAPQJRqCGNn5xwPrvmBLSP8CI0q5vrgsnZ zpcibjrg4ng7dRyAkibrgg/udAX+zo8bDZuqeLtB7OZPIOspcZY3yrl/HrTTYEMmt/L5 CA4cH8YNW84jvnb1bqrz9TlBtOCpizx1W95wfIe8lBb0MHOr2i0zreI7jTqx3BiTtIBA p2Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=ttFZPNcK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg23-20020a170907971700b007a6ec03b13bsi7419559ejc.799.2022.11.14.00.14.47; Mon, 14 Nov 2022 00:15:11 -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=pass header.i=@mediatek.com header.s=dk header.b=ttFZPNcK; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236245AbiKNIOL (ORCPT + 99 others); Mon, 14 Nov 2022 03:14:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236242AbiKNIOI (ORCPT ); Mon, 14 Nov 2022 03:14:08 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA1131A210; Mon, 14 Nov 2022 00:14:02 -0800 (PST) X-UUID: 06a3de3d523242739635f57692033022-20221114 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=16ql8s7UXjz7QayRZm19LzIg6ERRvCYLZDA5lHE/kUI=; b=ttFZPNcKo29ZvIlbZeKZbUTxeLqC1lGuSef9jhMhrtqKci8yvLH9AmeG0C/PDbLO1gdII++uOiwrGDiLudRfrcAFh2KDqYpDh61FioWL6CMcL/KjNcGekQRVRBBFNiSbapWwancHy0lhFejaW1YuSYd0cU1ftHTUdFx6c6+tTgc=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:765fbccd-046a-427d-9090-c6728bf52381,IP:0,U RL:0,TC:0,Content:-25,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:-25 X-CID-META: VersionHash:62cd327,CLOUDID:2010df29-8055-4e28-ab7d-2959ba08645e,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 06a3de3d523242739635f57692033022-20221114 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 2735173; Mon, 14 Nov 2022 16:13:54 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs10n2.mediatek.inc (172.21.101.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.3; Mon, 14 Nov 2022 16:13:52 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Mon, 14 Nov 2022 16:13:46 +0800 From: Bayi Cheng To: Mark Brown , Matthias Brugger , Ikjoon Jang CC: , , , , , bayi cheng Subject: [PATCH v2] spi: spi-mtk-nor: Optimize timeout for dma read Date: Mon, 14 Nov 2022 16:13:27 +0800 Message-ID: <20221114081327.25750-1-bayi.cheng@mediatek.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-MTK: N X-Spam-Status: No, score=-1.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,RDNS_NONE, SPF_HELO_PASS,T_SPF_TEMPERROR,UNPARSEABLE_RELAY autolearn=no 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?1749458575833785087?= X-GMAIL-MSGID: =?utf-8?q?1749458575833785087?= From: bayi cheng The timeout value of the current dma read is unreasonable. For example, If the spi flash clock is 26Mhz, It will takes about 1.3ms to read a 4KB data in spi mode. But the actual measurement exceeds 50s when a dma read timeout is encountered. In order to be more accurately, It is necessary to use usecs_to_jiffies, After modification, the measured timeout value is about 130ms. Signed-off-by: bayi cheng Reviewed-by: AngeloGioacchino Del Regno --- Change in v2: -Change the type of "timeout" from ulong to u32. -Replace max_t with max. -Replace msecs_to_jiffies with usecs_to_jiffies. --- --- drivers/spi/spi-mtk-nor.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c index d167699a1a96..58eca18b28b0 100644 --- a/drivers/spi/spi-mtk-nor.c +++ b/drivers/spi/spi-mtk-nor.c @@ -354,7 +354,7 @@ static int mtk_nor_dma_exec(struct mtk_nor *sp, u32 from, unsigned int length, dma_addr_t dma_addr) { int ret = 0; - ulong delay; + u32 delay, timeout; u32 reg; writel(from, sp->base + MTK_NOR_REG_DMA_FADR); @@ -376,15 +376,16 @@ static int mtk_nor_dma_exec(struct mtk_nor *sp, u32 from, unsigned int length, mtk_nor_rmw(sp, MTK_NOR_REG_DMA_CTL, MTK_NOR_DMA_START, 0); delay = CLK_TO_US(sp, (length + 5) * BITS_PER_BYTE); + timeout = (delay + 1) * 100; if (sp->has_irq) { if (!wait_for_completion_timeout(&sp->op_done, - (delay + 1) * 100)) + usecs_to_jiffies(max(timeout, 10000U)))) ret = -ETIMEDOUT; } else { ret = readl_poll_timeout(sp->base + MTK_NOR_REG_DMA_CTL, reg, !(reg & MTK_NOR_DMA_START), delay / 3, - (delay + 1) * 100); + timeout); } if (ret < 0)