From patchwork Tue Feb 23 23:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Xu X-Patchwork-Id: 587124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 97207140775 for ; Wed, 24 Feb 2016 10:22:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b=SfreGwka; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYMGd-00055E-MQ; Tue, 23 Feb 2016 23:21:19 +0000 Received: from mail-he1eur01on061c.outbound.protection.outlook.com ([2a01:111:f400:fe1e::61c] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aYMGS-0004gx-Dv for linux-mtd@lists.infradead.org; Tue, 23 Feb 2016 23:21:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-nxp-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Ee21Ohg0//hf3BDd9xrkPA3XoxNk3w+bh5T9r8PUb/Y=; b=SfreGwkao4SWMLIu2X9zm/aIbC3rDHgEMqUg1NhkU/pc7QGe5VuB8G47y3k4gMBPF/lUz395yunWnQcEZuSqI3K185HKkp8aBo8VueliGJpnff1OHlXGS20ySy8WJferE5NcBwgy5bvnVR9BimzlIe57M0cG7HDvLb7E3qElUko= Authentication-Results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=nxp.com; Received: from chopperman.am.freescale.net (192.88.168.49) by AM2PR04MB0771.eurprd04.prod.outlook.com (2a01:111:e400:840b::23) with Microsoft SMTP Server (TLS) id 15.1.409.15; Tue, 23 Feb 2016 23:20:43 +0000 From: Han Xu To: , , , , , , , , , Subject: [PATCH 3/5] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Tue, 23 Feb 2016 17:04:51 -0600 Message-ID: <1456268693-8630-4-git-send-email-han.xu@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456268693-8630-1-git-send-email-han.xu@nxp.com> References: <1456268693-8630-1-git-send-email-han.xu@nxp.com> MIME-Version: 1.0 X-Originating-IP: [192.88.168.49] X-ClientProxiedBy: BY1PR20CA0015.namprd20.prod.outlook.com (2a01:111:e400:51a4::25) To AM2PR04MB0771.eurprd04.prod.outlook.com (2a01:111:e400:840b::23) X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0771; 2:FfwMzPlUk1WMlwlt2bDHicoHFczDaK5K+JsQDWvFP6IbwqXjyR9EVAWCFdu22o/jGmCU2a4XUhWiGJi+fjyXINP4YafnzsHJT7s+Vx3Hc4syflnzUkcYvtkz9CTtz+U0R4mcIhfvdL2gccT+E9Vbkw==; 3:2+/labLqVCXhOiDi5XVUnsU8ve+STEmJ0TNviF/YAmzzFOuT5e+NdJf/mgKK650mfmjyCNEcHCtvsvCVQGsSUjXOxVYP7ek8sz7FAaLFhAb8lW9oOBGGCLK1Y6kLiBz1; 25:2wuGMnFmg7fxW4zrwnhdUqbas6jA9z0BQ9WeftWktyKgGBN0ijxGv6ot3Xrzd4bqHE3P5/Hgqj7bN5vK9WY8pWTwPYbLRjiNt61oNL3F7BwoEXrSFpQlLfrteZCN9oVesRz3mGLcU/pb8/bJ5NSBXp3gECCzAb2j0KpTgfUj0vncXGrAdAyer6z+1iR6uVUomo2Ei/pySkIY2gLP+Twlr9I/tyiuHkmkcNepXCN5xfs8zdaGGWS58CbaKOnlPukrVU8bdZx6+2ifxtwvuilrqlFKldOU6xHsC5XCzwp6It7/McN3v9JuEovNXNmFXAJ5yzpKh2WP3ks+BduNwQtWQXAnNaE103U4blY6LYRVC6Y= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR04MB0771; X-MS-Office365-Filtering-Correlation-Id: 7a58c5d7-0ce2-4080-875e-08d33ca7f5b7 X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0771; 20:qCf1YTp43xciVT1SyGJBtgCGOMqDemjtOEdP4QPVyfAPy7uEfMCRHPpgpBJRVqswqxLBOD8IgAU5REnIwH2VN+nj7Zk9fHd5yuFqxHjruKLo4GK2RBRWP3O1InoIDk4zGuvAxBY2OaD0cRywM7mLgu7ZK44nR4AkiNZByyhcOQHfbf3/FLrQggGoVzoHVqmFjN72GC7m7Er2KGV7Evn+pVOVlPeXmezPlbyXR6E0LUBM3vs6bGhoOQuxiIX3XZw5bcoJlYF2EwUqZRkgL1eygDS/JmQdV7ZJoMNw5Hr6Kcc5nmvxyeX+KSkTS8svH25TFDmJF37ZDevoik2PrZoBR6etq14DPyIJIsL5Hh5KVak74T2hX8qopNb8sTQpFfZym0tikFTKqaSrdADGIXSGypyL9FndhED5tNMADPtzM9jbh8dsSU0Ib6fflZsnoTT6/33/AnzVyeZMqonQHZXKOedXTN/HcWYvdRNPERpN47tLWRYTVGdnHkfNb6tMy00V; 4:d+csBAodxvBEc6LMYCqV92HcpUQtbwAHdi/HSHPec5MJYtlXUM5sT9hqdhCT1K9gIBA0BLNP9J1qWczqBnlh2GMx4Y91a9lZS2yUqrYrvxviEm/UjYrGfHLE1Vkdgr3Yp59MuZVWcDBuOBGcx4fyo11GJPmMBRimQ3WGwU9pMeVNLKZ3iUAInXAqCZmfTqxuL5KE5cWq5ikVrvSzanJbspT7p3NsTHLTwRDE6KFSfAhOsocXLtvky0QjrWR36UsR6cprjy0kp4IT3cNJyo9bP0C0jCNuJuh8rLu0z7XYibJwsWBW4rWqmRaqe1OWjgwLGrYURYm1k7AYfB5txtZoO/Vcn58bP8FsWZiHeidQH+FjSD1yZQbBzjhIupG8GNs/Z9AHM9VEJb8J5MVUTJZ2Il1R5ZV6ELz+BkT648McUb4= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001); SRVR:AM2PR04MB0771; BCL:0; PCL:0; RULEID:; SRVR:AM2PR04MB0771; X-Forefront-PRVS: 08617F610C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(42186005)(87976001)(3846002)(50986999)(189998001)(76176999)(5001960100002)(36756003)(575784001)(66066001)(5008740100001)(47776003)(2906002)(1096002)(4326007)(2201001)(586003)(5004730100002)(48376002)(50466002)(6116002)(33646002)(92566002)(50226001)(229853001)(86362001)(2950100001)(122386002)(5003940100001)(19580395003)(19580405001)(5001770100001)(40100003)(7059030)(921003)(2101003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR04MB0771; H:chopperman.am.freescale.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR04MB0771; 23:J4lnBJ1QrbH3l4/8UFB4YknDmnt1p+ZcM93P6a2ei?= =?us-ascii?Q?CNdfnwjKgx8cjDTaeE47VN7UnIq76ZVSGO12Kg4FLTtDCcvgMrhsXi2yQlGx?= =?us-ascii?Q?mIwlpPXuTUdCMCL6VS+lz+uT7/yAX+l7GWeH9RezzyYgJjVV2mqxCsG6bWEc?= =?us-ascii?Q?V+lrkx5Z0c5ZoYF3CXAZ6LPTSzbSi9H8gZM1kLykbcSlbzRuHEP0KR65ITEt?= =?us-ascii?Q?hTtdOar0bnf+0vIPHjO1LcJAcCAin69mKvoUiOkFgTOJ6rxWgWomlVCj9mNa?= =?us-ascii?Q?PHUMGrBJ8GDBPAdXaW9oLi1FoH3CctrJ8f/gc5SfCHXntMlCCsqOx9wjhO5a?= =?us-ascii?Q?+gtt++1tX80XhYGoR3mXl/kcMfeQXn4F9Slv9igIsXq9Xp12qd75VuLQGwvY?= =?us-ascii?Q?rFSiiW0SwbU3NrkePupBFVsgPXPYqf4mhp0Yk/aICLOfHH8f0avPjb2p90wD?= =?us-ascii?Q?LDKuuwLuY7Gv3yKmA+fcTJLYc4WE2+iIqGdmsDL0kjeB0duDnfiFzZQkIR/3?= =?us-ascii?Q?FE8MqxBgHJIuDkz18xkxszZ2yp1baActSwbbEbPnOIYJZBLDP1hl85bFmFa1?= =?us-ascii?Q?A6FtMoaFKbHNSO007cq9ookngJfu/WFuinAJlpo/79qMh6KfsHcZuMNZpKr9?= =?us-ascii?Q?/3iK+aMlXMvxtc9Nmy5u9I86YvwUwvQR+1UGiUskrGeKrsKXcWptoY5uJhz6?= =?us-ascii?Q?j+s+RpO7HeMAio1d3NVy28GrccOENHF9sclKH5qla0BIIZ6DVdgxd8f6+rnl?= =?us-ascii?Q?KLtc644Arf+kY8IN6/bcwQ4GVBt9QHWye0Wz6lPVSsWBw8QEqdkoHmg48cPE?= =?us-ascii?Q?XNLblCizZvBeR8129qMJo/4OaQGAdQVcXKo6O6rPgaD9SmGn4DILmykOX4Y3?= =?us-ascii?Q?GuQXcmfyKkb3tUj4dlpCqha7CU+GDeAwdDGVHtDqm9XH46G9vmLhA0Oj4Rs6?= =?us-ascii?Q?9bHdsQ4QP7y9sOhShU94nAyApWbecUqkpUHPLRBqeWqek/W8+eIyxaeLmqbu?= =?us-ascii?Q?Zxm0JBUWTEgd6jpABQsVBClcdQE2uPlPodUV1bteiSBBXOYYSzArT10g/yJ9?= =?us-ascii?Q?jVKKnE=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM2PR04MB0771; 5:YFNLha09qyemUi9Dd0hF0+BnxYKGenmubQMdKHXr03ycm6VkOC9HXLE1IKp0yHbGQOQabz8BEmI/f1XAz21ZD7cJbc2saQPYL8C93PXd1taW1hUPRt0fP1ozraChRXoUu+EF1iZheFZKAHPYDFlpRw==; 24:eCTTyLrhb3K3X9fCGlMIyzjwU1ucie8W73hLfNb7l9N+4FXu1NiDqXEup20aZVh8Sn3C6/k3d2ZwKbZxbi08xROzLAyEKLiL7Y5+HJUmWxo= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2016 23:20:43.9960 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR04MB0771 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160223_152108_953582_42507EC7 X-CRM114-Status: GOOD ( 14.66 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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 X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org i.MX6QP and i.MX7D BCH module integrated a new feature to detect the bitflip number for erased NAND page. So for these two platform, set the erase threshold to ecc_strength and if bitflip detected, GPMI driver will correct the data to all 0xFF. Signed-off-by: Han Xu --- drivers/mtd/nand/gpmi-nand/bch-regs.h | 10 ++++++++++ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 5 +++++ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 24 +++++++++++++++++++++++- drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 5 ++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/gpmi-nand/bch-regs.h b/drivers/mtd/nand/gpmi-nand/bch-regs.h index 53e58bc..a84d72b 100644 --- a/drivers/mtd/nand/gpmi-nand/bch-regs.h +++ b/drivers/mtd/nand/gpmi-nand/bch-regs.h @@ -30,7 +30,13 @@ #define BM_BCH_CTRL_COMPLETE_IRQ (1 << 0) #define HW_BCH_STATUS0 0x00000010 + #define HW_BCH_MODE 0x00000020 +#define BP_BCH_MODE_ERASE_THRESHOLD 0 +#define BM_BCH_MODE_ERASE_THRESHOLD (0xff << BP_BCH_MODE_ERASE_THRESHOLD) +#define BF_BCH_MODE_ERASE_THRESHOLD(v) \ + (((v) << BP_BCH_MODE_ERASE_THRESHOLD) & BM_BCH_MODE_ERASE_THRESHOLD) + #define HW_BCH_ENCODEPTR 0x00000030 #define HW_BCH_DATAPTR 0x00000040 #define HW_BCH_METAPTR 0x00000050 @@ -125,4 +131,8 @@ ) #define HW_BCH_VERSION 0x00000160 +#define HW_BCH_DEBUG1 0x00000170 +#define BP_BCH_DEBUG1_ERASED_ZERO_COUNT 0 +#define BM_BCH_DEBUG1_ERASED_ZERO_COUNT \ + (0x1ff << BP_BCH_DEBUG1_ERASED_ZERO_COUNT) #endif diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index 8acbe04..2c43213 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c @@ -298,6 +298,11 @@ int bch_set_geometry(struct gpmi_nand_data *this) | BF_BCH_FLASH0LAYOUT1_DATAN_SIZE(block_size, this), r->bch_regs + HW_BCH_FLASH0LAYOUT1); + /* Set erase threshold to ecc_strength for mx6qp and mx7 */ + if (GPMI_IS_MX6QP(this) || GPMI_IS_MX7(this)) + writel(BF_BCH_MODE_ERASE_THRESHOLD(ecc_strength), + r->bch_regs + HW_BCH_MODE); + /* Set *all* chip selects to use layout 0. */ writel(0, r->bch_regs + HW_BCH_LAYOUTSELECT); diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c index 1aba6e6..6b3ca3b 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c @@ -71,6 +71,12 @@ static const struct gpmi_devdata gpmi_devdata_imx6q = { .max_chain_delay = 12, }; +static const struct gpmi_devdata gpmi_devdata_imx6qp = { + .type = IS_MX6QP, + .bch_max_ecc_strength = 40, + .max_chain_delay = 12, +}; + static const struct gpmi_devdata gpmi_devdata_imx6sx = { .type = IS_MX6SX, .bch_max_ecc_strength = 62, @@ -1010,6 +1016,7 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, { struct gpmi_nand_data *this = nand_get_controller_data(chip); struct bch_geometry *nfc_geo = &this->bch_geometry; + void __iomem *bch_regs = this->resources.bch_regs; void *payload_virt; dma_addr_t payload_phys; void *auxiliary_virt; @@ -1018,6 +1025,7 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, unsigned char *status; unsigned int max_bitflips = 0; int ret; + int flag = 0; dev_dbg(this->dev, "page number is : %d\n", page); ret = read_page_prepare(this, buf, nfc_geo->payload_size, @@ -1050,9 +1058,16 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, status = auxiliary_virt + nfc_geo->auxiliary_status_offset; for (i = 0; i < nfc_geo->ecc_chunk_count; i++, status++) { - if ((*status == STATUS_GOOD) || (*status == STATUS_ERASED)) + if (*status == STATUS_GOOD) continue; + if (*status == STATUS_ERASED) { + if (GPMI_IS_MX6QP(this) || GPMI_IS_MX7(this)) + if (readl(bch_regs + HW_BCH_DEBUG1)) + flag = 1; + continue; + } + if (*status == STATUS_UNCORRECTABLE) { mtd->ecc_stats.failed++; continue; @@ -1081,6 +1096,10 @@ static int gpmi_ecc_read_page(struct mtd_info *mtd, struct nand_chip *chip, nfc_geo->payload_size, payload_virt, payload_phys); + /* if bitflip occurred in erased page, change data to all 0xff */ + if (flag) + memset(buf, 0xff, nfc_geo->payload_size); + return max_bitflips; } @@ -1988,6 +2007,9 @@ static const struct of_device_id gpmi_nand_id_table[] = { .compatible = "fsl,imx6q-gpmi-nand", .data = &gpmi_devdata_imx6q, }, { + .compatible = "fsl,imx6qp-gpmi-nand", + .data = (void *)&gpmi_devdata_imx6qp, + }, { .compatible = "fsl,imx6sx-gpmi-nand", .data = &gpmi_devdata_imx6sx, }, { diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h index a82555f..605d96e 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h @@ -123,6 +123,7 @@ enum gpmi_type { IS_MX23, IS_MX28, IS_MX6Q, + IS_MX6QP, IS_MX6SX, IS_MX7D, }; @@ -305,9 +306,11 @@ void gpmi_copy_bits(u8 *dst, size_t dst_bit_off, #define GPMI_IS_MX23(x) ((x)->devdata->type == IS_MX23) #define GPMI_IS_MX28(x) ((x)->devdata->type == IS_MX28) #define GPMI_IS_MX6Q(x) ((x)->devdata->type == IS_MX6Q) +#define GPMI_IS_MX6QP(x) ((x)->devdata->type == IS_MX6QP) #define GPMI_IS_MX6SX(x) ((x)->devdata->type == IS_MX6SX) #define GPMI_IS_MX7D(x) ((x)->devdata->type == IS_MX7D) -#define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6SX(x)) +#define GPMI_IS_MX6(x) (GPMI_IS_MX6Q(x) || GPMI_IS_MX6QP(x)\ + || GPMI_IS_MX6SX(x)) #define GPMI_IS_MX7(x) (GPMI_IS_MX7D(x)) #endif