From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756604AbbJUVw4 (ORCPT ); Wed, 21 Oct 2015 17:52:56 -0400 Received: from mail-bn1bn0101.outbound.protection.outlook.com ([157.56.110.101]:27184 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756310AbbJUVwj (ORCPT ); Wed, 21 Oct 2015 17:52:39 -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;vger.kernel.org; dmarc=none action=none header.from=freescale.com; From: Han Xu To: CC: , , , , , , , , , , Subject: [PATCH v5 6/7] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Wed, 21 Oct 2015 16:41:40 -0500 Message-ID: <1445463701-5921-7-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445463701-5921-1-git-send-email-b45815@freescale.com> References: <1445463701-5921-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BL2FFO11OLC003;1:Vr+TShdSXKK7JHMm41YiEXxMWAbJHzkTFtmeOUQ+SgZm7/R7VI9Oci4y0zgGQf/lRtCBLxlZOekBlCyVM7CroSVyiXO64Y9lhvGXVgbES+CEHENrvjvv6YMAtMzBreyLA5nkgdqDwR6yEwMVCh8K03LcUUYwsddtrkyEIVu1huGP3F090SU41jRexDnmUaLwgccxJI65M25GgohkosPSM4/ZZeCB+kRtFjnqilqRg+6aX47LHvLNcSHPZK5og9KJLsegXt/fkUwCUnAgprO6GH7Skogt/OgGY74+h/mV5FGPwmDiLIPMH3vLjiipeDFdIQC9vyE9ISEOy9n733PhrZwQN9Z3zOfGhzA6d449u81AKSaPRr6uGAGPKrK1o1tG36jHNLUYRwxASpk+F6nLQQ== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(97736004)(50986999)(5001960100002)(76176999)(85426001)(110136002)(189998001)(50226001)(87936001)(2351001)(11100500001)(33646002)(5007970100001)(575784001)(6806005)(36756003)(5008740100001)(229853001)(2950100001)(19580405001)(104016004)(5003940100001)(77096005)(106466001)(46102003)(105606002)(81156007)(50466002)(64706001)(19580395003)(92566002)(47776003)(48376002);DIR:OUT;SFP:1102;SCL:1;SRVR:BY1PR0301MB1304;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;2:GjeJTXqPoQN8DdWul5QBjhGGdswr7bpb+aEdvZziJ9+KjCAE/9+JP0py2Uc/v4SyS8GajIl9+x7Ybp+zSHyyvhtdR5z4w2wHVjL+yy5H9qgu+pTNR5TyJ+iNnXPfuxxLHhtq53c+QU3BV4NkzHtGX7icKcMsnbhDpvcdnvMVYuY=;3:Uk7O7/loKlhYXQNW8jXvcl2ZpmWk83ykeK2Iyic51abNNhxPWPFSv+hHIsXoK8fEXx1O3iUfLwF8/FTHMSJC/qLGVCgJ+WaSRFyJSZX0NiTrJDL0yHba2J+7dNPSB2fiaNO5jpp5ZL/MR61Mqc0kPuarWuAAYROHJK6FL9zojwAF5fK8mUNLcCQsPQr5rHuuWcsqkpLuYHBAO98IaQljwDO3UTaod760E/YNWMpXqwU=;25:FPpaDmNZmr1xciTyiPvJqpCfiQjnPFbBkgcxZJnTgaeSfSQJ3Zn+kTPKAsZ3N4DQZVMyGYym2EfQ3zR95XWGVLc63+gRR9FKC0tQXFJ+t0B9VMwkOCuQSP3YNZ05xB4KNqZuFjOXCifDBbSWd9vCSknOK2RCGXlsCOyHqG3V62RC9ea66/zUTCGSzaB7X+JajYtN50mMMRnTBAsG7djEKA3EKIv7PKuNT9DhSYmmf25e3liYHlbG8p2Khw+l2w4+ X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1304; X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;20:oVh8TL6siSytl8E7a2LF3Yv9YrkjJr20dSugPK9QmvcF9Y/7xc9XRDastTDPw3YNSjYitlf7/z0xkg45cCvwHSM1+rQhiM6uEgzp0D7gjx37RNtvvu+h8WFcgF4pQuzy+/fHOwghRSWpZZ2WvXTmyVp/5mTwP+Rlp02ii1q4WOAs9JuaaJkhpVsWp/IJdfPy9yW7746wUiHx5Xr4C6Yq/nFkxsG8qAGEnj6Zvsavg1mKIQnpxf2hvy7NZFwEgpQQn1FVrDy2W0QloEb2vP4uVA8gT991WZep+X6kuqOMnLVAWrZVCeQjUo1qsOigrLHwhKXmn2+7dJG6M0/mLSsMguQ+g+OXwiFHtejzsrC95Vs=;4:nyHMyGRVHL+xEZoTU3nv2ZjrAaK3B2jX7eKZprFb7ycCybj8C9M2wmEjVSmLD9im7oGj0HLxDtOsUHCikS6Fb5Vnni/JXmSAyiCEcNYxNGbuQ+6yVWCwZSqWs4QTG7uyDv/iL529xTVynoMEBiLB5Erbn+lDnzDPSQafxQdoM3RRnlm22xMQTjSV9GBO39WsH1PCN2aVUbf2P8u8v+yBgpCMtqyJW+Nm8zKbJUIXfsyDWKkCiLBW93zaFe4qUKzSX/lXJhwUmoBXbGGBysxi2UF7Meiyz1BECj8YBmd/DPGvbfk3h6Y7ZGOsRDrlsGjHGk68tvc+PTXDJ+lt8fMk2X9rAzSHRV38bkA0lfJnpPv9WjjwePQINDu5tKdC4E0l X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001)(102115026);SRVR:BY1PR0301MB1304;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1304; X-Forefront-PRVS: 073631BD3D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY1PR0301MB1304;23:4o9me3MIqOLrxfSaqY5n04it78YxHVnqNGiQRsr?= =?us-ascii?Q?P6CenYOvhdFV+OVe/AbZ9LTMKi8zLrmCPJy1vj/g6Rg24+9lOEmxv79OLHsi?= =?us-ascii?Q?rj8pKfWv6nDXAlwN3trM/Qw6YTOAsLIYZX7uGsNb/qGUIO3wE7KFZIjqJSPa?= =?us-ascii?Q?DUaaIRL081sInR79DziQRM3kU3Gh4ruL121+e0wTH8xJmEqENjgC6A4+Mb9k?= =?us-ascii?Q?kyY9dGzlkB+Je93T29HQDY5NFUel4mmuChVYaKv3Q4C61mnZDnlifDalipeh?= =?us-ascii?Q?Uy2ZEYhrTLA6bVwIx9TcHN2xe5Wx5MJqfiCL1E0bokzO1DgkKwiw0CpfbGXY?= =?us-ascii?Q?gV2Afx2u7r6jlKUk0+FnhBfmEXminj99HO1cWesbVJbhKLr0tCi5Pa1NeOiY?= =?us-ascii?Q?+SYnbvePcaTqVWK2uE7ZOwNTZ3EB9CTXoBALunLV8Nvyjok2ru2Pv5joNCJB?= =?us-ascii?Q?+xVyGRWC75m20nvemfGAmRwygJpyHfCLcujPYBA4J2FlGKxuUHEroMCoGx+m?= =?us-ascii?Q?+C2xQaefwYOHI8yRV2Nm5M4LkiImRF8gVWAuJH93XZ+vZemIKDuB5fIKnjTA?= =?us-ascii?Q?VFLK+OXar9JhyTnbPZSruPDTwS5Ofls/do/h7hTb6sEzCWGABHUnNbOb2kSN?= =?us-ascii?Q?JFzBMF1dgZhDkMdTD802RUlwYy4LJevdUvMPiAQ3mlJxSj/7yNLhL9MUYeZs?= =?us-ascii?Q?M9TZ2qdBzmeZ33dB5b/QZd0Sdr0nr97eVJLhxVZIVsoksBD2XWSCivJs6/6U?= =?us-ascii?Q?JeetUKTI+9IcV+zsvxzzuKrw4vVDNQyBJBJrTWE5YjYewkWCe4+0k9wxubrI?= =?us-ascii?Q?cDF5fgeNO0Lvu5JirRJuPazhFYu2wgbtsTbrE+Fgxjw4X77SfHpecqgThuJo?= =?us-ascii?Q?loMNBiTvxjdnpkkqxj10GEXU0XGZZUCruMLn6VccCpuO1inbtjtO6xPz16ka?= =?us-ascii?Q?56k3WClpfjoj2W+b0Qvy6T6A0JVQJaxlwo8WbNTIDnZFEGJCl3TzGYGMSMfJ?= =?us-ascii?Q?MmIoyeYFM9D4UkkigMFL0qoZ4XZmnFEdVSEnzkHbHAtbuhJRF736TuISwcR7?= =?us-ascii?Q?iqk6qMpfYOcZ+F99MPbSS+o6zxe9o?= X-Microsoft-Exchange-Diagnostics: 1;BY1PR0301MB1304;5:hpkzNu6wuRSDaHiXpSnmfbNRzJiCtx5ge4PV8K2dKmIIIaPTp0ENhsKb3NsQemvesaEt955VVqj5b00fXhfyZrIfm5qTjy0zLn+lzqb6sEoNlLCbkE8wE8nDtcmuW49513+9sgTv/ud+n5WxZV7ewQ==;24:Fa/FXfyk4nR5BwsFRrcWNZYy4h1R3vlV+oE+aa9BzUPTTUD/D3b94LYqEN74e16Sl7YrKdBNgHyIxXAWJOek7FvnhPBr1kUbawlh0DE123w=;20:NzmMFutJq9vGbxH/qBrk1QjwHq3T3OiCy+3E8eH7A6ftYXuDwJMFpYgwU6Lc7PsgLa14VZQf6gHY+d4k6h8vNw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2015 21:52:36.3895 (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: BY1PR0301MB1304 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 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 1f26a79..0548d84 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 9eacc24..fff2694 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 58b3d69..149a442 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