From patchwork Thu Oct 25 16:32:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: IKEGAMI Tokunori X-Patchwork-Id: 989220 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=allied-telesis.co.jp Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SnJC+Dry"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42gtBs0W6Sz9sBk for ; Fri, 26 Oct 2018 03:39:49 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ad+MZCErH80/vBiMhPUOmtyLabqIWk6nCThOLu6lXe8=; b=SnJC+DrysAWZ1nrivkUx15/Kwq 9+czC1YPcE87T/3wp+kOhVOfKtsx3V+1lY+rQpTQiSC/vPl1Wnyvbfg14doPFTf3pJvPIzpx/RydB EX+NX2n/yRF4K14S1NeCmOSbstJRimCi5xjUUmcNwg7MGN6orvHddzkCFBakniQrp5u+TTNctfhoA 6J3XBNgBXqP6tI1mnDDTRS2P6ieiw16fztEI0mwyWwrlFD/d4H7BjOKvyyUN9SHiG2PxTF6XpChCu VATEKFjQBKH6078r2QHdQZQAdoexvDKhkqX6JONUjPiIX+qimuNFQPGKedXOnkrO+y7UYV0OIJawr 53nGObcQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFifY-0000PW-55; Thu, 25 Oct 2018 16:39:36 +0000 Received: from mail1.bemta23.messagelabs.com ([67.219.246.5]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFiZj-0004jR-EF for linux-mtd@lists.infradead.org; Thu, 25 Oct 2018 16:35:35 +0000 Received: from [67.219.246.100] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-5.bemta.az-b.us-east-1.aws.symcld.net id B6/2A-20483-F20F1DB5; Thu, 25 Oct 2018 16:32:47 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsUyLfyHiK7+h4v RBssfSlrsblrG7sDosXlJfQBjFGtmXlJ+RQJrRvv2o0wFP6Urdl4+y9LA2CfexcjFISQwl1Hi yNWVLBDOL0aJ+78WsXcxcnKwCZhKTH+1kBHEFhFQk9jaf44RpIhZ4D6jxNm175i6GDk4hAUSJ JbNKwMxWQRUJZ6+rQMp5xVwkrjz4g4biC0hIC/x8Hg72BhOoHjH/yfMILaQgKPE394WKFtT4n nPd0aI+mCJiyu62Ccw8i5gZFjFaJZUlJmeUZKbmJmja2hgoGtoaKRroGtkaKSXWKWbpFdarJu aWFyia6iXWF6sV1yZm5yTopeXWrKJERgoKQUMV3YwrluafohRkoNJSZQ3MeVitBBfUn5KZUZi cUZ8UWlOavEhRhkODiUJ3pnvgHKCRanpqRVpmTnAkIVJS3DwKInwzgdJ8xYXJOYWZ6ZDpE4xK kqJ814BSQiAJDJK8+DaYHFyiVFWSpiXkYGBQYinILUoN7MEVf4VozgHo5Iw7wqQKTyZeSVw01 8BLWYCWjxD4QLI4pJEhJRUA+OCFyt9/37r71tZv9/+/PMpt1Yt+VjCMctN+lwKm1j+4kyVRbc t87I8ucrkuguvHpx2Ytq7ao63PxbLOzaoreJvbRXxeOz+7/41bkvuvRxPrTkSfYPSXq0PvXdk xawl73MmpCxqe6nEsVxVsH3Gg6YJu47L2yaLeqa9+XlfX3WTea7ennWdm+uUWIozEg21mIuKE wFSm3JfjgIAAA== X-Env-Sender: ikegami@allied-telesis.co.jp X-Msg-Ref: server-26.tower-384.messagelabs.com!1540485156!931210!11 X-Originating-IP: [150.87.248.20] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.14.24; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5082 invoked from network); 25 Oct 2018 16:32:47 -0000 Received: from abricot-inet.allied-telesis.co.jp (HELO TKY-DS01.at.lc) (150.87.248.20) by server-26.tower-384.messagelabs.com with SMTP; 25 Oct 2018 16:32:47 -0000 Received: from swim-manx.rd.allied-telesis.co.jp ([150.87.21.50]) by TKY-DS01.at.lc with Microsoft SMTPSVC(8.0.9200.16384); Fri, 26 Oct 2018 01:32:37 +0900 Received: from ikegami-pc.rd.allied-telesis.co.jp by swim-manx.rd.allied-telesis.co.jp (AlliedTelesis SMTPRS 1.3 pl 1 ++E6B86F8C687C6288D9B5559052954DC9) with ESMTP id ; Fri, 26 Oct 2018 01:32:37 +0900 From: Tokunori Ikegami To: boris.brezillon@free-electrons.com Subject: [PATCH v3 10/11] mtd: cfi_cmdset_0002: Split to wait write buffer to check if completed Date: Fri, 26 Oct 2018 01:32:18 +0900 Message-Id: <20181025163219.25788-11-ikegami@allied-telesis.co.jp> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181025163219.25788-1-ikegami@allied-telesis.co.jp> References: <20181025163219.25788-1-ikegami@allied-telesis.co.jp> X-OriginalArrivalTime: 25 Oct 2018 16:32:37.0558 (UTC) FILETIME=[57396560:01D46C80] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181025_093335_579541_967DB2E9 X-CRM114-Status: GOOD ( 14.79 ) X-Spam-Note: SpamAssassin invocation failed X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tokunori Ikegami , Joakim Tjernlund , Chris Packham , linux-mtd@lists.infradead.org, Fabio Bettoni MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Just refactor to split the wait from do_write_buffer(). Signed-off-by: Tokunori Ikegami Cc: Fabio Bettoni Co: Hauke Mehrtens Co: Koen Vandeputte Cc: Chris Packham Cc: Joakim Tjernlund Cc: Boris Brezillon Cc: linux-mtd@lists.infradead.org --- Changes since v2: - None. Changes since v1: - Add the patch. drivers/mtd/chips/cfi_cmdset_0002.c | 81 ++++++++++++++++------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index b54599cb6ae5..0188187939c8 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -1823,6 +1823,51 @@ static int cfi_amdstd_write_words(struct mtd_info *mtd, loff_t to, size_t len, return 0; } +static int __xipram do_write_buffer_wait(struct map_info *map, + struct flchip *chip, unsigned long adr, + map_word datum) +{ + unsigned long timeo; + unsigned long uWriteTimeout; + int ret = 0; + + /* + * Timeout is calculated according to CFI data, if available. + * See more comments in cfi_cmdset_0002(). + */ + uWriteTimeout = usecs_to_jiffies(chip->buffer_write_time_max); + timeo = jiffies + uWriteTimeout; + + for (;;) { + if (chip->state != FL_WRITING) { + /* Someone's suspended the write. Sleep */ + DECLARE_WAITQUEUE(wait, current); + + set_current_state(TASK_UNINTERRUPTIBLE); + add_wait_queue(&chip->wq, &wait); + mutex_unlock(&chip->mutex); + schedule(); + remove_wait_queue(&chip->wq, &wait); + timeo = jiffies + (HZ / 2); /* FIXME */ + mutex_lock(&chip->mutex); + continue; + } + + if (chip_good(map, adr, datum)) + break; + + if (time_after(jiffies, timeo)) { + ret = -EIO; + break; + } + + /* Latency issues. Drop the lock, wait a while and retry */ + UDELAY(map, chip, adr, 1); + } + + return ret; +} + static void __xipram do_write_buffer_reset(struct map_info *map, struct flchip *chip, struct cfi_private *cfi) @@ -1853,13 +1898,6 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, int len) { struct cfi_private *cfi = map->fldrv_priv; - unsigned long timeo = jiffies + HZ; - /* - * Timeout is calculated according to CFI data, if available. - * See more comments in cfi_cmdset_0002(). - */ - unsigned long uWriteTimeout = - usecs_to_jiffies(chip->buffer_write_time_max); int ret = -EIO; unsigned long cmd_adr; int z, words; @@ -1916,34 +1954,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, adr, map_bankwidth(map), chip->word_write_time); - timeo = jiffies + uWriteTimeout; - - for (;;) { - if (chip->state != FL_WRITING) { - /* Someone's suspended the write. Sleep */ - DECLARE_WAITQUEUE(wait, current); - - set_current_state(TASK_UNINTERRUPTIBLE); - add_wait_queue(&chip->wq, &wait); - mutex_unlock(&chip->mutex); - schedule(); - remove_wait_queue(&chip->wq, &wait); - timeo = jiffies + (HZ / 2); /* FIXME */ - mutex_lock(&chip->mutex); - continue; - } - - if (chip_good(map, adr, datum)) - break; - - if (time_after(jiffies, timeo)) { - ret = -EIO; - break; - } - - /* Latency issues. Drop the lock, wait a while and retry */ - UDELAY(map, chip, adr, 1); - } + ret = do_write_buffer_wait(map, chip, adr, datum); if (ret) { do_write_buffer_reset(map, chip, cfi);