From nobody Mon Jun 8 18:55:25 2026 Received: from mail-qv1-f54.google.com (mail-qv1-f54.google.com [209.85.219.54]) (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 66C4D409E1B for ; Wed, 27 May 2026 13:08:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779887295; cv=none; b=NgZXbOyhZKfVZjbdl0n8/b3yKh1l/BWZl5PPyMgpElgvKLAXBQJA9qVwNpPwHo6Y0cmAA3LmNPztDAPjCRM/V5CKlZAfSJ1nmRGDpkhgpHby+RZDrmfDgCZdKdXvHqs2IXTCKC1/7TMeCS6jLdVBx1QbHAcyHrP0wX6yTNFXe7s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779887295; c=relaxed/simple; bh=9EM9CsuJC3MnUSjwPbYRmM2qMJJZbn/LBWLy1P7GzyA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=bv3TFiZe+VHpQrfhPt3XFE/4iPAQuQgZR94XAc/rnNAOMfXdFQEix8DVvd2WJkZiOuc3Qdl+PfHpB6QLXqbmwxvgmtLYqb0CSMQMMwIY4Vx0/tCAieJyDdc9nI511llIQ1YWmI3zJBrXuE9Co8/P6QJRXI4/rxkC6Lr73lDOQQI= 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=IE2jwLRZ; arc=none smtp.client-ip=209.85.219.54 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="IE2jwLRZ" Received: by mail-qv1-f54.google.com with SMTP id 6a1803df08f44-8b4eb1fd5d0so142805936d6.0 for ; Wed, 27 May 2026 06:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779887292; x=1780492092; 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=DO+OVa0uvgfe0VBImj35jZte/cP6pXfJrwHyo3JhXxA=; b=IE2jwLRZWOAkZuJSqnttXYKzamEuKUKbLGoewVdM5s+Vde3FBXshYDNAyjuHAWPTqm 8+Ltfoh+eiFYBAqwVPG85JjzNf5XaxkrgB8gjoj7YPpxSQ7NzfZcdGoWccWDLtOcqG0N HiTo7nHFrrwKLQ7Z4w7oYNK6ZT65s/1U2quQOMgVJEPtYEKN6nXEuQrmfGrE3d/8x+Jc aALcsEmocLIjOXXBzW53V+8sxqqmbArGCCnZKPxWLavx9htMisG4JIKCVwZwDbjzQtRw 57zZb1MFJ3sLzYCFNP7qkJD/lwCHq+GRd5Ni1fq2RZ3SJ8jJNq17Sn6O+gQHWfOSKGai cmcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779887292; x=1780492092; 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=DO+OVa0uvgfe0VBImj35jZte/cP6pXfJrwHyo3JhXxA=; b=M0BkRd+jagkTQR3mpclFKNqQEiq9aM2dSqHcUd+9TJZ6u8XhVaSALrWB1n4KWOJf7H UDSho4b/v3+2+o2XOz0bdA/mIvjpMWi4z69Eruytnk6mVvG9HKvhR3S3Z/ANEX9O/QqD PabAhgcIZtMy9MMgt5sHyHGB6otTdF5P5V02vZ2+b/ggMrlB7xp87XMPqvmSciGrjXdp teadMex1NqgmAn+Q6lL0eMCV3GV6ABE+oXoMSrUlQBJo6+eFzlwzSRVN0XtsPnAxs6yX FDv4uYXLL6UyTDtopDtPpBANkUaIXSVKTzTL5wqkgq/mfg2DCwdDHlwMZiVZeu5PZfhR dsSw== X-Forwarded-Encrypted: i=1; AFNElJ9YabGTs1nybHypMGQBDzYDXQtMbakvDOhSCkqpwpZeYgmqWq7X56ImOh99GVAurjflYCwluhawtdALHMg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzmze0kWk/oBxJ6jiob37LlcOgBqAs3nqq+JcJc2Noi4CMXVchi esvAefXjPOx00jT2im2CSlz0bhfqni0TPqgGUnpYbH0t3sUvCAc7GlB2 X-Gm-Gg: Acq92OEdlHi/h66waXSdFgSxPTwEbVnvTvoLfDPxr/NZF6oWB+lamHLRZr6n8Plk+6L U8MdKTMpdN1Y8lPlQcSuCbI9z3h0kxMY4O0DdL51ETkpS0DZlRR+s88q5QgWQgmPAo1zpJ/v0kp 5jlslad1RX+aoMKNwFfaVg3fyxJsMDUgmJJVgLsaLqLdRgoQd7oa9eKV+1S9ysBpXy+Atw4ARUu fQEzSh1G3eC11pxgKYHxnmE+RezhHXs6pd/Lb09QydI0TObFKpcQJiHFsRVNaDCMn9rwlxjWffN mi2l6iu9YCapHJbhNSRYJLsouJAlZ83om15LNiw2DIUwKFvAP/Rbx9+2NbofdiXLwIJhqwziu+U cxPGgMbsbQuJwTOsF9WZoSEnAm1OpJ/0kc6S1qJMgOVWVHsWm4va59pGReHtr3t18pfphX3qCpY KcCk9ybpBHrXuHg3ZCTZsLBkVZl0TuF+szUeCweEBrcU98LWwFOvhidf7AvkWmPfmJLBT9VGF/m ngBqwdgDtLD5dSI X-Received: by 2002:a05:6214:1c43:b0:8b5:84:aa1b with SMTP id 6a1803df08f44-8cc7b50024dmr354653206d6.9.1779887292067; Wed, 27 May 2026 06:08:12 -0700 (PDT) Received: from localhost.localdomain ([94.156.149.59]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8cca9c02e56sm70321176d6.43.2026.05.27.06.08.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 27 May 2026 06:08:11 -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 v4] mtd: spinand: dosilicon: Add support for additional models Date: Wed, 27 May 2026 09:07:54 -0400 Message-ID: <20260527130754.10867-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) Signed-off-by: Qing Wu --- Changes in v4: - Fixed compilation errors. Changes in v3: - Changed title - Updated 2 bytes for BBM - Link to v2: https://lore.kernel.org/all/20260520003733.82514-1-ses1er@gma= il.com/ 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 | 202 +++++++++++++++++++++++++++++-- 1 file changed, 195 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/spi/dosilicon.c b/drivers/mtd/nand/spi/dosili= con.c index f99899866ceb..8f96ea7922e8 100644 --- a/drivers/mtd/nand/spi/dosilicon.c +++ b/drivers/mtd/nand/spi/dosilicon.c @@ -9,6 +9,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 +29,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 +41,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 +59,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 2 bytes for the BBM. */ + region->offset =3D 2; + region->length =3D 62; + + 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 +129,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 +147,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 {