From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755050AbbJ0WSE (ORCPT ); Tue, 27 Oct 2015 18:18:04 -0400 Received: from mail-bl2on0101.outbound.protection.outlook.com ([65.55.169.101]:43630 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753224AbbJ0WQy (ORCPT ); Tue, 27 Oct 2015 18:16:54 -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 v7 6/7] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Tue, 27 Oct 2015 17:05:39 -0500 Message-ID: <1445983540-27155-7-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445983540-27155-1-git-send-email-b45815@freescale.com> References: <1445983540-27155-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD025;1:e2pV9guKmU9W3U3Je5iU5QlQb7w+PGnDVW6NiQISAFhBKE6tIHOFQjJBwJU54Toi8GourZ3H/LiwI7nL8iSsg+M9bkgWQ1V1EVE18jzm16mclLp7DH6J/LeZRtIsDwPz60tZ7in87jWcuytW6dFT3SdlnvqUBEalWPiImIOvk5aVP0jBtN5bgegs2MRu4OV8YTUUI2FsIomeFHkGzu+qV02Oq8rn0Xq+zDPZkDsflQPF36njE7NGHp8ZxDIL6d+Fv0+oIcMA60KJNra9X8iKJczqWqWQWkWiDblyl3HplNzlpS4+gXT4F7EleHswuHbn3MBTgB5MFn1T6khBLOohapyLLMaPOh2snqmTv4zp7lCEmRmhhjhquE4tZEoebQ8xED4a6hSKi5SCAAHlAo1Ahw== X-Forefront-Antispam-Report: CIP:192.88.168.50;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(81156007)(19580405001)(104016004)(97736004)(6806005)(19580395003)(33646002)(575784001)(48376002)(36756003)(77096005)(110136002)(5001960100002)(2351001)(85426001)(229853001)(76176999)(5003940100001)(50466002)(2950100001)(5007970100001)(50986999)(189998001)(105606002)(87936001)(50226001)(106466001)(5008740100001)(47776003)(92566002);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR03MB559;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;DM2PR03MB559;2:/5cSlOgNvKbaolAQUQOse9RnZJGybftCao6B2uQJMtoNagndWBKspxCxBdX8FEe5IsYlN5P/3/qqjFvyl2HbSCm1gN6dOH/cuKvrArzFIZrm6yYFAyPNkKDov8QIJ/v2R/YeCy5xUUd3Q5K9Sg1dC6TBmPJlrYt43PbvmH2bNKE=;3:7ux+XO1EkU+88y41UO1YKpVqFhzXJCa6vMsiHYex2v371xy0HGFG5BPjEZn+NGz9rpMf0fC1rbdfmbLT7QI1piSBv+wEwzOEnUgD3jzxyFX0F5zMfyFCA0dO5Jy50QgS0eAR+PlsYyp0r9+8PNcr1eI6YLUWlXui+lqTYI8yVzcLVLsF0a8GrS04Y9DADj+kHTJ4FuO4OzWpsi8CL8Pfhbs+CA+VfWr/vgK4gxvyH0c=;25:GHETPh9aDVdobL3fVscFPlQ/WMSQF0fh1K6hfcVIociL2U7d24ZYSFiV1TDV18/8gUhJ5XdmSmLOCvmvtwLIcXXN1Zyus3uZdxy8rj9qA2PmQ/V8fm6aFyORzVYrST8L1YJmVcL3zQGLsTf6VYQDJXzXCor0nsyneeOMq4jU9IG+LB1yqGdyn8ao6N69WMX+wdCuhNvZ7Ik2EAWj/bDNcCaVcAp+UjqCJ0+5FQXpDqc5YNBPiwxSnVw9j5B2a9rS X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB559; X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB559;20:iTnDpr80TC59HH9pAIsh927Wwmg9PKjEI9Ih6KDc9zhWeJMPzUo0DL2Olai4J/mLkTwxc/n1UbCts3pk0WA9H95Xw1L3KOYn8d4ewAiMsf/SqNOclnSOrKbnTHU9jvJGQThL8rInl2SPAcPxoZCYQwubNUwBvv1gBl7SgQUwoqVLpoYKoOEldNiPCdQhjNf10O2K32TXcOSTZlEB9CJHn3LnCMS7f4MDFHN/7dvArXjbWShvL0EZFR/v4BgSDJl5WjOEaeCXtnDV92uv0x43ia5YiMOZoikjn6c3nji9oufKyJYsA2FvhnLNCInE4m/XythPbeIQ3/x4dbQYjhhLWj792fhGqTnS522ZdJTCtas=;4:1+H3p9HV+0CtrHsG5apkK+zsAf1wg5sInYKlBxO6tUPwRx8/418sOr3pUd0hsYkL5zkoOVqYy7Z3CYhbnb2aGooxPw4NZumaJd6PfpEPIgHfkZUZhttd4avFO/MTdKelktDfpfT3lbvxcfYV6A/eVfS8g7eIQcI4fB9Nfxq1/KZUF/vYU+O9s6SMjxiCszr7vIl5LXICDlrhDJ2/jtbwy2yjpeKfhGYf0T1rEchSJEGVzUkWkTKKZgNQtq3VmO7D1K4l0ICjQsDtxhSdfI+9Vmgdjf3ETvODX0H0Jlm9+zTI0/o4JeoGnzyrIKYgUKDQhxxlWwBklBk/7yOF6sfkIMF2J20WwgzyQpXs/EKa1tNcvYBF85tnrtO5FmdgeyvJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(102215026);SRVR:DM2PR03MB559;BCL:0;PCL:0;RULEID:;SRVR:DM2PR03MB559; X-Forefront-PRVS: 0742443479 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR03MB559;23:ojitWd+Dg+39TL0/Xg/sniv76oCEqMqfBqapXmRB83?= =?us-ascii?Q?jN8gSuQGVyOwZyMlIaagW0T5K4NeU/4cePOJbWFHI1yzp7UQC4/q05tTRrhm?= =?us-ascii?Q?dcqdBSE4R34Vb5ICHFrTyfvn8s4usTN6pb4pLKlmOA+c//npXLPgSEbYkDua?= =?us-ascii?Q?Dk42KY9by1+dYFkiQdxL25u+viu3aq/U5Zb0kAVu0YELeC0mn/vsgodl8n0R?= =?us-ascii?Q?swSPlD6xzP4MbqsukKDP7syZ1nfcrKzctpFdFze4Y7j7Hzubsce8EWCYJGZc?= =?us-ascii?Q?AzeuKkOQTj0M+kXJ4Eyc5dESd8VTzhVFyag4ErIjKoMC2204O54ghYb9TNZo?= =?us-ascii?Q?RGzsozuwok6+yA03hAEuJyPhZO8Jql3wZHApqjInEXhbL1AOOae9DTh1Ky4/?= =?us-ascii?Q?RORdjd2VJRmN+YKa8/CI3U5ZBdmi+2vEzuD/5HBjpa8I3AvDkwhD8+/EzV1v?= =?us-ascii?Q?yIpwKnp4OPIyffIQus2uUjbuGh/DjQhAXS5C2apHvPaiPDjkU+jYz4tBDBK4?= =?us-ascii?Q?pkazk3QuyOOIBFPNcQ4v9Hd3cBE0Y8WOTogACLbUEPDXy5NiyU5e2wWAxWEw?= =?us-ascii?Q?TEyxRzTCLu2cq3Hx+yLd1WmG7DfGMhFHUoqBO3XpYY/ODNUAfmQVgccE4L/A?= =?us-ascii?Q?XIAVOMmXVciji68Cc7uUdZ1dMTr0ZfeKt8fvXWkBAkrnmdiJchDTcpL5lbIJ?= =?us-ascii?Q?sr0pVIUsctdIXb5q+1cnCFYIrJ+YGDS22UpJt0VQFEs7oDqQpYRy3TuaEcmH?= =?us-ascii?Q?BeOlu7FJOkvLVC5DClEUgjqPWpIoGvX84/BcLezBd2+zwXZRii/Cn6PvW8YG?= =?us-ascii?Q?IuQC+sY49U+I7ZdFv3x5dQYjhgVD8YMQKh0y5xY8KwilMw2tLkctFHHudGD/?= =?us-ascii?Q?hSEpN1d8PVsavkIfyOaV3H9SwxNs82bcIC8UZ2ikyedWeBhmBGMmAbRgA30h?= =?us-ascii?Q?LpInu669vcQuuYVHUjw8RwkJlYEIGZN9RTOGCbceiqPyJ0O5Hwg0vO8/LEo8?= =?us-ascii?Q?Xro/ZBowf79Fhy4DyjfIaE?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR03MB559;5:envPUcWwO6YBYAq45rLHRHxKADpjPpqHU/yn601CV7LRIqmWDZwqYZdkbrjS8IqHczA51Eol7y7026uj2DLJjLlNZulFpGfEiCIj1JaYltH9mjlQ6Lu/WNlLuvPLUN3B2w9hJNFFxIWKuaO9VofyNg==;24:US2lPvEA/J+6TB/cK0QdsI2w7NDfOtZXR5M+IONmetLMZPIdwjlTiUfaPc0wfOlVRjUEruKK9DHzWkk0BWUv1YH87F0D5EIN5FV1xQYgPOE=;20:EkTTM9tDx/B0W2b0UYMBxd9ZD3RkuFj1Rw0yQyz8sDPSnSDfHyaHRfUbXYkeJv22K3Tw4sjRpUG/gXTifEtK/g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2015 22:16:49.8560 (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: DM2PR03MB559 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 8339a44..d34c35014 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