Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 25F21C433F5 for ; Fri, 25 Mar 2022 13:37:08 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7ED4584175; Fri, 25 Mar 2022 14:37:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="c3Wox21k"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3A082839BB; Fri, 25 Mar 2022 14:37:03 +0100 (CET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0F38F8417E for ; Fri, 25 Mar 2022 14:36:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=han.xu@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ccbGmLORUPneCJBOS/w3g4YVvVQQIsWdNE4S/UI+9F5uqSDXdPvc+LgofhtxINPoAh/c0iiIg1esNLf566UPhl16p6wFSHXM8UaHhvNchdssAHzvdFP0W1mMblUoKr4pOtmbdlyOvUWQAedad2RQpUyQ9Ixhvak8WvrjEyktx/eAuJBy6jKVFxxtH6+utnjN48530hyQ2T1VIPA0FyQDSKzBPoXkytbY4wXTBNZiMBeadlTqrkE/gYX5wjIvzwAGQ+0Ov+n7DBvf/166i65zhsR/UmdVuyMZ9a9ARapygwVq2AIMUB/Ft+lYG/zhQxTjD1Zds2S5aa9CyJBmLKBY2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PSmLpKDIxqPX3sOVOm5jIosOC566WPAQ8RiODZXRWAM=; b=J0lBB09ayLCGoChr/lNIg0TuqGwYVYgTaO6qkOQhnNgt/a8ZNd+Wt7sGfIO7kzWwxBxjixq0+URPiZ+W6mH/+SiUk/iCfVDhzwX+G1YSkNmXSv5hVGMUIBizcT6cZYOi8d9Co25mqszM5Zb1DLNnUVQjgK2kna+GhuT16DfCSMu+hCfGqFGk3MfjN7gps6UdGtL3vFSaroyjF162Fz1MgS/VtN36kmpgzmRh/FKUUi+Ej0PFv1CB4EC4tk/aDQm3IMm6gXIdZxDQMf2H1FJebtnTeAtlLBgCUaKjUJ9X9QytwqriueJKgEPZieRjwQvQfSuTOlAV+YSvY2rlcJidog== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PSmLpKDIxqPX3sOVOm5jIosOC566WPAQ8RiODZXRWAM=; b=c3Wox21kz1KuQDvnv97kW4gPHO7IFu3pCe56Ydkpm2hN0gzcx+t9AnrZJCbTMqEs0hC2DKly4rv00QoObgGrZ0aCMh2ffa9W+i2oa8/1P+4NNKjEsY4Zu5ixZ2kmJi6m59yl1/KMyYP9uvHmFTKbHmU7kqcnJQgC8FB05r1uvAE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from DU2PR04MB8774.eurprd04.prod.outlook.com (2603:10a6:10:2e1::21) by AS8PR04MB7910.eurprd04.prod.outlook.com (2603:10a6:20b:288::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5102.19; Fri, 25 Mar 2022 13:36:57 +0000 Received: from DU2PR04MB8774.eurprd04.prod.outlook.com ([fe80::5416:5d1:cc34:ca9b]) by DU2PR04MB8774.eurprd04.prod.outlook.com ([fe80::5416:5d1:cc34:ca9b%7]) with mapi id 15.20.5102.019; Fri, 25 Mar 2022 13:36:57 +0000 From: Han Xu To: sbabic@denx.de, sean@geanix.com, frieder.schrempf@kontron.de, festevam@gmail.com Cc: ye.li@nxp.com, peng.fan@nxp.com, u-boot@lists.denx.de, han.xu@nxp.com, miquel.raynal@bootlin.com, uboot-imx@nxp.com Subject: [PATCH v4] mtd: gpmi: fix the bch setting backward compatible issue Date: Fri, 25 Mar 2022 08:36:38 -0500 Message-Id: <20220325133638.3439-1-han.xu@nxp.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-ClientProxiedBy: SN7PR18CA0026.namprd18.prod.outlook.com (2603:10b6:806:f3::18) To DU2PR04MB8774.eurprd04.prod.outlook.com (2603:10a6:10:2e1::21) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 739fe840-d59c-4fac-a618-08da0e648853 X-MS-TrafficTypeDiagnostic: AS8PR04MB7910:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: djdl8CEj25aZoHDcd4lHzgA9Rd91dprcChn/Fhfkc6b2v0W5dzKPSbcwpZAzLaw6Ikp33YHYqiHflY/gfrGMrhgVdWF9XsKgML1eHeqtuZgWPg7xR+6IZpTun9l2uTOJRVs89N4YtF/wp3wiX8HrAEplhSxUOTP3km9JTB7XTrXKZm60rVrJFB5oHDYSICbj9c5l6/gwVdciPBKUNYltsq7zh8ntkxFcEo4ccBlDHM5/S1QisXTPK2nnTAGz7FdrUB6AyFUoFBNYOA57F/IFVqFEBNF9aZcOBA9EUmPCkLYDfai8UlZPdnAyYb9ujl8jBNi9xMM4FdDdyD2AFVXnwGZoVKC1/hk1u/VmZJGDNNg64SUAMdRLs1iktaJHL8NZRCuryqaUd7QkM1ECl177hlUblfgVHy6USf4FDLNMER0rCGtrQokwgENQgQAX77JIbM45QgB9GK68qVrs/MTTONDAnoAxju9XTZ02pR8wNZ4qZcZBUG7Pw3ch4RKJn082c25m7+P4XYAboJPTETrWBTtxjtAe1Oy1WX/DUvQpp+ElZYEKjsJqheT5riO/ljxL+cMls+U7QcxC1H7zXgoMXZM2zAXiOysJ29TCAPeqR1RKYQ5z0WAkrmfrz2DXn1xG40lbR1HL3eoOizynXvzLKIMar3g6MZNHTnpLswCNAGcJMOq1TohVEyRMmnY0KiHbTLjEl9mXZ60Tx8oyXJc+Mw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU2PR04MB8774.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(66946007)(66556008)(66476007)(8676002)(44832011)(508600001)(2616005)(8936002)(4326008)(83380400001)(52116002)(5660300002)(6486002)(36756003)(6666004)(2906002)(1076003)(6506007)(86362001)(316002)(38350700002)(38100700002)(6512007)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?nxrCa4nmMoAUsjxwYElVaI0unba0H2icYa+bvcjfXYhpPl2+6vQq44/9J5RM?= =?us-ascii?Q?qKDx30xBX7BJgj/bMcP66M37j0OtjXe5TrnxOrp4SE+4D1W7eCsyxkhxfDxP?= =?us-ascii?Q?JERJs/aAyGpWrsf61I/hkpbrfSQYxQvU2jgBETybbBoavKt5rfOrVThgK55H?= =?us-ascii?Q?UnyjgNSk0/GqbQPuWyl2ZA4ge1QpqV3mJhFFMRCKfXwkzxaOsvCEFcMf1uBY?= =?us-ascii?Q?YOBlvXhUOOeaV9iCAmJwlr35oDBcuS7/tY/SK83TmB//syJidaqQHE+7ZX0W?= =?us-ascii?Q?LVWI/pb6tRVUmsTjQiYofQ/XuLJcKbDsjuCEMscaNxpsHuF4YOedkKknUniW?= =?us-ascii?Q?D9BxjaTgaXURJI1EHD6+TBjfE/OofcXSegs0TMsVYIt7Y10ZHhf81/OPn3ko?= =?us-ascii?Q?myd4o2rudIwS2WM6dwz0BlS/PWz+hf72ofvuTrOgxADCEmDprJlUvy3EARnp?= =?us-ascii?Q?IYrsFuP+Djs1Ghj1m6HWGeE8dT1c6uLLMNi+C0utKpyivuy8vHSnzuaVsxlU?= =?us-ascii?Q?5IVoq+1r3QeZiHWZtY5DEsNVze5XdClwahiAbX7Iu8Nq8slo7W4siNgLenJi?= =?us-ascii?Q?J/arGKtHMhr6Qdd2B8IJJSFS0j6vCZw1WyLR2RESzDnj+A5F+b/b5DNeog4N?= =?us-ascii?Q?Gt4F/uuWm2Fr/k7h8XVX0/szaIuBjLBCeYgNlsAb8XGx074ED5/eCdW7NskB?= =?us-ascii?Q?0IUkPZhz6zsNgfr+RxEgTEelttEj8MPfFw/eXhia9ROlIoqgWk7fk9lVXCr0?= =?us-ascii?Q?fEKRP8gJGlghlVUKlVAUeYbp77ia6ENPCCAZEvwzcN3u1ONyrHt91NisYo5V?= =?us-ascii?Q?phklXmE9K27Z1r/WQTcmbXMsSEM/o57vhByF2QwJ1PfSyzD1296rIYnNQ3m+?= =?us-ascii?Q?zorNmn0cGUstmJrNrhuCb4s5UyES0lvUBRJtPRpPL5y0J3FPtAxYu+EwnK8U?= =?us-ascii?Q?RbJdqin9HT9T47W1PMnj2aMeIx5zmKvoVFUn3FhDX7AlP3uurQ1SqmJQatN4?= =?us-ascii?Q?KPs6ZJQswUs7xEBmhKRS67RuLIG8KSSQmeSErDcK2EgqBNsXtkTwU8WU3UYU?= =?us-ascii?Q?NtBwFRo+I/vmfMdZLyyXSoFkW0MWYkifOclZY/dmWGV/ZUb1o+dUPPlxeTSP?= =?us-ascii?Q?p5X7NP9csgpmVU3HK3g69oTaFYLzf9bvJMGMB+C03sKqmbN4riLrogdtnZWv?= =?us-ascii?Q?qwchWcOkE0Y8Szek7zZSgKCyS/cMT1MQBfKLzK+6AqgmOvGam0gBMXS6BCy6?= =?us-ascii?Q?DbpRiu6KsaNMkYdkTXNWv8S/q9dMUsw6wUotmrOsKn3BZOjpOZB4qp1uA2aC?= =?us-ascii?Q?zW1vbl3KTjv7sj2G618LieT7ZaOTU9zRAzba5b91WhBUmsTQJZNLsSv4itHL?= =?us-ascii?Q?OuZS8HurpjzqsRHEIzEYrnTdSk2i8tZ75D8L+FbHEEqAUdXAs0sSljFUsxnU?= =?us-ascii?Q?PaQN4JrL/ruYVHA5mZtJaEN45j2JiHumQ6w1jH0Y14X1DjDeSLOhmLExAWp5?= =?us-ascii?Q?q26wqf0dvluzj2QkwWp2eTQKPoCZermlaxh6sUKME4Js3wOWihavRPpbNAg6?= =?us-ascii?Q?J6X/JhiQ57l2O2qpSZuTo69vbcsODV55kImcUnzkL7kGelVnvsSG+7CJ6Btl?= =?us-ascii?Q?glmMJm/HFLhA6QiXSK1aSmM1z4JVBMPu2SjDJrDDjmmBpgAQImrDcyAjEiZu?= =?us-ascii?Q?MmMheHZt4eKPT2Lk4i3SbnA7xs+24QIxZLyuMx/8IqkJXmx2o3aL/vqOM6gV?= =?us-ascii?Q?ivt07FzvuA=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 739fe840-d59c-4fac-a618-08da0e648853 X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8774.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Mar 2022 13:36:57.4610 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sO6SDEYO/h7ZU1yTutJ3HlmD/TMKmJ4mpPK4qUDNoEwOfYuY/dGVXic/1qE/Ln2e X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7910 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Previous u-boot code changed the default bch setting behavior and caused backward compatible issue. This fix choose the legacy bch geometry back again as the default option. If the minimum ecc strength that NAND chips required need to be chosen, it can be enabled by either adding DT flag "fsl,use-minimum-ecc" or CONFIG_NAND_MXS_USE_MINIMUM_ECC in configs. The unused flag "fsl,legacy-bch-geometry" get removed. Fixes: 51cdf83eea (mtd: gpmi: provide the option to use legacy bch geometry) Fixes: 616f03daba (mtd: gpmi: change the BCH layout setting for large oob NAND) Tested-by: Tim Harvey Tested-by: Sean Nyekjaer Signed-off-by: Han Xu --- Changes in v2: - change the commit log about backward compatible issue is in u-boot - removed the unused flag - add fixes and test tag Changes in v3: - fix the fixes syntax - fix the change log syntax - add more test tag Changes in v4: - change the fix tag to single line --- drivers/mtd/nand/raw/mxs_nand.c | 71 ++++++++++++++++++++++++++---- drivers/mtd/nand/raw/mxs_nand_dt.c | 2 - include/mxs_nand.h | 2 - 3 files changed, 62 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/nand/raw/mxs_nand.c b/drivers/mtd/nand/raw/mxs_nand.c index 748056a43e..ee5d7fde9c 100644 --- a/drivers/mtd/nand/raw/mxs_nand.c +++ b/drivers/mtd/nand/raw/mxs_nand.c @@ -195,6 +195,7 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, struct nand_chip *chip = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(chip); unsigned int block_mark_bit_offset; + int corr, ds_corr; /* The default for the length of Galois Field. */ geo->gf_len = 13; @@ -225,6 +226,17 @@ static inline int mxs_nand_legacy_calc_ecc_layout(struct bch_geometry *geo, geo->ecc_strength = min(round_down(geo->ecc_strength, 2), nand_info->max_ecc_strength_supported); + /* check ecc strength, same as nand_ecc_is_strong_enough() did*/ + if (chip->ecc_step_ds) { + corr = mtd->writesize * geo->ecc_strength / + geo->ecc_chunkn_size; + ds_corr = mtd->writesize * chip->ecc_strength_ds / + chip->ecc_step_ds; + if (corr < ds_corr || + geo->ecc_strength < chip->ecc_strength_ds) + return -EINVAL; + } + block_mark_bit_offset = mtd->writesize * 8 - (geo->ecc_strength * geo->gf_len * (geo->ecc_chunk_count - 1) + MXS_NAND_METADATA_SIZE * 8); @@ -1111,6 +1123,7 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) struct nand_chip *chip = mtd_to_nand(mtd); struct nand_chip *nand = mtd_to_nand(mtd); struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + int err; if (chip->ecc_strength_ds > nand_info->max_ecc_strength_supported) { printf("unsupported NAND chip, minimum ecc required %d\n" @@ -1118,19 +1131,57 @@ static int mxs_nand_set_geometry(struct mtd_info *mtd, struct bch_geometry *geo) return -EINVAL; } - if ((!(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0) && - mtd->oobsize < 1024) || nand_info->legacy_bch_geometry) { - dev_warn(mtd->dev, "use legacy bch geometry\n"); - return mxs_nand_legacy_calc_ecc_layout(geo, mtd); + /* use the legacy bch setting by default */ + if ((!nand_info->use_minimum_ecc && mtd->oobsize < 1024) || + !(chip->ecc_strength_ds > 0 && chip->ecc_step_ds > 0)) { + dev_dbg(mtd->dev, "use legacy bch geometry\n"); + err = mxs_nand_legacy_calc_ecc_layout(geo, mtd); + if (!err) + return 0; } - if (mtd->oobsize > 1024 || chip->ecc_step_ds < mtd->oobsize) - return mxs_nand_calc_ecc_for_large_oob(geo, mtd); + /* for large oob nand */ + if (mtd->oobsize > 1024) { + dev_dbg(mtd->dev, "use large oob bch geometry\n"); + err = mxs_nand_calc_ecc_for_large_oob(geo, mtd); + if (!err) + return 0; + } - return mxs_nand_calc_ecc_layout_by_info(geo, mtd, - chip->ecc_strength_ds, chip->ecc_step_ds); + /* otherwise use the minimum ecc nand chips required */ + dev_dbg(mtd->dev, "use minimum ecc bch geometry\n"); + err = mxs_nand_calc_ecc_layout_by_info(geo, mtd, chip->ecc_strength_ds, + chip->ecc_step_ds); - return 0; + if (err) + dev_err(mtd->dev, "none of the bch geometry setting works\n"); + + return err; +} + +void mxs_nand_dump_geo(struct mtd_info *mtd) +{ + struct nand_chip *nand = mtd_to_nand(mtd); + struct mxs_nand_info *nand_info = nand_get_controller_data(nand); + struct bch_geometry *geo = &nand_info->bch_geometry; + + dev_dbg(mtd->dev, "BCH Geometry :\n" + "GF Length\t\t: %u\n" + "ECC Strength\t\t: %u\n" + "ECC for Meta\t\t: %u\n" + "ECC Chunk0 Size\t\t: %u\n" + "ECC Chunkn Size\t\t: %u\n" + "ECC Chunk Count\t\t: %u\n" + "Block Mark Byte Offset\t: %u\n" + "Block Mark Bit Offset\t: %u\n", + geo->gf_len, + geo->ecc_strength, + geo->ecc_for_meta, + geo->ecc_chunk0_size, + geo->ecc_chunkn_size, + geo->ecc_chunk_count, + geo->block_mark_byte_offset, + geo->block_mark_bit_offset); } /* @@ -1159,6 +1210,8 @@ int mxs_nand_setup_ecc(struct mtd_info *mtd) if (ret) return ret; + mxs_nand_dump_geo(mtd); + /* Configure BCH and set NFC geometry */ mxs_reset_block(&bch_regs->hw_bch_ctrl_reg); diff --git a/drivers/mtd/nand/raw/mxs_nand_dt.c b/drivers/mtd/nand/raw/mxs_nand_dt.c index 878796d555..b9833a646f 100644 --- a/drivers/mtd/nand/raw/mxs_nand_dt.c +++ b/drivers/mtd/nand/raw/mxs_nand_dt.c @@ -92,8 +92,6 @@ static int mxs_nand_dt_probe(struct udevice *dev) info->use_minimum_ecc = dev_read_bool(dev, "fsl,use-minimum-ecc"); - info->legacy_bch_geometry = dev_read_bool(dev, "fsl,legacy-bch-geometry"); - if (IS_ENABLED(CONFIG_CLK) && IS_ENABLED(CONFIG_IMX8)) { /* Assigned clock already set clock */ struct clk gpmi_clk; diff --git a/include/mxs_nand.h b/include/mxs_nand.h index 66c909318d..741dc8734e 100644 --- a/include/mxs_nand.h +++ b/include/mxs_nand.h @@ -44,8 +44,6 @@ struct mxs_nand_info { struct udevice *dev; unsigned int max_ecc_strength_supported; bool use_minimum_ecc; - /* legacy bch geometry flag */ - bool legacy_bch_geometry; int cur_chip; uint32_t cmd_queue_len; -- 2.17.1