Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Alifer Moraes <alifer.m@variscite.com>
To:     linux-kernel@vger.kernel.org
Cc:     eran.m@variscite.com, han.xu@nxp.com,
        linux-mtd@lists.infradead.org, miquel.raynal@bootlin.com,
        pierluigi.p@variscite.com, richard@nod.at, vigneshr@ti.com,
        Alifer Moraes <alifer.m@variscite.com>
Subject: [PATCH] mtd: rawnand: gpmi: add support for legacy-bch-geometry
Date:   Mon,  7 Mar 2022 11:32:02 -0300
Message-Id: <20220307143202.28474-1-alifer.m@variscite.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?j+6e/QB8dds8kk3e6UogiwBgjVrsCCuAqBMwbo9UOkXgNwLieZU7nfUxFNeD?=
 =?us-ascii?Q?aejgb2e+smyxxX99nS85AVxC3TAwrTkybB5hjeSRZDDejEe1u/VpgO0xqh7Z?=
 =?us-ascii?Q?K/6e9D9iFxFkGgMgLVj2lM/wjIkmzbHDGUSU3O4EiVuNX9YeYHJ0i+fdvCyZ?=
 =?us-ascii?Q?tMNpl68TnB8iJD4Zo1Vd0D4Gn4UcH1xKC3h3CtVDci49bKsZQFetio577rHa?=
 =?us-ascii?Q?DQil/ugCGnvVGMCZAYxZ5HNOHToyW2AsbWOmeO21YgvgSr6jIbGCEVJomt7H?=
 =?us-ascii?Q?8OqJQYMoLnE8j6yDdXbz1zm7jlQ910jmoBDLtXfTVwEOvK6+6JB5Yoj9UXgJ?=
 =?us-ascii?Q?wiTcia/vAmJjnQQOI2PcLmAZncqjfuEbtwyQ1OJB7PC28qtBsVluiRGLRiE2?=
 =?us-ascii?Q?5ZLM8Rb1ojGKM2fndpN5cvZGJ+b6JXHVFHOYlPzyuYX3QQDKrWb00hf5fey2?=
 =?us-ascii?Q?XFqBpfenLUUY4/NilI/Uu4tfH4rJsXM1j9JQgMhjnwHQ9vKzhnE1tTz9B2Pb?=
 =?us-ascii?Q?ScxP+8z/8pyThB2rjX2Rfh6ujcdIGOBXrKaiwQD+xtR6siOVPX4nv9xxX4Yt?=
 =?us-ascii?Q?a0Lt8VaPGy72rkctLCci7fJrLgHaZZ1iEPRZUJHc27PYlJ30NFsoOcyRk3pr?=
 =?us-ascii?Q?UH3m/AwyDAxkJo6yKcGrC20GPwlAw/sEYg4ILhc0cteGj2Ahqr/stXe/d3Uy?=
 =?us-ascii?Q?TYpu82WKOr+3gfr6vi63c4UYJ0tfxVjS7D3AOtVBwiuWAIBblBM9oO8IBICT?=
 =?us-ascii?Q?fRIZazI4TwUVejUyRo0thDireYbqxHOovvWSa2Nx1GybVRidQjY2VaLCXGLk?=
 =?us-ascii?Q?WCTzk7CECEyXM0qZc7mJFt8jQGxNwsbp08CG3h6gV9RJIdJ57m0P8zE64QFX?=
 =?us-ascii?Q?OpdqV1epOZ2zBNYwG8NH9KdVl7K81XmOPjV3UTttPh5DnUtmYjCIyXhAfCRm?=
 =?us-ascii?Q?sQo83GWhdbLmFrxNVA7qPov3K8JujLahUfQmYjFTy5YjRS3JvwmIl7FdeRoL?=
 =?us-ascii?Q?cBTyJ35wOwkNMlwTWVHVyby9drGXUmsxmiYQL+DlX3pl7dImf9Nr6DaYhi/0?=
 =?us-ascii?Q?DG0neMdJTdNqSVwK1+dn8A2nfqOMUZ0zL+YkMMCJW6BUQzA7n6G6glske5cG?=
 =?us-ascii?Q?sGzcrm5KG9yBNzkHSneE20z7GJlB4jqVfM4imyihbXXSDVgQwtHoRDAwRLB0?=
 =?us-ascii?Q?FpxJP2TpmW+3hsA7yOmbWC48dp9GeRN7MAiityotXfeWNYBEPYNvtTgoWFKy?=
 =?us-ascii?Q?yejzXchRiQILIaAbSYk6jd2sUe2Aq8MlVGnQ+8qMdEwgqcDmcAWyLi3STLag?=
 =?us-ascii?Q?F0zQB31pUepAh3aOZHrZqFmVzcGkK7ebQBxGpJJ72pGByUa/fpvPnys6OfM+?=
 =?us-ascii?Q?OO+Bsh/cqigOZihbAT/yIE/Tq7eWAsY2JiMPYmYKC+RebLqfTfjU4WlUgpNf?=
 =?us-ascii?Q?49lTn7nlhpkqPi1l1EVFdke4Hqe4pbhZrvKkxcVnjsxzDFShm8REDCoN56gm?=
 =?us-ascii?Q?bD+o5qZ9woJU9kTgrPgdpgNfga0hEzLWDJQOORVRxOlFR3WqNPW6V5nvDSIf?=
 =?us-ascii?Q?UE46kk4tW9WxrJ4NhohUol1WICYlqD04UdCuBVG/RQShxLWEbrWSheay8gAw?=
 =?us-ascii?Q?/FkPJfWVa/CnmNaHeB0CLjk=3D?=
X-OriginatorOrg: variscite.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5296dcdc-8036-42bf-17b7-08da00474a86
X-MS-Exchange-CrossTenant-AuthSource: AM9PR08MB6999.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2022 14:32:22.0576
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 399ae6ac-38f4-4ef0-94a8-440b0ad581de
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: QkyNNIcKljkIqge0tPpDl55iC/7EFORKWBfLQ1L/gES+0SRCe4iQyeu1qOEDRqoSLzqbLsOoR2Rsia5k0B3LLA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR08MB2922
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Pierluigi Passaro <pierluigi.p@variscite.com>

For backward compatibility, allow supporting legacy-bch-geometry as in
original NXP releases.

Signed-off-by: Pierluigi Passaro <pierluigi.p@variscite.com>
Signed-off-by: Alifer Moraes <alifer.m@variscite.com>
---
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 9 +++++++++
 drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
index 1b64c5a5140d..ae375115ef0a 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -517,6 +517,11 @@ static int common_nfc_set_geometry(struct gpmi_nand_data *this)
 	const struct nand_ecc_props *requirements =
 		nanddev_get_ecc_requirements(&chip->base);
 
+	if (this->legacy_bch_geometry) {
+		dev_warn(this->dev, "use legacy bch geometry\n");
+		return legacy_set_geometry(this);
+	}
+
 	if (chip->ecc.strength > 0 && chip->ecc.size > 0)
 		return set_geometry_by_ecc_info(this, chip->ecc.strength,
 						chip->ecc.size);
@@ -2072,6 +2077,10 @@ static int gpmi_nand_attach_chip(struct nand_chip *chip)
 	dev_dbg(this->dev, "Blockmark swapping %sabled\n",
 		this->swap_block_mark ? "en" : "dis");
 
+	if (of_property_read_bool(this->dev->of_node,
+			"fsl,legacy-bch-geometry"))
+		this->legacy_bch_geometry = true;
+
 	ret = gpmi_init_last(this);
 	if (ret)
 		return ret;
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
index 5e1c3ddae5f8..d9926cf3d5e0 100644
--- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h
@@ -151,6 +151,9 @@ struct gpmi_nand_data {
 
 	void			*raw_buffer;
 
+	/* legacy bch geometry flag */
+	bool			legacy_bch_geometry;
+
 	/* DMA channels */
 #define DMA_CHANS		8
 	struct dma_chan		*dma_chans[DMA_CHANS];
-- 
2.25.1