From nobody Mon May 25 01:15:58 2026 Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EACB313A3F7 for ; Wed, 20 May 2026 00:37:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779237465; cv=none; b=Bi2+0glY3k66HtjImIFl4mi+YbOWy93I4/XeGt9PyJlt/JYxcOMdC0mLJP7yNGcCogiiabJtdL6wK4KgpbM33iUhJFnj3oUWOC9FruwRYciKzXBNysrypOAtUAFTPKPf19B3uKto3cuzUcmnrJfw01FnpSLo/s3uAkcNIlwessE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779237465; c=relaxed/simple; bh=Us22Tk+PYfCHR6cafzfNBUxEFsbihS4AUBgsYdEPzu8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Vq3LjTQTqkQ8ieMCPdsVpyMpfW/XDOL+W0VvdVSjENM/BGqNP50yuzm4Z+TaAUrI4HUi6ewOgmRN3oEmlOa2ZVZ8GCUEXybqr5pbUa72R8Ru2q8YmHQ/Bt48PDs0WkOaU1Zn3szKzJr3tJMt4nB6+5W4phq47o9g453CPrvxv3g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VdvnpBZ7; arc=none smtp.client-ip=209.85.222.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VdvnpBZ7" Received: by mail-qk1-f181.google.com with SMTP id af79cd13be357-90eb7a63a30so287616985a.2 for ; Tue, 19 May 2026 17:37:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779237463; x=1779842263; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jUD1FsQYm8ZBac7nvsbH5rr2iVlaq2U5jptkB2/TJtA=; b=VdvnpBZ7KD8UD08LOuPBI+DhS8ZIK/a25DBPoJehwmMvz6W8upIUMTUELW7CniSrZU uoruHgp8YvPLCKl18PzEWE72oNxvvL6WKYZpEEQGtjgQMtol3ZMBdBa7C/usj33yEDn+ KnYck0e1HSmRsz16Og129de6u3gFbgV11/x4RSjfqefI/v46IyMI950sGC46+r3cQPyT hvkADTJULuHYVD3Esjh3tRDrSIFMhZKZuPKXhKqxAaoYi1v/ZejhqDLIh06RYhvUjokM bgZpExLIq49q64z5rwmnx+SKYHS3BdkCfS9oamTeV83ag1w3QnV7PXpPTq44NuRBuSs9 tgrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779237463; x=1779842263; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jUD1FsQYm8ZBac7nvsbH5rr2iVlaq2U5jptkB2/TJtA=; b=E39wfmALcfCMsnIaqoeEjfKcxnlQCoA6MZhGzinZvZGRwIeRc9e7IVheHYTme1EGkp vhQms03hUXb5XeYJ42HVspH6fRKww3hUBT6o2D01oCcixHLCeS3UtpoknDuLDJFD5nRL 7q4nb16Tr74DwMUNA6XSoUgRmjKPRZE22HrYi3NQcdG1XRNyhinEMdXspMbotZENmxuU Jr4ZIQWHOBFWm23QyaZaI7XKQVYAj9mImcru+T8+n/38HET2ME12yltgjTmvo7dzGCzM TZ7yMt6SMfe889cdDR1RaSNcydyV7JWXABPrU/cBeMd/SrmcKBT/0W9JiPs9+Kw/IM2J og1Q== X-Forwarded-Encrypted: i=1; AFNElJ8h0WzLiemBxtE6XoYs6kg1qS3tCCIihhoTnY/+nzLsAO2DqdMKSQoouMtT9VMBCFjpDqYcrgeYcJRo+yo=@vger.kernel.org X-Gm-Message-State: AOJu0YyxQG0Sebe2ctXQpX8ljcwf18BzztZpm4joagRPwqWH+aaiI8J7 JXnl3lm+h+1KF4OmmHXi5DMOGTPHDQvDS3wDmiNeWG2dcTD8SV+CfFDh5ioE/bYnjo+5ng== X-Gm-Gg: Acq92OGpgZpzrkEZA6pGwRHPTiLe25piKhDc8BYYZnWX6BGTPZ2I9qKcBE+b8oWkvk2 7556suWfN7CasOt/gCy0ci1cDwL+QyuY3KtGkiUlbA+oHUUAf+Pp6Bo6RkIu+kmqBvhccNVf0xa lRkV+Fo9aAYkzMv6nM0gdKn7BbFycJnXS2cXrLPBycYzC0S9TC7iZhEwhuAOVGQBJ60Kx9Ybw81 0UcFe5hDI3z00oyIWmaYqEtk5Geud1k6Zh189qu7n1P/WNC/0CAMNnpxsSYyfYEjP5o2Yxnh3FF VgJXPsJTEdqMH7WStvkXY5W6PXH4lHTdOCbXVT5Tfumy+UsuLEmFav9OcwYXuXZRA3NdXAylyKf qxzn5XVHMTo/Is3oBgLUoMipYYKHPcOYWItGG+vYa9O9Zo85yFHarNNjeTG9M9E65EI4G8SC7ru r4nZrdY85uHgYqpSMvN4oD+yVuYUXrCh5tV3wY9HFiALZ8eU6MHQfKASRPpb71rVYXZkodasyyc vZiGg== X-Received: by 2002:a05:620a:4542:b0:8f0:f1a5:680c with SMTP id af79cd13be357-911cef062f4mr3406807985a.29.1779237462724; Tue, 19 May 2026 17:37:42 -0700 (PDT) Received: from localhost.localdomain ([94.156.149.63]) by smtp.gmail.com with ESMTPSA id af79cd13be357-910c0ec392bsm1970592185a.41.2026.05.19.17.37.39 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 19 May 2026 17:37:42 -0700 (PDT) From: Qing Wu To: ses1er@gmail.com Cc: Miquel Raynal , Michal Simek , Vignesh Raghavendra , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND] [v2] mtd: spinand: add support for additional Dosilicon models Date: Tue, 19 May 2026 20:37:33 -0400 Message-ID: <20260520003733.82514-1-ses1er@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add support for additional Dosilicon SPI NAND chips. Datasheets for chips included in this patch: https://www.dosilicon.com/SPI%= 20NAND%20Flash.html Tested on a TP-Link TL-7DR7250 with a Dosilicon DS35Q1GB (0xE5 0xF1) Link to original v2: https://lore.kernel.org/all/20260217221444.11171-1-ses= 1er@gmail.com/ Signed-off-by: Qing Wu --- Changes in v2: - Fixed compilation errors. - Link to v1: https://lore.kernel.org/all/20260217211427.9120-1-ses1er@gmai= l.com --- drivers/mtd/nand/spi/dosilicon.c | 203 +++++++++++++++++++++++++++++-- 1 file changed, 196 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/spi/dosilicon.c b/drivers/mtd/nand/spi/dosili= con.c index f99899866ceb..6a5100c6bf99 100644 --- a/drivers/mtd/nand/spi/dosilicon.c +++ b/drivers/mtd/nand/spi/dosilicon.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Author: Ahmed Naseef + * Additions: Qing Wu */ =20 #include @@ -9,6 +10,12 @@ =20 #define SPINAND_MFR_DOSILICON 0xE5 =20 +#define DOSICON_STATUS_ECC_MASK GENMASK(6, 4) +#define DOSICON_STATUS_ECC_NO_BITFLIPS (0 << 4) +#define DOSICON_STATUS_ECC_1TO3_BITFLIPS (1 << 4) +#define DOSICON_STATUS_ECC_4TO6_BITFLIPS (3 << 4) +#define DOSICON_STATUS_ECC_7TO8_BITFLIPS (5 << 4) + static SPINAND_OP_VARIANTS(read_cache_variants, SPINAND_PAGE_READ_FROM_CACHE_1S_1S_4S_OP(0, 1, NULL, 0, 0), SPINAND_PAGE_READ_FROM_CACHE_1S_1S_2S_OP(0, 1, NULL, 0, 0), @@ -23,7 +30,7 @@ static SPINAND_OP_VARIANTS(update_cache_variants, SPINAND_PROG_LOAD_1S_1S_4S_OP(false, 0, NULL, 0), SPINAND_PROG_LOAD_1S_1S_1S_OP(false, 0, NULL, 0)); =20 -static int ds35xx_ooblayout_ecc(struct mtd_info *mtd, int section, +static int ds35xxga_ooblayout_ecc(struct mtd_info *mtd, int section, struct mtd_oob_region *region) { if (section > 3) @@ -35,7 +42,7 @@ static int ds35xx_ooblayout_ecc(struct mtd_info *mtd, int= section, return 0; } =20 -static int ds35xx_ooblayout_free(struct mtd_info *mtd, int section, +static int ds35xxga_ooblayout_free(struct mtd_info *mtd, int section, struct mtd_oob_region *region) { if (section > 3) @@ -53,11 +60,67 @@ static int ds35xx_ooblayout_free(struct mtd_info *mtd, = int section, return 0; } =20 -static const struct mtd_ooblayout_ops ds35xx_ooblayout =3D { - .ecc =3D ds35xx_ooblayout_ecc, - .free =3D ds35xx_ooblayout_free, +static const struct mtd_ooblayout_ops ds35xxga_ooblayout =3D { + .ecc =3D ds35xxga_ooblayout_ecc, + .free =3D ds35xxga_ooblayout_free, }; =20 +static int ds35xxgb_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + region->offset =3D 64; + region->length =3D 64; + + return 0; +} + +static int ds35xxgb_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *region) +{ + if (section) + return -ERANGE; + + /* Reserve 1 bytes for the BBM. */ + region->offset =3D 1; + region->length =3D 63; + + return 0; +} + +static const struct mtd_ooblayout_ops ds35xxgb_ooblayout =3D { + .ecc =3D ds35xxgb_ooblayout_ecc, + .free =3D ds35xxgb_ooblayout_free, +}; + +static int ds35xxgb_ecc_get_status(struct spinand_device *spinand, + u8 status) +{ + switch (status & DOSICON_STATUS_ECC_MASK) { + case STATUS_ECC_NO_BITFLIPS: + return 0; + + case STATUS_ECC_UNCOR_ERROR: + return -EBADMSG; + + case DOSICON_STATUS_ECC_1TO3_BITFLIPS: + return 3; + + case DOSICON_STATUS_ECC_4TO6_BITFLIPS: + return 6; + + case DOSICON_STATUS_ECC_7TO8_BITFLIPS: + return 8; + + default: + break; + } + + return -EINVAL; +} + static const struct spinand_info dosilicon_spinand_table[] =3D { SPINAND_INFO("DS35Q1GA", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x71), @@ -67,7 +130,16 @@ static const struct spinand_info dosilicon_spinand_tabl= e[] =3D { &write_cache_variants, &update_cache_variants), SPINAND_HAS_QE_BIT, - SPINAND_ECCINFO(&ds35xx_ooblayout, NULL)), + SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)), + SPINAND_INFO("DS35Q2GA", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x72), + NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1), + NAND_ECCREQ(4, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)), SPINAND_INFO("DS35M1GA", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x21), NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1), @@ -76,7 +148,124 @@ static const struct spinand_info dosilicon_spinand_tab= le[] =3D { &write_cache_variants, &update_cache_variants), SPINAND_HAS_QE_BIT, - SPINAND_ECCINFO(&ds35xx_ooblayout, NULL)), + SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)), + SPINAND_INFO("DS35M2GA", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x22), + NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1), + NAND_ECCREQ(4, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxga_ooblayout, NULL)), + SPINAND_INFO("DS35Q2GB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF2), + NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35M1GB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xA1), + NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q1GB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF1), + NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q4GM", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF4), + NAND_MEMORG(1, 2048, 128, 64, 4096, 80, 2, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q12B", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xF5), + NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35M12B", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xA5), + NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q1GD-IB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x51), + NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35M4GB-IB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x64), + NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q4GB-IB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xB4), + NAND_MEMORG(1, 2048, 128, 64, 4096, 40, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q12C-IB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x75), + NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35M12C-IB", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x25), + NAND_MEMORG(1, 2048, 128, 64, 512, 10, 1, 1, 1), + NAND_ECCREQ(8, 512), + SPINAND_INFO_OP_VARIANTS(&read_cache_variants, + &write_cache_variants, + &update_cache_variants), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), + SPINAND_INFO("DS35Q2GBS", + SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xB2), + 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), + SPINAND_HAS_QE_BIT, + SPINAND_ECCINFO(&ds35xxgb_ooblayout, ds35xxgb_ecc_get_status)), }; =20 static const struct spinand_manufacturer_ops dosilicon_spinand_manuf_ops = =3D {