From patchwork Mon May 14 02:12:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: IKEGAMI Tokunori X-Patchwork-Id: 912655 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="eqY57pPS"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=atjp.onmicrosoft.com header.i=@atjp.onmicrosoft.com header.b="DTrCGKxy"; 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 40kkkV4bVCz9s0q for ; Mon, 14 May 2018 12:13: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: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:In-Reply-To:References: List-Owner; bh=8yNTDXvptsjVwYgh4Az+t57sxTt6/bbDJA3RX7vVHiY=; b=eqY57pPSkCrOph 8eDYKBYBYnD1/gJmKOaGbpJerG2s0+lsUQSsxg308hprdktXBGFH8EOyM3zRtrZIVklGXzKC94ikv K4HmgurOLePz0ZLBoA2vWUsk5oOz8H31cFLMDPAyfcyqpJ3e01n6st7a8nq8sEBWZtA+aTrV/qXD2 /kRPEaK0fWaKe2sChfSImdfFHvu8FCT4dXzbRlT9QdNyiMZbvRroi8Poir0XBV1KAs5uyzQ5m67pu qQU0nw1WqHSIOwrc5rKlybsCD0pSWAkTKR/cRixiOQiWaYeHSGSxcUsNJqXSaW39wIGQz0DiQTM6r Ru2AyoaZHBDRTZUIrqdQ==; 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 1fI2yv-0002ZL-Hm; Mon, 14 May 2018 02:12:57 +0000 Received: from mail1.bemta12.messagelabs.com ([216.82.251.12]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fI2yn-0002Uz-2a for linux-mtd@lists.infradead.org; Mon, 14 May 2018 02:12:56 +0000 Received: from [216.82.251.38] (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256 bits)) by server-12.bemta-12.messagelabs.com id 09/F4-31138-590F8FA5; Mon, 14 May 2018 02:12:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1WSa0wTaRSG+/WbtgMyOhSVIxHj1rhx0XYFUec HGjUmjsYYE/9o3aDDOtKGtuBMqzWaAEZBSxVMU1RALiuKxQsRjMt1EdSorEFh1x8mXqrUBNFo FYwY4qXjjLd/z/neN+8558shsT6kTSB5t5MXHJzNoI0mUi8X80Z/eNQ8N5w/g/mnp5hgLg/WE EwwWKRjrt45h5krea8wczjgw8yHrjEN07bnlI651v4QM76WF2hJNDvwYZBgK8/uYkONfYhtKX ugY/sHu7Vs0+kktqk2l71XuY0d+r9StzbKrLE6MrLdmzWWsxdO4Jxhyh18NCEPFcZ4UDSpp/c jKCndhz0oigR6F7TWhTWSAPQnBIXdN5Ds8mF4MlCrlQqCLsZwvf6QTlZK1dB68pFSBBGcrmpB UpiWng9tT8cIiSfSyRDw7yUkE6ZHMHj6Rr8IcTQHveWBCJMR01You7FTRhPkd6yXHAQ9E/pu9 +okpug/oO1Jk0ZiRCeCrzVfLTGm46Hf95dW3oGG2vbbyj6T4NnAR8WfDrca9yP5/Re4WHRA8S dCf1URknduJuB8ZzMhC0YI+/1K0CUEHZ0amZPg+IhX8aRBYddTncxZUNWRp4RuhIKRq2qZp0H 9wceE3CCAofzMHSVoKoSGjuAS9HvZD0vIPAeq294oPBtO1TzHZV8+IBZuHgsR1YioR7NEXtjO C8Z5KaYMwZppcdo5q82YnJxisvOiyGXyNi5DNP2ZbW9EkYvLValQM7pes7EbTSHVhknU3963Z v34jOwtOy2caNkkuGy82I2mkqQBqBWvRs36WIHP5N1brbbI2X6VgYwxTKSGX0ZkSszh7KI1U5 Z6kJG8X+D1Yj3hyHbwCfEUK2XQksnicnyL+Hr8/SgxIY5CKpVKH5PDC3ar82d9CMWTyBBHmaS UGKvD+a3TUGQIdWQIoeedNIST+y4l5CH79Ci/ujeYi6Y01N39d82bW/qX6/jd5Yx3aWrA7NqU 5ilIW/xr56x83dj745Mbiheubn8w0ls3bdml/27iKytfT3i3ZkNlasrwgYtB66EGsjo8PbrxR HqWe0HJqpy+ZaKLK43dt/xoBZPV1ek5rN6xNLQiqF4+9tvz9LqK9ew419pFBkK0cMlJWBC5z1 BWuOD3AwAA X-Env-Sender: ikegami@allied-telesis.co.jp X-Msg-Ref: server-5.tower-163.messagelabs.com!1526263956!148720967!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 88175 invoked from network); 14 May 2018 02:12:37 -0000 Received: from mo.allied-telesis-co-jp.hdemail.jp (HELO mo.allied-telesis-co-jp.hdemail.jp) (52.192.143.101) by server-5.tower-163.messagelabs.com with SMTP; 14 May 2018 02:12:37 -0000 Received: by mo.allied-telesis-co-jp.hdemail.jp (hde-mf-postfix, from userid 504) id AC0FE294002; Mon, 14 May 2018 11:12:36 +0900 (JST) X-Received: from unknown (HELO mo.allied-telesis-co-jp.hdemail.jp) (127.0.0.1) by 0 with SMTP; 14 May 2018 11:12:36 +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 4F36A1AC001; Mon, 14 May 2018 11:12:36 +0900 (JST) (envelope-from ikegami@allied-telesis.co.jp) Received: from JPN01-OS2-obe.outbound.protection.outlook.com (mail-os2jpn01lp0143.outbound.protection.outlook.com [23.103.139.143]) (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 3ECCE294001; Mon, 14 May 2018 11:12:36 +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=9MVhgwwQZf9HR6E6Qj/KxPyBAuM203ndR5B6gdI+FlY=; b=DTrCGKxyPOCyI7XNtzhxQg58QeW9Yk18cjGEqvYpm5NgEBV4r+4r6Iv9pTY9YmwnoKnTKdIIEDh9QAt07d2AAbwf8E+M7ozggrKm3s3ge1krH0ZYQ42V7IgwCPbVQsWQOwrQpjjZUuQb0KFWlpRH7P9gzebES1EsOMi9QmNSaYo= Received: from TY1PR01MB0954.jpnprd01.prod.outlook.com (10.167.157.141) by TY1PR01MB1135.jpnprd01.prod.outlook.com (10.174.225.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 02:12:35 +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.0755.018; Mon, 14 May 2018 02:12:34 +0000 From: IKEGAMI Tokunori To: Boris Brezillon Subject: [PATCH v5 1/2] mtd: cfi_cmdset_0002: Change definition naming to retry write operation Thread-Topic: [PATCH v5 1/2] mtd: cfi_cmdset_0002: Change definition naming to retry write operation Thread-Index: AdPrKP0DG9wSCADlSsKNg68PhsK10g== Date: Mon, 14 May 2018 02:12:34 +0000 Message-ID: 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; TY1PR01MB1135; 7:gHtKbk8m3911xFsIP6yWBhcR4cHv+bdF9W4oaOdCkUAb+YvW0Clpgl0j/wXu1r9IUVJqIHIWmBUMluEedWQCOKL0qYSUzFg6VvMisQwnrhknV8ksgew+Xw8XqAEiAxxEfC7hMpgZVUMryrGa/IPH+G3SFQV5m8blNdaaOCxCeGhQKb87h7ZEhB0/oth0hTVBMG1YB1q0/ofmbarcSdj5PV2Fc1cZsV9sBZcA6MQlCy30Ke3JM2UoLrfAlg7k3G+M; 20:QUN95qY2HHP+2s3gjVGjCf8hCcbtMQVznCUsp4GuOaP33FHxzTLRzXY79TmWJoUe4fGr4u0O2lMOVzBcDO/kC1B5D3fz1LtgNPCo2pPbq4tN0gWzW4yxyU6M2hRyF0OU37Mk5Tc/B5ZH6UvUU9bTmGXuym9EdyngreM9TJKEojCeW0MHB+RraddxaQzzmULymWThkK77i6Yaple7glxods13nQZyMTRDOT1XQUNCNH0PczfyFeL0CFmxasYJwLC4 x-ms-exchange-antispam-srfa-diagnostics: SOS; x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:TY1PR01MB1135; x-ms-traffictypediagnostic: TY1PR01MB1135: 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)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:TY1PR01MB1135; BCL:0; PCL:0; RULEID:; SRVR:TY1PR01MB1135; x-forefront-prvs: 067270ECAF x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(376002)(366004)(39380400002)(396003)(39840400004)(199004)(189003)(33656002)(305945005)(74482002)(7696005)(476003)(55016002)(6436002)(186003)(102836004)(9686003)(53936002)(106356001)(66066001)(26005)(2906002)(2900100001)(99286004)(74316002)(3280700002)(3660700001)(105586002)(486006)(3846002)(7736002)(5250100002)(316002)(25786009)(5660300001)(8676002)(81156014)(6116002)(6916009)(54906003)(81166006)(4326008)(478600001)(14454004)(7416002)(39060400002)(575784001)(86362001)(6506007)(97736004)(68736007)(8936002); DIR:OUT; SFP:1102; SCL:1; SRVR:TY1PR01MB1135; 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: LlQvMP5pSsUfDaHGBJ20o1OXwo1rwbZ2IzD9EjXV2S0/geEqUKNP5HX6EQL2EMzOyvbMWLYC9wWXWnJW2u0E4vTPppcpKI1lFMvcE25FrVpQCdaOP5j7dz0rRCRvYBK1ItcXSgfb6veUmhVFjTNf1iFz1/pc/gPebkUfjBj6jwcS2jVhvdRO+w5nFz6UNbXO spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: bc9b5523-8b01-4be8-a968-08d5b9402866 X-OriginatorOrg: allied-telesis.co.jp X-MS-Exchange-CrossTenant-Network-Message-Id: bc9b5523-8b01-4be8-a968-08d5b9402866 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 May 2018 02:12:34.8874 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 1a8a37cf-9ecc-4cef-abb0-1ab01a15a6ad X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY1PR01MB1135 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180513_191249_157428_F9818135 X-CRM114-Status: GOOD ( 15.51 ) X-Spam-Score: -0.6 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [216.82.251.12 listed in list.dnswl.org] -0.6 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [216.82.251.12 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -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@free-electrons.com" , "marek.vasut@gmail.com" , "richard@nod.at" , Joakim Tjernlund , PACKHAM Chris , "linux-mtd@lists.infradead.org" , "cyrille.pitchen@wedev4u.fr" , "computersforpeace@gmail.com" , "dwmw2@infradead.org" 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 e397b80e40cc..b69f30b0303c 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;