From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754322AbbIIWrO (ORCPT ); Wed, 9 Sep 2015 18:47:14 -0400 Received: from mail-bl2on0145.outbound.protection.outlook.com ([65.55.169.145]:36032 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753928AbbIIWqu (ORCPT ); Wed, 9 Sep 2015 18:46:50 -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 v4 5/6] mtd: nand: gpmi: correct bitflip for erased NAND page Date: Wed, 9 Sep 2015 17:37:23 -0500 Message-ID: <1441838244-2106-6-git-send-email-b45815@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441838244-2106-1-git-send-email-b45815@freescale.com> References: <1441838244-2106-1-git-send-email-b45815@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1;BY2FFO11FD056;1:9tXEiRwUoJO68vyU1BK0Nxuv3ry4WIZRaIpr0FSyecDQrTv0sduIBl3j9yxJdQ3Qn6aKbE6GYehn1k/1J1QXmaFe57e3g2J9azcF7Y9h3E5ZNBoM3AWZ8xdNzAEYdK55piSIQ+rHlvoDj9y7lVCd6v+Jhsli5p4qB8F2Ra7JmmU8s0gqCLAj2kxtlB8LdhLfhIgybl0LHbvToFB71THKu64YdKgS8u/K9tG9OMrndxmI8vmZ8Offdc/t+0sOP1dqRP49HkjxDlFJa/rw79J9keFAizh02Cd8dpJG0EVSrnX7Bu8gmFo/pKrjEVqdwBmS7+Gk72/HAP4TXHpqQfG3u15o0HTp15Kjdzy7VuPMjFdjXvPwUHZfPfo3KWJRAQQ9dmafCXoBwuQ5U0h9FzHnnw== 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)(2351001)(47776003)(92566002)(77156002)(62966003)(105606002)(5001860100001)(19580395003)(19580405001)(68736005)(64706001)(229853001)(5001830100001)(6806004)(106466001)(50226001)(77096005)(5007970100001)(5001960100002)(575784001)(4001540100001)(85426001)(97736004)(50466002)(110136002)(81156007)(104016003)(11100500001)(76176999)(50986999)(189998001)(46102003)(48376002)(5003940100001)(2950100001)(33646002)(87936001)(36756003);DIR:OUT;SFP:1102;SCL:1;SRVR:DM2PR0301MB1312;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;DM2PR0301MB1312;2:Jh522FrRQ0I9CfS77poQxkqfciEu3qZiqfXOBPmPzANrBLA9PI8DOSQTmS2YVoITngGoFRnu+ueGR596Tbf7dk1fh+zrjdDIGJ7xGW6iCNceqes8nrSYr8J61u+f5rEYZUNg/wc8uf9OS2ykpMblAI3HWuCvNIIM6VJXS+usQEI=;3:NyNlChld7owarEA9q54nOsPnLEcEGcxXLAJm+Z2SbBv2u5BNlVMxWrqCv+yzhudYfkaMQ5FCKb5bM8pnmApT+XgQOLKBN7vNbafELpHL2ks9P5+MM9ePufUKwSuEA0AGtFD3zwykCT11OXIReq/KyC0/CGOx1X64CG2ODpDq2aUjRf46wns7YjSil2jnfhEFJYHQB+X+NmZX7rG+YRMzfOJO/IoS6QSo9ZjSEZ2+ToI=;25:XD2mQykl0lbTIAuVyLu9RHK9GWgdH1rzH6oGRgWav7WzSr22z1sF/48jr6kfFjYOtzeqaRlaG/5XNi3W0gudT6dVMxUfsfObFfAOR/E2j8hn0oClOt6k254XI94E6SdTAsdRxjiGd7H8JhhM4spM8sMCpE24Dea2mOyWnaQg0y6iCXglVJcRouzOfz+IKBpsbtgvIYfGbzVk16p3GtyD7meoJYkPrFn5Kcv/slAbmy2CGC4PszxdGpMQ9PBFvjVP X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1312; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1312;20:ERb6gm32brOTEc4FC5/kwatB2TZDrfSe23TNNHoJKEV70IdfFH9zg85p5RTZlnGir1UpFLUUXSTaM3qrO/9UZpuO9j9uRWRYVNPeA51M7XMTH4A7CvY4vVLlNx5KZU0Mx4gbtneX9/DrKmi2WT2q2evSsHix2Fy+yib3wDZR9A7COkqMGLGxhPflJoeev20L00HMbUaFl1QQo3OYVnSmYemoGWR3k45YcFNAC1IxyIdaXOpDuh5guGeSZzYS8IHTXxTPYL4HFkb0qz75Gbt55k65Em+2p6fMtpi5yFUKLZaTJxtqo7h8Sd85KgcBmSrdNo2DN3//USgbXMi/rPtDuTucM6baNtUpSTJVCC9mXCQ=;4:elXInQ2RstAZwhDHMFn2/BlerIzrYCijKO7dkTCfJgPPymGXoBN6WwuN8penoj5z1XMH70r69IDy6KpiXvh02p1hwqUay0mI96nRiyNr/+HNechVlpPke6wkwsRHa6lzILWfyjN959dha4u+p18nBzwwYdMU4egiVNC5VEhBn9W5UZ7rEEfJAsUrObXBpg3Yw9mbmjDK2sfwE7pG6BLOOSOwplSh6eU+sdVMFI9ZX69SMu2VDPgNb+EJKzdKBddxpy5q+3AIrVlAh0CVLOzi4ZvUNzzo5lCXRM9Qxqt7XqjwHjMnu4IwBYB1+AX+Pii4 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5005006)(8121501046)(3002001);SRVR:DM2PR0301MB1312;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1312; X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB1312;23:pqZDbibzs9TMEPCcJCDeaEr6SX1nfZMGKBl96OQ?= =?us-ascii?Q?C7UVOdG/eIdOOVr3II8Ku0whGw8qyDTRQcqfyZFtlktsPV9BCqByCBjKSoZu?= =?us-ascii?Q?T3kk0NqCPoAvkLhvqF+GZVyx/s0M8rRClSwQZehMIi8JGH6Zej+kctd2ISFN?= =?us-ascii?Q?Y2oK4S2VARFdo9bXfG0d1jvJKmjAZEBed7P5cSmyGBiBPJVf6z+w812ld/kM?= =?us-ascii?Q?CVXsi9WS10XG52ZvFObL+djoEyDnz9nwwGgIabXjC31vy3ROWXtc4/SNOVCI?= =?us-ascii?Q?R19J3EPsSLKooSk7BdH3kh2jWLYkj7K0cdQ1lz+t/0eU7ZTULkfnZVFpfHip?= =?us-ascii?Q?so1ZZOtcH+X80IweqC+UnwPTKshuMI3ULZ9H6KeKJlQ05h5gdLRfR2Mkpl8O?= =?us-ascii?Q?AnJjpWazc83wCbAyRp+AwAsheTNunRPdQwu41Vaya0CsQAvtg1S26yPgEgLp?= =?us-ascii?Q?ZGSPk3939p0kMa6ZKukyORVvNU0qLIh2KlZaRG1lKwCe0amK8579mN/41f1Y?= =?us-ascii?Q?6+1BWJghrh6mTVrD67dIuu/hY3mdKpYjdz7qYCGzftBpv8zcLwJ6HqUJeb/3?= =?us-ascii?Q?FiTGzkYRCqYLH+MOl8gVFaECCtp/N3NEkbDEZ9hpJb23DQ66qRirQTD+GW49?= =?us-ascii?Q?G3uHkw2nDQilRKymFJDKEu7dCtRWX+4283x1WWn90NLwMU1RCfZ4Gt48ovcM?= =?us-ascii?Q?plpK7nTkg7dcelGcwW2ijz1MPfPRV8hu6+7O0DxpV0qxUc4b3E38w3Au1UDa?= =?us-ascii?Q?YVoECc6jmvRwT8rKww4EIKpD9wfrX0CafMa9zZLxTGVNskbdFHHLLxwcLtUA?= =?us-ascii?Q?oeizcLMOZ7aO7jMp5egGEC9cvJ16RT6UfjWnaDcu5736rle9kUH/0Ej9XWx2?= =?us-ascii?Q?vpjO9P2+npYQXjwO4KsS0BJome6d00cNG1CMVYdL7Ei37QjgD3m+T1q8fh32?= =?us-ascii?Q?ucM+PBE+MlBwufXNwnCV1EWz5tLcHvUwAbfcRFINDJzHYe4XcfXZ84lnIcvR?= =?us-ascii?Q?qoFA0uMyW0HPgSEK/3TocZb1nxW0vkZkFWqNGxtwAk6mnQioHgH8TKAemKN6?= =?us-ascii?Q?Jamxt8S1ITzN4rgn4SY0A2aItx8/VJKFzXRFFmbKgf7qMGYXiyugYcIuCjYF?= =?us-ascii?Q?84Vcd00B5aKTP7Nsyjf5xvtw6VDQ6vzzIGn2SNq19VUUz/CExPh3RwmNbjRI?= =?us-ascii?Q?5Z01FkwRf8UpI0fCn4Bod9GwN5rrnEKhtL6Be?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB1312;5:8xEFmLwuVLARx8i54fYel42Gu5uwJG0y0BGpjOOyzPvP4jVh2kpy82lcvIYXuu3DhGJAZbRxKYJvQd67CXnVBtZzYXCiQgc908syK9QI5ikZ841cve6992m2x2XPPyxMUMX9FPXJCNhcTfc2UpQscw==;24:pj/9YE1kG5Mzqyd6RyaNolNNDWSvCbOY0rv2QfWw89r+r5QPwLHXdue8cnNDex2G6gwiC7z9iuvPoC+gKoz3Ib2NH2ppuFzAfkr1VnO/7wc=;20:0UUTpaou4SZipARPXApvd7/gvj/TBDxtkZab8WdNmYwlS96JGEs+WONJvrtrrqQmNvGAG6t4DJ0EYmAhPCux4g== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Sep 2015 22:46:46.7805 (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: DM2PR0301MB1312 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 d161569..e038258 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