From nobody Fri Dec 19 10:43:38 2025 Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 81B1B156872 for ; Wed, 28 Aug 2024 06:23:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724826227; cv=none; b=aMRklKJfOWfnOJ9SkCAdeas1KXT9pkWid1ZmWJ9+RUVhMpZ1I6lhY+AbuKmReucFlED497EpTU1gKymr3UsTc+DmiEMAqoBzJh0kCMZHAwG4cXVPnlbVlxJ/8bbrx0TqKrp4h+y/OjTe44Rw+n6AtZLlxPqbKdVvvXKxfGoKLNM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724826227; c=relaxed/simple; bh=QZtRIzHiNWcsLPbXKg1yVjK5Sbgn+NaJX/Eqqpkkd8I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l1Ulzvh2i861+/AQe19p/GlFKFgfwH++46CK3wnUd6RmEujhP+uNgspSuhUrE/U58k9TLfoc8yXOlMmlfXdwMbIGP50QAmgr63KJ0mCGzR/B2UN2eAC96LBjYeca1vI5HvwSeaikV1cUiaCX1N8jzBm5kO43G/ogKzfsqi/EzBI= 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=DykoOrHR; arc=none smtp.client-ip=209.85.210.46 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="DykoOrHR" Received: by mail-ot1-f46.google.com with SMTP id 46e09a7af769-70e07c1ab31so4873767a34.0 for ; Tue, 27 Aug 2024 23:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724826224; x=1725431024; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FUtCV19hfeNkRysHDxKfU4/8WiiEHGFbZ5MZIYZz3bQ=; b=DykoOrHRWHl2U2E6ifR9p7qfE04z+hselmqpKaA9p8F1IqgdMAYLuIahlZh+PIo+6z x1a7xT+3Dd5FDtQ8kZoGtvWCUAsj1Xx/WvPYEQclDghM3Q8vgHwFXOqj93TMrw02W7zG +C6vmARcuPer+RJA+haOz2VBWdLQv0WnJawnAu1U2GgYx7KhXKJSytOmRqjbmeJ/LYI/ ZUcxcCDwmNf6nqBclnGC7PziZDX62Z8cf74itqL4vQQdtuagoS9zd1YL7+oh7EMkcGi6 iK8Ux4rS9/aSloex9A/j5o+weazPrLI3GmCQG/62sHndM/LbPUh9F4aPCgKueqp/D3pn cVfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724826224; x=1725431024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FUtCV19hfeNkRysHDxKfU4/8WiiEHGFbZ5MZIYZz3bQ=; b=X013hdmvpw0HLzG+PuYAjUfLZVWR7jk2bgjoONIoH6xV5+4u1Y50h6u4J51oWpPgIy g4leI97uRop4LEK2Tsa5yP3f4FhKJdSvLcuOUOZ3j4ba23CPZCu6d9e0TMWFs7MK1EGE RMmDWhBL88/nEDS+jNWnx4q3/1nV+mxwnUz5YSC9oKWjZau6IjudcL/3Ycc0VVMrYhqV MoGI5+b0AnfVxSgjLmSjGBFHQofsqHtd49PFNNJ480xquy9P+7OOlmIIYsawXezpCmaU D7cqkGYIn4GoDV62n7FbT4euDMHMKz0MVUESJSsyFFfOyv8JRH9kpZh56hEA9LL8dJ0o wB/g== X-Forwarded-Encrypted: i=1; AJvYcCV/9y3NKmNPWVHPiEzrmVsBlpwDWCauafSPpVsuxBzt32eQQjLICzMIXduAMjQSgaFd9aHaeL9tPB0Sy2o=@vger.kernel.org X-Gm-Message-State: AOJu0YxjXSzoUHN80puaDP5MzKluhKw2RnT0CGApZig4LiyWgOLFtze3 cSuZC4VS6uPLWaxFVS4XZrmfwRnq5H23YVxZTUtCIyTlxTCr+iLi X-Google-Smtp-Source: AGHT+IHaJft7RjZWHta48qlmsJbiu0vmKQKrJgP0Wjf+7u373+g5aOn4c6YcgpDOHCC7lukSgsp9HQ== X-Received: by 2002:a05:6870:1684:b0:268:880c:9de3 with SMTP id 586e51a60fabf-2777d19da70mr1011681fac.14.1724826224410; Tue, 27 Aug 2024 23:23:44 -0700 (PDT) Received: from twhmp6px (mxsmtp211.mxic.com.tw. [211.75.127.162]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9acabac9sm8873089a12.28.2024.08.27.23.23.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2024 23:23:44 -0700 (PDT) Received: from hqs-appsw-a2o.mp600.macronix.com (linux-patcher [172.17.236.67]) by twhmp6px (Postfix) with ESMTPS id DBC1980414; Wed, 28 Aug 2024 14:32:21 +0800 (CST) From: Cheng Ming Lin To: miquel.raynal@bootlin.com, vigneshr@ti.com, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Cc: richard@nod.at, alvinzhou@mxic.com.tw, leoyu@mxic.com.tw, Cheng Ming Lin Subject: [PATCH v3 1/1] mtd: spinand: Add flags for the Plane Select bit Date: Wed, 28 Aug 2024 14:21:31 +0800 Message-Id: <20240828062131.1491580-2-linchengming884@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240828062131.1491580-1-linchengming884@gmail.com> References: <20240828062131.1491580-1-linchengming884@gmail.com> 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" From: Cheng Ming Lin Add support for Macronix serial NAND flash with a two-plane structure. Add the SPINAND_HAS_PP_PLANE_SELECT_BIT flag for serial NAND flash that require inserting the Plane Select bit into the column address during the write_to_cache operation. Add the SPINAND_HAS_READ_PLANE_SELECT_BIT flag for serial NAND flash that require inserting the Plane Select bit into the column address during the read_from_cache operation. Macronix serial NAND flash with a two-plane structure requires insertion of the Plane Select bit into the column address during the write_to_cache operation. Additionally, for MX35{U,F}2G14AC and MX35LF2GE4AB, insertion of the Plane Select bit into the column address is required during the read_from_cache operation. Signed-off-by: Cheng Ming Lin --- drivers/mtd/nand/spi/core.c | 6 ++++++ drivers/mtd/nand/spi/macronix.c | 17 ++++++++++------- include/linux/mtd/spinand.h | 2 ++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index e0b6715e5dfe..49f2d66c3a9c 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -386,6 +386,9 @@ static int spinand_read_from_cache_op(struct spinand_de= vice *spinand, else rdesc =3D spinand->dirmaps[req->pos.plane].rdesc_ecc; =20 + if (spinand->flags & SPINAND_HAS_READ_PLANE_SELECT_BIT) + column |=3D req->pos.plane << fls(nanddev_page_size(nand)); + while (nbytes) { ret =3D spi_mem_dirmap_read(rdesc, column, nbytes, buf); if (ret < 0) @@ -460,6 +463,9 @@ static int spinand_write_to_cache_op(struct spinand_dev= ice *spinand, else wdesc =3D spinand->dirmaps[req->pos.plane].wdesc_ecc; =20 + if (spinand->flags & SPINAND_HAS_PP_PLANE_SELECT_BIT) + column |=3D req->pos.plane << fls(nanddev_page_size(nand)); + while (nbytes) { ret =3D spi_mem_dirmap_write(wdesc, column, nbytes, buf); if (ret < 0) diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macroni= x.c index 3f9e9c572854..a531cc8121ff 100644 --- a/drivers/mtd/nand/spi/macronix.c +++ b/drivers/mtd/nand/spi/macronix.c @@ -118,7 +118,8 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT | + SPINAND_HAS_READ_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), SPINAND_INFO("MX35LF2GE4AD", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x26, 0x03), @@ -156,7 +157,7 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), SPINAND_INFO("MX35LF2G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x64, 0x03), @@ -174,7 +175,7 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, NULL)), SPINAND_INFO("MX35LF4G24AD-Z4I8", SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x75, 0x03), @@ -213,7 +214,8 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT | + SPINAND_HAS_READ_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, mx35lf1ge4ab_ecc_get_status)), SPINAND_INFO("MX35UF4G24AD", @@ -223,7 +225,7 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, mx35lf1ge4ab_ecc_get_status)), SPINAND_INFO("MX35UF4G24AD-Z4I8", @@ -253,7 +255,8 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT | + SPINAND_HAS_READ_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, mx35lf1ge4ab_ecc_get_status)), SPINAND_INFO("MX35UF2G24AD", @@ -263,7 +266,7 @@ static const struct spinand_info macronix_spinand_table= [] =3D { SPINAND_INFO_OP_VARIANTS(&read_cache_variants, &write_cache_variants, &update_cache_variants), - SPINAND_HAS_QE_BIT, + SPINAND_HAS_QE_BIT | SPINAND_HAS_PP_PLANE_SELECT_BIT, SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout, mx35lf1ge4ab_ecc_get_status)), SPINAND_INFO("MX35UF2G24AD-Z4I8", diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 5c19ead60499..cec451e7c71c 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -312,6 +312,8 @@ struct spinand_ecc_info { =20 #define SPINAND_HAS_QE_BIT BIT(0) #define SPINAND_HAS_CR_FEAT_BIT BIT(1) +#define SPINAND_HAS_PP_PLANE_SELECT_BIT BIT(2) +#define SPINAND_HAS_READ_PLANE_SELECT_BIT BIT(3) =20 /** * struct spinand_ondie_ecc_conf - private SPI-NAND on-die ECC engine stru= cture --=20 2.25.1