From patchwork Thu Oct 22 19:54:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Han Xu X-Patchwork-Id: 534563 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 7F19C14131C for ; Fri, 23 Oct 2015 07:08:01 +1100 (AEDT) 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 1ZpM7w-0003fs-6a; Thu, 22 Oct 2015 20:06:20 +0000 Received: from mail-bn1on0136.outbound.protection.outlook.com ([157.56.110.136] helo=na01-bn1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZpM7a-0003VA-Et for linux-mtd@lists.infradead.org; Thu, 22 Oct 2015 20:06:01 +0000 Received: from CO2PR03CA0035.namprd03.prod.outlook.com (10.141.194.162) by CY1PR0301MB1306.namprd03.prod.outlook.com (10.161.212.16) with Microsoft SMTP Server (TLS) id 15.1.300.14; Thu, 22 Oct 2015 20:05:35 +0000 Received: from BY2FFO11FD037.protection.gbl (2a01:111:f400:7c0c::160) by CO2PR03CA0035.outlook.office365.com (2a01:111:e400:1414::34) with Microsoft SMTP Server (TLS) id 15.1.286.15 via Frontend Transport; Thu, 22 Oct 2015 20:05:35 +0000 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; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD037.mail.protection.outlook.com (10.1.14.222) with Microsoft SMTP Server (TLS) id 15.1.306.13 via Frontend Transport; Thu, 22 Oct 2015 20:05:34 +0000 Received: from chopperman.am.freescale.net (chopperman.am.freescale.net [10.81.16.64]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t9MK5Wo7004789; Thu, 22 Oct 2015 13:05:34 -0700 From: Han Xu To: Subject: [PATCH v6 6/7] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Thu, 22 Oct 2015 14:54:35 -0500 Message-ID: <1445543676-19876-7-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445543676-19876-1-git-send-email-b45815@freescale.com> References: <1445543676-19876-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD037; 1:mTHiI1RT8Y3n/qunFfuitP73uG4HUzzguSMmkOedYdh0FF04BUfmLlt5aqOkfk+HkOS1VFg9biadsXx5uQWeFCOYZn3KaC4mA2n9FJPK3RXuCjlXAZ2dtQpHZDNP1RR+vE5mFbX1GmXnOLrJWsyMjYcf3yOGa6GU1poYyHsWeszAI80WtpvsoaXWS8XpbTvthwejI/VQQnM5sn3HxMX8yOxZhnjgxKyUlxpHeS/44bCDT6Ogmm1d4mjk9l155YXGQPrEai4UEqu6CaTmKzf4INcG+j5PfWAchMAsdwYXBF/evShs3bY11SnSaon8LxxkBDrl6JbGDSVz9y6Krfs1vAZpuO5lGbtOp6uu0bobyd0h2/oYDh5A40j82j7f+kjvE9/5o2b5yQ70r9h+7Up+aw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(81156007)(6806005)(104016004)(575784001)(77096005)(48376002)(2351001)(229853001)(105606002)(92566002)(87936001)(5008740100001)(5003940100001)(50466002)(85426001)(36756003)(106466001)(97736004)(76176999)(2950100001)(50226001)(19580395003)(5001920100001)(50986999)(11100500001)(5001960100002)(5007970100001)(33646002)(47776003)(19580405001)(189998001)(110136002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1306; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1306; 2:gZIdZQsgBwVDeTwaT6kFyLFZLX5+Brj9UpMxOPTrfclextYO50cGrKuhjoGG1kBi3Fh/75mmByzPLDtcGSf9gwwEB9QFrHbgWtBT2bv6Hg20chuJtJp6KpFtSaIrme5O4wXeOeezRhglYOCYV5RXiUOuHgiOnH4F1PqubAglc2c=; 3:oN29GHbmR2EKDfkBzPmQb7rO6xt+TpuQycd0r9RZ4jGQaKeOMZ5Xg2KQ3YtosevsEAGIeUPxAyVKaMrxdtIJBt1yu/6IuOseFT5mFLCQqe4iYPXVJbx8W3BxZcyFzAj56TsqtEMsGx8/XPIdx5TJOP6J5tF6xuVBYLZbBXJed9wwq1D4Ij+jjAs26aDygZnfMHJdFOp+jTsUWOJww5yHkfQsjpc35fwxobCmVyN9PbE=; 25:LFsNt9VNqvIB+PzjETDGff2YoNphXpTvuOYhA00tJ34lCP/GFxZGLQAA5TBkycdQ1EkwhlywWBUln7nWBcwySAtbZ4NsyidxvZL5OoQKsEfyswDTuWaon5ldBMK9JYW3GbajjeRbIEkqbpZ9anFr2KLf3UDEB2cP8kkrjLA4OySWxIzbqDPaZsuIqrCc7JgCOAzM8ULdq/tS9wPnhDUbbbjKGQLdomLzkVoVNIsJGXY+2KDm5UYPyq92g7v0aLXd X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1306; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1306; 20:TTcQOsyUXw7RG7tfz28o6jdXjWFjxZ4RphitHvYSR6RGgg2Nd7HDFAhA7BVepXloo+JreCzovSXcC5zvsvSAvuC3XTdC7BUcdxhJfeJqV3keEJrEN9EQOZ5uufbNftJeIr216FH5FiQfzHJ0SeXJisJ/WkPrK41ZkVaMmfjiqZyyLL0GjqzfZYTLQo3Dxfla3f0KfF2aDWFJet1Z6cfvSfIXm6CHNCJSdm25JhHEh6x8vUWSt5OT7uiqKvwGb8BBfXIdV0c+65XTf/D1LeE8sfGVyHb2fNXdTZlzSAiCvMhhVR+UK+gOnvOWAnO2pnbZlTB+FZMUnLVNisGy0JzQQyg29sl7hCgLiCBjK9vd0e8=; 4:Q5ZlNtQCfSEADsfrh9x1jYJ0KZ6zGPB9aj3i4rk7nfSM+Vv/brivveE9AzvmLNxBws+DOf0awZofh9c88sQjcwDkuuRFmuxB1AlyklOKCO5O91qPPwBa2tc7y133SYGa0kXyT36iLXJijETFOJRJ1m0ExQg8/DosERCgaUHVJjhY9QMp6MQMcIx8ng+vNojltnnNwKQ+YfAdG7I9PD6XAlMKWm9EhhhAos1uVGNqvDrqdIXzCnAxh3RjrQPOfyufeESXxDrPBha/cPlGYgFFAWrZf+Hyt8MK4ypUbHWE9Bg33XNb1Di/QrTCSV6SM/e+K8aVANFxtlpb4GYV2DkBHtYSPQmuv/Ii3efn/m2o8kg5zn1CO1HATPV8wsOCDg30 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(520078)(8121501046)(5005006)(3002001)(102215026); SRVR:CY1PR0301MB1306; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1306; X-Forefront-PRVS: 0737B96801 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1306; 23:zYBdtqThAI09waGhuR88v1tiQh6h81Vvhi5y3K5?= =?us-ascii?Q?Cta90eW76vjJEgBxnO+iC84onE9/cmUpph4436t/9rQO4CPzshONvMHBOYxv?= =?us-ascii?Q?+BAkqtiX78hS1DWSETPJpnmV0Gqnk/1iThJNIaHQ5Uoi+agVBHaWSPxkjb/a?= =?us-ascii?Q?br2HMs6i12IWqpBKJCmOv5rp8FKuqqMYhB1RWLFVRhy8yEzHxVrzO4ESb7lB?= =?us-ascii?Q?bQxEsDIyEhWXn2N6BP07gdaH7bXpC5giFkvak812JY5CmmOuEluCm5NZduts?= =?us-ascii?Q?UzaMyvIYhZlXP3tY6Sh3XyCu2j3kDbSa0co0sBplVICErWccNjJbxC1fyxvF?= =?us-ascii?Q?AEdO3sEtfX5qaJarDHwfq74zBUyiIlUoomaeGZoj2NVRb/oP5qkBMtFZiY4/?= =?us-ascii?Q?WFlGO0DtMmTBFQCa62syd9Kcqg9ZhsFpag7cFoHYavmMFQ+MxeNk0EcltFz8?= =?us-ascii?Q?Ye/0D9NQmxJF97U+Sugau7QbaMihL3xPK/fHAb4gSmnpOy4DwIqKk5fG20le?= =?us-ascii?Q?Rnr0dsZYPgS1d35Xe3sFUle9SJRPpkjOmELLWu1pvx7zq/GtizYxlQpcWnuj?= =?us-ascii?Q?cHv9vO3vD+J6Cw9U4q5xLscPfc9494qRaygLdL0F/QKGCEy0EwlthW9rVYH8?= =?us-ascii?Q?qb/xXw1J0aSGg61edQZV3YVRDoMI8GVbyeB4KLKaEIsAdXm0dMgnP7rp7EhT?= =?us-ascii?Q?Ah/Ea3n0A3EvhQ9Q8hRXGl72OIU1aFiufmvl5yCNVgGkY0HmgY1KZ8mS0rff?= =?us-ascii?Q?RpMz/GqgUmULaBbcpBAi7IWe3eT4VGZlUoMM1gzoe5hUUV7wsbxKqUS9nBah?= =?us-ascii?Q?BpAA898UWLfL15Zyv2MkQN1lizFNMRS6morOIaDhbRJSumiK2tEJzh5XUyc+?= =?us-ascii?Q?yIDQnOrUq3mc+xfaufN/nBLlY5LS31G6XwA4fNAsdMo4KV+wDDq59Cc2KlCQ?= =?us-ascii?Q?MSWObE7S2WV74QiUqx5EE/B27yuFTkeOS1cO0nlPi6ClGKBbLbjT3Gbsgegb?= =?us-ascii?Q?Mw4vFwt2A9HnnJqmdy/kam57qN2AJZ49pXmP5Q76Jg8F7frWIzuE24k7NUEp?= =?us-ascii?Q?DybXHPiaBy902xSf9EJo8rFqwI23b?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1306; 5:R1rStyvG4hrlgq3G5EYYtK8TIKya5B6EXIY0/Xx4aV1G1IdApjPzZIRHxAyvwwpqYg9LAeo+3JAQE/c0pu4bDv5GkX8zHFUQ0PooXo40M/vg1XeGAa5+TeJeszMfQEF62aoH0MBa1qCzHAdzQxK82w==; 24:tJl79Z6zQuph+Y7VAgpumrZ5v2M2JH3Q2m4AtljtHAKRQQDMSABlnCVXTI2TVdWYEWusHjRtiolYZ7IO8crJdGGVTf7/nyjCKmQfEksm26g=; 20:2r891BECFbyLksK9eXQRj/oOD3J334fe4pHFxFlcAubOQMNsM9AKInXgGOcWNvnxtk5B8zvzp0SE+YkaMiNzUQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2015 20:05:34.8478 (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: CY1PR0301MB1306 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151022_130558_849294_0A7FD99F X-CRM114-Status: GOOD ( 23.00 ) 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 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [157.56.110.136 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [157.56.110.136 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: fabio.estevam@freescale.com, boris.brezillon@free-electrons.com, vinod.koul@intel.com, linux-kernel@vger.kernel.org, b45815@freescale.com, linux-mtd@lists.infradead.org, hofrat@osadl.org, dmaengine@vger.kernel.org, dan.j.williams@intel.com, computersforpeace@gmail.com, dwmw2@infradead.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 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 e24fa06..90065ec 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