From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752342AbbHRDdi (ORCPT ); Mon, 17 Aug 2015 23:33:38 -0400 Received: from mail-bl2on0147.outbound.protection.outlook.com ([65.55.169.147]:22193 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752307AbbHRDdd (ORCPT ); Mon, 17 Aug 2015 23:33:33 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; vger.kernel.org; dkim=none (message not signed) header.d=none; From: Han Xu To: CC: , , , , , , , , , , Subject: [PATCH v2 5/6] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Mon, 17 Aug 2015 22:25:01 -0500 Message-ID: <1439868301-24937-1-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11FD007;1:O86EoNKt836FBTRiiFPQe+e67hXTQUbiIZ3a0auEUgwuzy4U8WsnpYYlxwQg7HsaQNSzA+BuBUIXhxem2BE+22uQyGFFWzL8chgV1bdkYG3KH7PRQKAQS5onRyyNgAOn7DVxSZDWsLO2jADcKVZLjTQ+xDxrB4Ckm3WkW8aIHh1yfvVfFa5kfACM3JO/UWgs2QqZLf/SqaSMKcuF5WqUf5FnaHdyePdwQWV0fSjy7swACMo6imTcBDkNLDBa4bmWweVPUsm9ASRshyw/Lqf9aqOa/s5zEJTNzGQaOTVUepujdEZ5lUEoRkCMGKSPq1mZddN+8/z9a/JW7RkXZPrFhRNyj/6aOgre4FZ2wgXfg3h7dDb9vqhlGkCOg3bSREujIQf5lkTKwRdfYWIV1Fx+NQ== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(979002)(6009001)(2980300002)(339900001)(3050300001)(199003)(189002)(47776003)(33646002)(81156007)(4001540100001)(229853001)(97736004)(64706001)(2351001)(5001830100001)(87936001)(5001860100001)(104016003)(575784001)(105606002)(36756003)(106466001)(189998001)(5001960100002)(110136002)(50226001)(6806004)(5003940100001)(77096005)(68736005)(19580395003)(50466002)(62966003)(48376002)(46102003)(92566002)(50986999)(77156002)(19580405001)(85426001)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR03MB547;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;2:hATQwmV1ZJxmzj+l78o0YHlXftMvvBNjvGz0h0upNLpzB2lpAS6QvQCVYUvwIDlnPAvaho+AcfSRgYOo47eQxIkgP31OmO2zt6fZBqdbRdUD28TKeP/TSmYmxuECbK9jHm/t1bHvJ/k5SOm12NJb2GMU4zPQIdLHitWIfcSX/0I=;3:jA3VOj04LVlX8kYzPL92WrLPFNItubO0rg02WLH7mxhHviY+RzzVUS6UU7dffI7EWmrnlLQm90F81gd0Te3YqifgxSXTxsc5nqWOiA3oicJCe6k6pnMJBHN1DzurEDc8Nlzwp3qtpqgh/5JirQ5OGAJ8frLXPWfP802+CVz+BOLKnRURP2EmJS/haxKh9BM6gRPJI9B+tMb4FfpvNUWAh6aKigPQd8RU7qGdBxNKRZw=;25:XLtFJbjHdioCVnfILggTpDbNeT2AZVMZ1TqMNYKVDUACRm4IwMR/Qz+PxVyWDV0SrbH3cM/cWcExFH79KsW1lS3ziAaqYfK5ow4IAgRVTZMr6Lyk6U2xVWoMwAV+a3CAjfXJpI9btW7/mUsnYFXImkVT2KNwKoSfjMzwUHXhckv4jMK4fGcyG7+ALtvau0huwRegqel786eU9p0WPVVwrZRzYj3LgDvozSyreyBN+pIYzy82lAfj3BZvxTQ8Hjpe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB547; X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;20:dAFeG65ZNttXyDqK/UHwNdDCxqJtOF+rwyPw8XN9DKHUfgXo/49azeblZkoHCWA+Srw9IjwloHEZdsPfwjZ7PvJ3BJVfXUaGeHqgEeLRVswA/UgNku7xRVgqdi0MuBZOCHLP2xAfIzZEOHCxUB4zbbJIsaCjbPDWNzOSzt05QBgu4uxEciiBRWfuH8PWxkug7+w6wStNRedvi4T6vghBni+HM/GNucGomu05j1pha7PXWNS4BbgUpyk67MqOeTkJMSNmnCuXhv4VPwswPtBZVR2Ab7k1YwMzBTx9Sbc+YGbKnC74MdPPD7UaAQvyVyRfSqQYXUPvnFaDjeYpzKzuSUy/uRM57nktruh6PaDArS0=;4:dkhen4R/bMVuQjWP/DthM0trXK3niWtYWxJ4BXlSkFj4Wp5o6/FuFNK/64EDixLcvqpT+Iv6O0AJz2sVj1CGPXyixasU9dEfFHpM/yz1lJeN/76wAhXYuQPg8oHa7milWjMYZHkhfTMxd5y7uZTdVruSXkYRq9fhXt9cU4FTMgGV72gpF7Mg1JsSvfKcrYBIlxGx9wuo+gRytjt9D9h/cN3gv8r7bGfI+uG0kpJbsp1J4qyCZN6oJo/LAMgHKt4dvzmHakkkrPYKatZo6asdewZm0bMdFA2AXWUrNuApKxSrfvfjlnaEds9+AzdXdMlI X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(8121501046)(5005006)(3002001);SRVR:BL2PR03MB547;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB547; X-Forefront-PRVS: 067270ECAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR03MB547;23:zQrqBNrEVxi3CJ6NaJkrtbpyKFSxHM5S/HTW8Ayr3y?= =?us-ascii?Q?RfG/Mx3WDCECJ1PUqPuswf0FIW3fjjsTCQ5+G48wrdm3IdggO9KjDKExO+lk?= =?us-ascii?Q?hQH9Zc3qSsNjZZOqCkpt9v6qHRP1xrOB8cZzjPlameq/ZkDIonoi6ThZXu9/?= =?us-ascii?Q?GrwB1XHaVMzOIkOdK5fXMW8q8xF9Q18Y4VcEXM+WFq7n23ZERQ/G///roGgu?= =?us-ascii?Q?e/zWaLlh482U+ziARU2CoeYqWx3AtrimTL1jlP6vNVPqaz191AecSW6RvPCu?= =?us-ascii?Q?iQH+l5tRhZnCRDjcntwPPgv9qTUvRXA6RvqzHWdfRiL6Qzu50h0uLdyhzxZs?= =?us-ascii?Q?imZGyj+e3MXPcYCbklJJpQViIslRMZ0/+V8/ey9fAHCESzyxiha3PDVZcNkb?= =?us-ascii?Q?T432/YRfu2JxbOfhuG7TKJjVCKLU+kljHsoeiV4fC++lsLYX4Eb+SxefVMv/?= =?us-ascii?Q?Cg5Ue4Sdc/OJy5z2g7mOl8hNsPWmOBE/4bXOBSBC+Ur32zbJ40Qt84rySTWS?= =?us-ascii?Q?+eBF+10EEZzacB1ccf+nqEp5035BjiXlh1Z5UfhOldeSa/y8UB5Zw8egLka3?= =?us-ascii?Q?Cff0HZHxiGKhuZO3i4xOL4A0GZovlp8FTrfLljSeAdQaqfAGHu20M+r5PHS1?= =?us-ascii?Q?RvX0Uxvw/SJq5tlHJAiW62ipzro9jq2+0CAovvpRIBWmBB8M8YH4bBxw8IT7?= =?us-ascii?Q?N36FVZzCDVFGrz2424s6Zv3wqGUCAt5qHDoeALELFIW0s6anPBm2r5/4gqSU?= =?us-ascii?Q?gyY4H+mtVYmVAxJvB1RtGfC+1vafguXW7Vo83OkBfHH2DTd4lTIE62UK1P02?= =?us-ascii?Q?Hbflt/rAdqKrLlJo7h2rIQu+OK9tlGDJ6ifBea1HG3GRG9A+V6y++mZ9PWGX?= =?us-ascii?Q?je7VwrVVVqSGLii3C8Fh8T+fvqEcjFp5a8J9HgXE113UUsQ/rn19mj/19bqr?= =?us-ascii?Q?gLweG+J2cmDUYckT5Z/96WS4naIvD7lVDYqlpMOm6/9MSmUtny38XREdHXYm?= =?us-ascii?Q?BEg8mntaYbkt8PFw5bprySHKmASK6Avbe7IqxESVuS4X6uT3egjuv4waBKck?= =?us-ascii?Q?FqDiEI0RfCYybKqqFeOZAgpdN3UolyCKKOzLQkp4eVCxPBaeW+TB0s+/fQsF?= =?us-ascii?Q?VH34xIxCdu5/eTdnlfg5TwHDrdap2nVOb+2codDFIOGMNktFscOUwtfCt04a?= =?us-ascii?Q?jYx8JEmNLYqig=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR03MB547;5:zM8kia6arsC9iqq6SwoEscR98bOy7OyBhodXG+l2dNqniiyVEUI0PRYNHLoIJlHEUtdwIHC1I53D/O94j8oZ7tKICx/4uzZ6SWz/SRx6l5EeYsYzW8LdTfChJwiBhibxiPmRNZq0gTisr5KCk08bJw==;24:NKlEK5tqpafaTkAg64kfW7VkCaoJAY+y5hyqgNZNk6WUlTejIEzvhkKvSvScSidNOwmddTNlY9zpq7mdlTlYpClha8CXTR1yj8dcjMhtRX0=;20:VOfs4P9H294tEKhLKpJkIoUYxKKLdTXAD2AUE6Td4igdXmM8SizucT8q5yloDLt6pepdmSFyzUJugfyI4T9uhg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2015 03:33:29.8264 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB547 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 gf/2 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 6b37414..f00ce90 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 0462103..362cf4c 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 = chip->priv; 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; } @@ -1991,6 +2010,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 1e105f1..36ffeda 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 }; @@ -306,9 +307,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 -- 1.9.1