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:   mikhail.kshevetskiy@iopsys.eu
To:     linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org
Cc:     Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>,
        Vignesh Raghavendra <vigneshr@ti.com>,
        Richard Weinberger <richard@nod.at>,
        Miquel Raynal <miquel.raynal@bootlin.com>,
        Frieder Schrempf <frieder.schrempf@kontron.de>
Subject: [PATCH 2/2] mtd: spinand: winbond: add Winbond W25N02KV flash support
Date:   Fri,  7 Oct 2022 13:48:20 +0300
Message-Id: <20221007104820.198938-2-mikhail.kshevetskiy@iopsys.eu>
In-Reply-To: <20221007104820.198938-1-mikhail.kshevetskiy@iopsys.eu>
References: <20221007104820.198938-1-mikhail.kshevetskiy@iopsys.eu>
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?QK+srXjLDoBlqA6CZiSWWwfVnY70UhN7Ig15SyzkW4HXBkk7fbTHibLttDiJ?=
 =?us-ascii?Q?i377IqooWateEEHeVdaT8xFLBkce/5d8Y+J7tiMQZq19gJsucEydZFkgL0+k?=
 =?us-ascii?Q?FytelkzLmScvD8jDrzvQN6cxJGCUfUzWxVsFQBH7H+ke1sNx2Z91VGL1aGRB?=
 =?us-ascii?Q?RClfrk4mj/uKsDj85dSTaBQ7Qx1DOEs4+aqLn1tV6NFwMjg39qPck/61jNMX?=
 =?us-ascii?Q?Eg2y3TNKPXp7l7NrTZhre4WFGon2eJ5Ces9tmW20PVRvnKpPnVPBP/Ktn3MA?=
 =?us-ascii?Q?HK+9qEqS/hIDhIS353XluR4PWd5L2YjwZ8DTRc6Qp60K+4PgN7W4fFmpZIYo?=
 =?us-ascii?Q?t7ifSucgOZshquDvOfFN4bH0Jukzz724/GjmcEgg0FBKvu9hJe4ZxNMm/Njk?=
 =?us-ascii?Q?ZBOTqKE8J2o6TM0GZefwuqQ1Kex9zqPzIonHTSiy7sTk1PKV368xzbLW/CvS?=
 =?us-ascii?Q?aq/usMHCycoKqFQe4CptBbzHn7T0WW6Fyh5i3hDPTbTdC8hdrPGg8KI+CIUl?=
 =?us-ascii?Q?y6BOyoaMbKQqfJLC5eEbZwtwXya56Xyjjh1A5CM6yXUy8OPE7kHus5B5ulH8?=
 =?us-ascii?Q?srPfFDoPAlQrnOQUG6C/t2oMNbCmOU/DG9F04uTBm+eq7uGS89tkt37z5El1?=
 =?us-ascii?Q?hBpKF5PBJuuOf89112O5ORCGedOF44vgVn62HsUbCGL7Nxm/K/K3/4JFG+a3?=
 =?us-ascii?Q?JqptMb1fkIsLOapZ+ARcaUI1QJjXljBwaOtu5S7QmRoWYM1CBEk08uiPs54W?=
 =?us-ascii?Q?p138gILC1Juvw4Y0wLqtpWlNw6Bc+f6Yorpon3UkgCH8LA0P+y02ZMFun0If?=
 =?us-ascii?Q?zoONx3UHDgwzf1pxx7ch9dUnpG/zj0jf22nre/zX0+Om+0WaEE83AKbyQcHv?=
 =?us-ascii?Q?FsQznHyYtanrkju7jbf+EtP9fz/K4B26qlqdqiUyRRjAreOJLPTYGevDyanY?=
 =?us-ascii?Q?UF0dgtmJT+VT0qCKOrOAyHFJ01iukjx9MHG9AAyvMJa+KqeeYeNou27KELSG?=
 =?us-ascii?Q?wJL/GEIp/P9FOprmL+NgX2FpTIlmllpT+PR3obN/zoAdgAjQovzmtuieL/UA?=
 =?us-ascii?Q?XiZkto3MU5+0KQRSTzzjN8L9mfMKfk/J6eIH/dadWS13X4Bvre0kvbhs7QlU?=
 =?us-ascii?Q?PypDvOHlBCf9Y4OJ82ImOPPX7LIwHwVvbb9pDnfyNFjqT/nu0LRPe2P6rtMf?=
 =?us-ascii?Q?Re9JA4ETkdET0Sd3PdGd/icM/wJ4GYQWgoTxzCTyWkncSEFmlvIrd+ORWTVp?=
 =?us-ascii?Q?VjJxAVgWnK/kDiYylsbaLJyMRFhonyJDs73Yf2v2r+HcggBz/sPe5M4tuVQW?=
 =?us-ascii?Q?AUCjTBuJPWfiXd7UjvGxVrpq+XV84zgu6T/ZLw5qMoSwzl75KsO/zbpg7/47?=
 =?us-ascii?Q?ZirMRriMitjghB3tjV1roOlTEeI6ZCtHSWAGoMXMBn5NzqmX0RB3lcYu0ah2?=
 =?us-ascii?Q?fUo6gGfW1/gYFaT5dRNL1eWoHXmSpX0J75pK6nPoHvbcHGdzzd6XcwB5hg5n?=
 =?us-ascii?Q?kQCUlCdlyCMmlO48AKzWFiMKetUSfbrVzqlUCeCgZtsWe3s4ATJKCaI87yBw?=
 =?us-ascii?Q?GcRsRWlnFayT1xFvGqCrSFOPbH766RTwfObfSuEawSn4JBEyxkR+o3ldJf3U?=
 =?us-ascii?Q?ZA=3D=3D?=
X-OriginatorOrg: iopsys.eu
X-MS-Exchange-CrossTenant-Network-Message-Id: e261c601-813c-4559-e47c-08daa851789c
X-MS-Exchange-CrossTenant-AuthSource: PAXPR08MB6494.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 10:48:29.7288
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 7ff78d65-2de4-40f5-8675-0569e5c7a65d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ENvCUa0RkpqimXQmHYiKMc6xn9obsCaChMCVoqG5pc/h9y7XjWRq34OEI72x4pInOFpeHy4M3XgJXAmv5Z+wneNad3sD37cisGCqPcbeBuw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB8457
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 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: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>

Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
---
 drivers/mtd/nand/spi/winbond.c | 75 ++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c
index ed368a55d68f..3ad58cd284d8 100644
--- a/drivers/mtd/nand/spi/winbond.c
+++ b/drivers/mtd/nand/spi/winbond.c
@@ -74,6 +74,72 @@ static int w25m02gv_select_target(struct spinand_device *spinand,
 	return spi_mem_exec_op(spinand->spimem, &op);
 }
 
+static int w25n02kv_ooblayout_ecc(struct mtd_info *mtd, int section,
+				  struct mtd_oob_region *region)
+{
+	if (section > 3)
+		return -ERANGE;
+
+	region->offset = 64 + (16 * section);
+	region->length = 13;
+
+	return 0;
+}
+
+static int w25n02kv_ooblayout_free(struct mtd_info *mtd, int section,
+				   struct mtd_oob_region *region)
+{
+	if (section > 3)
+		return -ERANGE;
+
+	region->offset = (16 * section) + 2;
+	region->length = 14;
+
+	return 0;
+}
+
+static const struct mtd_ooblayout_ops w25n02kv_ooblayout = {
+	.ecc = w25n02kv_ooblayout_ecc,
+	.free = w25n02kv_ooblayout_free,
+};
+
+static int w25n02kv_ecc_get_status(struct spinand_device *spinand,
+				   u8 status)
+{
+	struct nand_device *nand = spinand_to_nand(spinand);
+	u8 mbf = 0;
+	struct spi_mem_op op = SPINAND_GET_FEATURE_OP(0x30, &mbf);
+
+	switch (status & STATUS_ECC_MASK) {
+	case STATUS_ECC_NO_BITFLIPS:
+		return 0;
+
+	case STATUS_ECC_UNCOR_ERROR:
+		return -EBADMSG;
+
+	case STATUS_ECC_HAS_BITFLIPS:
+		/*
+		 * Let's try to retrieve the real maximum number of bitflips
+		 * in order to avoid forcing the wear-leveling layer to move
+		 * data around if it's not necessary.
+		 */
+		if (spi_mem_exec_op(spinand->spimem, &op))
+			return nanddev_get_ecc_conf(nand)->strength;
+
+		mbf >>= 4;
+
+		if (WARN_ON(mbf > nanddev_get_ecc_conf(nand)->strength || !mbf))
+			return nanddev_get_ecc_conf(nand)->strength;
+
+		return mbf;
+
+	default:
+		break;
+	}
+
+	return -EINVAL;
+}
+
 static const struct spinand_info winbond_spinand_table[] = {
 	SPINAND_INFO("W25M02GV",
 		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xab, 0x21),
@@ -94,6 +160,15 @@ static const struct spinand_info winbond_spinand_table[] = {
 					      &update_cache_variants),
 		     0,
 		     SPINAND_ECCINFO(&w25m02gv_ooblayout, NULL)),
+	SPINAND_INFO("W25N02KV",
+		     SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xaa, 0x22),
+		     NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
+		     NAND_ECCREQ(8, 512),
+		     SPINAND_INFO_OP_VARIANTS(&read_cache_variants,
+					      &write_cache_variants,
+					      &update_cache_variants),
+		     0,
+		     SPINAND_ECCINFO(&w25n02kv_ooblayout, w25n02kv_ecc_get_status)),
 };
 
 static int winbond_spinand_init(struct spinand_device *spinand)
-- 
2.35.1