From patchwork Tue May 8 17:09:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: IKEGAMI Tokunori X-Patchwork-Id: 910351 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="sGmqVy3E"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=atjp.onmicrosoft.com header.i=@atjp.onmicrosoft.com header.b="CbhQ7Cks"; 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 40gR4L2PbYz9ryk for ; Wed, 9 May 2018 03:17:06 +1000 (AEST) 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: 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=HCFOLag9QTYyLQMT7Si4LyLqZl+M3EdfKZiWReioezk=; b=sGmqVy3E4Ea232 h7e9bibTc2uVD1ZLlPSDn15ARWVY37uuZ52Jz2Lxq9OkekcuHRnlQgmN+zdyXHXqZWfA/qZutGPx4 b1c8bp1TGEABCN2rmqf7nfb8GJbiEOQaXgvk+chppZ1CigW6uKFSVRzeWVqKY1XOFHBjnLqTQ7wPu PmZmWMzKUbqms5oCdqfErOE8233yajxktR+KJlDGp/YqgGtTjb1bqEzH06JB7eix8bj0c5H4W8tZH 4A2u2UZ1Ba1ylx3Wk5kGI+C6M8EUU4aORTlvLQj22j8sbTbxfX3w0+CHoEFXaD4F13duO5BJK5/z1 EU5BQkKuh2Vr1uv3dQEw==; 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 1fG6EW-0000wV-Fl; Tue, 08 May 2018 17:17:00 +0000 Received: from mail1.bemta8.messagelabs.com ([216.82.243.203]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fG6EN-0000qO-VK for linux-mtd@lists.infradead.org; Tue, 08 May 2018 17:16:54 +0000 Received: from [216.82.242.36] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-11.bemta-8.messagelabs.com id 81/72-30468-CC9D1FA5; Tue, 08 May 2018 17:09:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNJsWRWlGSWpSXmKPExsVicqA/VffMzY9 RBpP3slvsO9XPYnHgxUIWiwcPutktjlxYy2xxuOE9s8XElZOZLXY3LWO3OLrnHrPF5J1vGB04 PR7/fcHiMW9NtceTTRcZPXbOusvusXmFlsfmJfUeN+cVery6Mo89gCOKNTMvKb8igTXjU/cf5 oJmvopXF4wbGNt5uhi5OIQEOhglOta/ZOti5OCQEKiSWHCNCSQuIfCfUeJ5135GiKLJzBKr56 1jBnFYBPqZJVrv/mKGyExhkth89Ds7hHOfUaJ5xWmgDCcHm4CpxO6nv1lAbBEBQ4mVU1tYQIq YBf4wSVzZ2McGkhAWiJS4f2kdE0RRnMTpTSegGqwk+p4eBrNZBFQkFn35yw5i8wrESGz+cQys V0igiVFi4RopEJsTaMGdffPB4owCshKTdzWCzWQWEJe4NHkRWFxCQEBiyZ7zzBC2qMTLx/9YI erjJM5s6mCEiCtKbOnuhKqXlbg0v5sREho7WCSu7H0NldCV+DB1KjNEYhujxM+ew6wQCS2J93 1boSbZSLQffMoOYWdLLDy/GKomWqLtyxEmCFtOYlXvQ5YJjIazkBwLYetILNj9CcrWlli28DX zLHAACEqcnPmEZQEjyypGjeLUorLUIl0jY72kosz0jJLcxMwcXUMDC73c1OLixPTUnMSkYr3k /NxNjMCEVs/AwLiDccZu90OMkhxMSqK8i098jBLiS8pPqcxILM6ILyrNSS0+xCjDwaEkwfv8B lBOsCg1PbUiLTMHmFph0hIcPEoivDevA6V5iwsSc4sz0yFSpxh1Oe609fQwC7Hk5eelSonzvg GZIQBSlFGaBzcCluYvMcpKCfMyMjAwCPEUpBblZpagyr9iFOdgVBLmdQOZwpOZVwK36RXQEUx ARwg+eA9yREkiQkqqgZHn9uJNrb7PFhav3LY6VqQjstq8bZF3a1n1jNOr523QsuFaduX6Ui4z dv9GuYvxfGvmHn8e2rvk7DE2hoXhCv6PtlWc3B+jLJy65uaR+P36by+ZpQow39++Pspy2cwPW 1ZZvwvp2dokuns1v1PpDdEOWwW7zfzbH/2Yy6P5ODTKIf20SukEwSNKLMUZiYZazEXFiQBkPC Q67gMAAA== X-Env-Sender: ikegami@allied-telesis.co.jp X-Msg-Ref: server-3.tower-94.messagelabs.com!1525799371!184499293!1 X-Originating-IP: [52.192.143.101] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.9.15; banners=-,-,- X-VirusChecked: Checked Received: (qmail 104517 invoked from network); 8 May 2018 17:09:31 -0000 Received: from mo.allied-telesis-co-jp.hdemail.jp (HELO mo.allied-telesis-co-jp.hdemail.jp) (52.192.143.101) by server-3.tower-94.messagelabs.com with SMTP; 8 May 2018 17:09:31 -0000 Received: by mo.allied-telesis-co-jp.hdemail.jp (hde-mf-postfix, from userid 504) id E0C0E294002; Wed, 9 May 2018 02:09:30 +0900 (JST) X-Received: from unknown (HELO mo.allied-telesis-co-jp.hdemail.jp) (127.0.0.1) by 0 with SMTP; 9 May 2018 02:09:30 +0900 X-Received: from mo.allied-telesis-co-jp.hdemail.jp (localhost.localdomain [127.0.0.1]) by mo.allied-telesis-co-jp.hdemail.jp (hde-ma-postfix) with ESMTP id 77C801AC001; Wed, 9 May 2018 02:09:30 +0900 (JST) (envelope-from ikegami@allied-telesis.co.jp) Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-os2jpn01lp0152.outbound.protection.outlook.com [23.103.139.152]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mo.allied-telesis-co-jp.hdemail.jp (hde-mf-postfix) with ESMTPS id 59FA8294001; Wed, 9 May 2018 02:09:30 +0900 (JST) (envelope-from ikegami@allied-telesis.co.jp) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atjp.onmicrosoft.com; s=selector1-alliedtelesis-co-jp01e; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=3mcCuyoCZD6mPFR1NcFZoqWpB0w3ZK8I0f0335OtUDw=; b=CbhQ7CksmgPIiQIOcCfrHjlNK3kTPr3b9//YYMRDsgyMnhk4+kHR0q5ovyDq43IFb7JQkZmKiLn9qq4dbnWzyMa33vXNTDk6jqtJxlzJxbFq7vmWED170VLf6eEe1e5XeDqJXS4DcOZrxluXxMSAfGmUA279KjtEniMRnyBLrDs= Received: from TY1PR01MB0954.jpnprd01.prod.outlook.com (10.167.157.141) by TY1SPR00MB074.jpnprd01.prod.outlook.com (10.174.228.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.735.18; Tue, 8 May 2018 17:09:28 +0000 Received: from TY1PR01MB0954.jpnprd01.prod.outlook.com ([fe80::495f:2227:40ea:9f08]) by TY1PR01MB0954.jpnprd01.prod.outlook.com ([fe80::495f:2227:40ea:9f08%13]) with mapi id 15.20.0735.021; Tue, 8 May 2018 17:09:28 +0000 From: IKEGAMI Tokunori To: Boris Brezillon Subject: [PATCH] mtd: cfi_cmdset_0002: Change definition naming to retry write operation Thread-Topic: [PATCH] mtd: cfi_cmdset_0002: Change definition naming to retry write operation Thread-Index: AdPm5QaK2b/XETfJSxOv0KGSBvXJQAACYO0AAAAtNuA= Date: Tue, 8 May 2018 17:09:28 +0000 Message-ID: References: <20180508190352.124deb07@bbrezillon> In-Reply-To: <20180508190352.124deb07@bbrezillon> Accept-Language: ja-JP, en-US Content-Language: ja-JP X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [61.215.194.29] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; TY1SPR00MB074; 7:hYbV6uNTsPtzDBkdP7nLfLD6AGycRsfZjPZKVGvX0EBNlUCTmzJmsi2/z1V3HChS2skfrTvh7QLcrHKR7LMYemcmg4xTlhdq38w7+GYVZLKGQUKDCUvBZhHQk86v31iwEdeKBHVcceCY4H7+tOyo0BhlfS/zCrHF3bzK0aJQ38WHkDv7b9a/v/lwixX/ok2nF5Vt6syP0nPMpCZBq6OrUWyOmh7oEc1AMwFBMgrNPz1V3n0/V1J/88be3rkSysgk; 20:tCVouhWn/NqsmjJt81g2haF1J/zeUUHhqk9LyMRHuf3Tv/aOKAtl9dQfCGswFHJhIXoV1n8c7+Z0thL3NMpG4g6Y88a2JVfdJfFvaCOJAYeBsfzCnzPhQHBS678XflKT0vTm5fKpChH9G+9Q49D+WqZKpcLVSfd5IXw3uaYe6V/ikZmP2HC9CDaAckVCDwZJGxc6ghLXcU3p7Uo0QFBQwsieG/U+yEX3RVmjMG5dDbEAUJ7o+abcc6C98EFKFFrM x-ms-exchange-antispam-srfa-diagnostics: SOS; x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(2017052603328)(7153060)(7193020); SRVR:TY1SPR00MB074; x-ms-traffictypediagnostic: TY1SPR00MB074: x-ld-processed: 1a8a37cf-9ecc-4cef-abb0-1ab01a15a6ad,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(85827821059158)(258649278758335)(58145275503218); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011); SRVR:TY1SPR00MB074; BCL:0; PCL:0; RULEID:; SRVR:TY1SPR00MB074; x-forefront-prvs: 0666E15D35 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(396003)(39380400002)(39850400004)(366004)(199004)(189003)(14454004)(2906002)(5250100002)(39060400002)(5660300001)(55016002)(3660700001)(7736002)(3280700002)(486006)(7696005)(86362001)(76176011)(4326008)(6436002)(33656002)(54906003)(305945005)(316002)(102836004)(74316002)(26005)(186003)(6506007)(99286004)(68736007)(8676002)(74482002)(81156014)(81166006)(8936002)(66066001)(106356001)(1857600001)(478600001)(25786009)(6916009)(9686003)(6116002)(105586002)(446003)(53936002)(3846002)(476003)(11346002)(97736004)(2900100001); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1SPR00MB074; H:TY1PR01MB0954.jpnprd01.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; MX:1; received-spf: None (protection.outlook.com: allied-telesis.co.jp does not designate permitted sender hosts) x-microsoft-antispam-message-info: rVut2oku43heH0WfYAO8uuiGJ1T5G5waSgJXXVRTa5zO38ZoSjtzge9bP9Od66BEAvtJWPCs45tyglgRRDtHoqyMaRtF/cW1wQumYOzzkv9M0GDH2hKNcHH14Nfxk2KjZ8vuM7KxeVdsTRTy9C7HVQuGx8Jswgin84A00teyiyyQwFmRvcK5SivieAF0yp3r spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2692d1d3-b68a-4a89-c597-08d5b506753e X-OriginatorOrg: allied-telesis.co.jp X-MS-Exchange-CrossTenant-Network-Message-Id: 2692d1d3-b68a-4a89-c597-08d5b506753e X-MS-Exchange-CrossTenant-originalarrivaltime: 08 May 2018 17:09:28.3647 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 1a8a37cf-9ecc-4cef-abb0-1ab01a15a6ad X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1SPR00MB074 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180508_101652_123992_B02A20C2 X-CRM114-Status: GOOD ( 16.73 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [216.82.243.203 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [216.82.243.203 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 T_DKIMWL_WL_MED DKIMwl.org - Whitelisted Medium sender 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: Boris Brezillon , Richard Weinberger , Marek Vasut , PACKHAM Chris , "linux-mtd@lists.infradead.org" , Cyrille Pitchen , Brian Norris , David Woodhouse Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Tokunori Ikegami The definition can be used for other program and erase operations also. So change the naming to MAX_RETRIES from MAX_WORD_RETRIES. Signed-off-by: Tokunori Ikegami Cc: Chris Packham Cc: Brian Norris Cc: David Woodhouse Cc: Boris Brezillon Cc: Marek Vasut Cc: Richard Weinberger Cc: Cyrille Pitchen Cc: linux-mtd@lists.infradead.org --- drivers/mtd/chips/cfi_cmdset_0002.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 56aa6b75213d..9336ef932f75 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -42,7 +42,7 @@ #define AMD_BOOTLOC_BUG #define FORCE_WORD_WRITE 0 -#define MAX_WORD_RETRIES 3 +#define MAX_RETRIES 3 #define SST49LF004B 0x0060 #define SST49LF040B 0x0050 @@ -1646,7 +1646,7 @@ static int __xipram do_write_oneword(struct map_info *map, struct flchip *chip, map_write( map, CMD(0xF0), chip->start ); /* FIXME - should have reset delay before continuing */ - if (++retry_cnt <= MAX_WORD_RETRIES) + if (++retry_cnt <= MAX_RETRIES) goto retry; ret = -EIO; @@ -2105,7 +2105,7 @@ static int do_panic_write_oneword(struct map_info *map, struct flchip *chip, map_write(map, CMD(0xF0), chip->start); /* FIXME - should have reset delay before continuing */ - if (++retry_cnt <= MAX_WORD_RETRIES) + if (++retry_cnt <= MAX_RETRIES) goto retry; ret = -EIO;