From patchwork Thu Nov 3 05:28:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bayi Cheng X-Patchwork-Id: 14658 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp332853wru; Wed, 2 Nov 2022 22:34:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7TS6Yivsqpj/x0yC/whaNG7DaJ8dblnzNmu6DyxI8d4FTtgYFxRlSVy1uaLwFVdDHRBFz6 X-Received: by 2002:a17:907:728a:b0:78d:2b4b:e7f7 with SMTP id dt10-20020a170907728a00b0078d2b4be7f7mr28125776ejc.269.1667453654520; Wed, 02 Nov 2022 22:34:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667453654; cv=none; d=google.com; s=arc-20160816; b=cBrDXKPCv3uLXmlXXlBJBYxaLu5RfMOWdvgNIdi4koVneWnmLI8/S9ie2QOHqDEm5C tbX7cYCkxtz05K8MeHIuJFdWXA89FDw7pLgjThB/tNcbJCK8Vkhj68VPEJezmjUqeexL YqORFJw2xML9O95nMzqB2IjvZhaiPswWpWhdUGZOF94HWhov/0w8d9kjz58T+FrPSTdj RUP8u/0c0QiETDxeds0VkHVrjm40TKoDoOcnBvk+DXwUvAcRkBaPGs6E7lBrdXyf9GEi uO9hpkjwt0p2JX2Ncqp3RDnnSc11anFQU96ZFy5IjJ3SisHv2bwfKwRz3JYLWQkGf0HJ y3eA== 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=AWuhXliJf4LNGvUCz31n1TTeINGwZ1aIEvAL7BSapmI=; b=PWsCSx7Q0MaoCFMfMh7aYurQ9LvV9edSeLQ3hNRfLyq6j3OdKyVQNtaEGvoNlPFKtH KJvQBtXuLmrzWeBZcqMirM4m7OpnPWlcL0kjctdAuKhVS7ww7d7UAz4ORYV1byMam7Xd 9tPR3HuRN/br6gvTITMEWjbmWngWhl90Ve9LN3IlxPq6XBJRdn92HOYQQ2QMfRq9ab++ pWQNG0XeeM0nWA3VSRrfs9Ta/QAnKUEisiZ2uKSdozPAa10AGZ/0/L8PDr86SYrZzvR9 k/yqBo57Se7b01YaiMOmoyrP0gOrr/k9hcI1zg4kiFqLHtPNuZGwDeK1pxvhrGZl4dwb HBrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=NjF0mb3a; 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 d2-20020a50fe82000000b004602df03e36si32617edt.486.2022.11.02.22.33.51; Wed, 02 Nov 2022 22:34:14 -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=@mediatek.com header.s=dk header.b=NjF0mb3a; 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 S230194AbiKCF33 (ORCPT + 99 others); Thu, 3 Nov 2022 01:29:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbiKCF31 (ORCPT ); Thu, 3 Nov 2022 01:29:27 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD2145FAA; Wed, 2 Nov 2022 22:29:21 -0700 (PDT) X-UUID: e50e325deb9249638069d2e84d51f692-20221103 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:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=AWuhXliJf4LNGvUCz31n1TTeINGwZ1aIEvAL7BSapmI=; b=NjF0mb3a6LWmCRZmAQfsFlHSezhnmi4EJ40c6rjHBW3+yrDFg2u7A+sCia/qclvpyNBlllXlnOo067wdJFi+tVdoeEm/6z2kUnTnm52qGh86OWnxl7/l0wlwmNCbteTfY3u1q0ClQPw5h3/iRZTxpu5HOXDgL5nMsibSTenSZlg=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.12,REQID:61d56722-8b60-46cf-bd20-1738581aee07,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:ea904aeb-84ac-4628-a416-bc50d5503da6,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: e50e325deb9249638069d2e84d51f692-20221103 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1318099482; Thu, 03 Nov 2022 13:29:15 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs13n1.mediatek.inc (172.21.101.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 3 Nov 2022 13:29:13 +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; Thu, 3 Nov 2022 13:29:12 +0800 From: Bayi Cheng To: Mark Brown CC: Matthias Brugger , , , , Chuanhong Guo , , , Project_Global_Chrome_Upstream_Group , bayi cheng Subject: [PATCH v1] spi: spi-mtk-nor: Optimize timeout for dma read Date: Thu, 3 Nov 2022 13:28:43 +0800 Message-ID: <20221103052843.2025-2-bayi.cheng@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221103052843.2025-1-bayi.cheng@mediatek.com> References: <20221103052843.2025-1-bayi.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N 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_MSPIKE_H2,SPF_HELO_PASS, T_SPF_TEMPERROR,UNPARSEABLE_RELAY 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?1748451882990527960?= X-GMAIL-MSGID: =?utf-8?q?1748451882990527960?= 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 msecs_to_jiffies, After modification, the measured timeout value is about 130ms. Signed-off-by: bayi cheng --- 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..3d989db80ee9 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; + ulong 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)) + msecs_to_jiffies(max_t(size_t, timeout / 1000, 10)))) 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)