From nobody Tue Feb 10 07:40:17 2026 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF28213B5B6 for ; Mon, 27 Jan 2025 15:39:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.89.224.132 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737992368; cv=none; b=aZLldI0jL27kJfY3lewgXGnV4Y+X+Pa/OOmUcvB6lt5U+5+UHshyDSmeSccKbCt4cZ7llWKNbORD8uTHHvk6Nz5+S4MnAhsZj/R9VyiAE9IMpGDe15ck9jtEUfh9Uok4YU9pN51fDSGRjyU0r5MR8JwBAZeNT5WxyVNOg/xRTEs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737992368; c=relaxed/simple; bh=hWuXQjnvcDxKcH9tsZZopRYEFLapyMDZQyKCVkkHckU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GrGBMz0wbDoihM81O1/9eV2Qp584gs+/j24vDxQG8Q6kofs2yfOCBxUGB1AHVdC/RglR1k5771Cmz5HsdsdgX4O0IA2aQFZBjeKufz4uQRHjfCRE32iIu3F75vsKNAtJELBiD7kWzs3rwqkcre6JTOmjAnIT4DQJ9CZmf9iMBmM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com; spf=pass smtp.mailfrom=salutedevices.com; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b=q6LJSEqD; arc=none smtp.client-ip=45.89.224.132 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=salutedevices.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=salutedevices.com header.i=@salutedevices.com header.b="q6LJSEqD" Received: from p-infra-ksmg-sc-msk02.sberdevices.ru (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 984FA12000A; Mon, 27 Jan 2025 18:39:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 984FA12000A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=salutedevices.com; s=mail; t=1737992354; bh=NAdg8iOfY3hOQ3Sfvs8WLDdRB6CCC8PTCW8ddrTRSSA=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=q6LJSEqD0cvAU99NfqCcRTxpf4dl9lX5ROnJO3+jZHSKhzZjr930YiqJ93fjrENdU otkeC1QuhAzefS0/B/cI9ng9mmv2IRC99VXHShQftvBLPMOEqSLmLlF4+XQXqqERch mYxYF+hfk3bp91Eu5CqRGQJ/u/uD63+zEjgte9171XVWSCJjIRLn1jNIGvRM7E6q95 Dd6gQgpHBuGRV7VOWYR9oTzf317HgquudQH6YFRkbPDW1ce5csPIBi8sIuJDYoF/EX tmFEv/bIl7o85dteGTtH6kBQD0ztVP9fTWpYU0xZHVHgrE/LyOimrBIJ0Apqn66QsV tVnhrcz3RhtKw== Received: from smtp.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Mon, 27 Jan 2025 18:39:14 +0300 (MSK) From: Martin Kurbanov To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Ezra Buehler , Cheng Ming Lin , Pratyush Yadav , Daniel Golle , Frieder Schrempf , Alexey Romanov CC: , , , Martin Kurbanov Subject: [PATCH v4 3/6] mtd: spinand: make spinand_{wait,otp_page_size} global Date: Mon, 27 Jan 2025 18:38:21 +0300 Message-ID: <20250127153848.199526-4-mmkurbanov@salutedevices.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250127153848.199526-1-mmkurbanov@salutedevices.com> References: <20250127153848.199526-1-mmkurbanov@salutedevices.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 X-ClientProxiedBy: p-i-exch-a-m1.sberdevices.ru (172.24.196.116) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 190599 [Jan 27 2025] X-KSMG-AntiSpam-Version: 6.1.1.7 X-KSMG-AntiSpam-Envelope-From: mmkurbanov@salutedevices.com X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 50 0.3.50 df4aeb250ed63fd3baa80a493fa6caee5dd9e10f, {Tracking_from_domain_doesnt_match_to}, salutedevices.com:7.1.1;127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;smtp.sberdevices.ru:5.0.1,7.1.1, FromAlignment: s X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2025/01/27 13:50:00 #27131010 X-KSMG-AntiVirus-Status: Clean, skipped Content-Type: text/plain; charset="utf-8" Change the functions spinand_wait() and spinand_otp_page_size() from static to global so that SPI NAND flash drivers don't duplicate it. Signed-off-by: Martin Kurbanov --- drivers/mtd/nand/spi/core.c | 18 ++++++++++++++---- drivers/mtd/nand/spi/otp.c | 19 ++++++++++++++----- include/linux/mtd/spinand.h | 4 ++++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 832ac36666edb..0b5cddc4664ac 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -531,10 +531,20 @@ static int spinand_erase_op(struct spinand_device *sp= inand, return spi_mem_exec_op(spinand->spimem, &op); } =20 -static int spinand_wait(struct spinand_device *spinand, - unsigned long initial_delay_us, - unsigned long poll_delay_us, - u8 *s) +/** + * spinand_wait() - Poll memory device status + * @spinand: the spinand device + * @initial_delay_us: delay in us before starting to poll + * @poll_delay_us: time to sleep between reads in us + * @s: the pointer to variable to store the value of REG_STATUS + * + * This function polls a status register (REG_STATUS) and returns when + * the STATUS_READY bit is 0 or when the timeout has expired. + * + * Return: 0 on success, a negative error code otherwise. + */ +int spinand_wait(struct spinand_device *spinand, unsigned long initial_del= ay_us, + unsigned long poll_delay_us, u8 *s) { struct spi_mem_op op =3D SPINAND_GET_FEATURE_OP(REG_STATUS, spinand->scratchbuf); diff --git a/drivers/mtd/nand/spi/otp.c b/drivers/mtd/nand/spi/otp.c index d465dced554c4..1eb5677508ff8 100644 --- a/drivers/mtd/nand/spi/otp.c +++ b/drivers/mtd/nand/spi/otp.c @@ -8,14 +8,23 @@ #include #include =20 -static size_t spinand_otp_size(struct spinand_device *spinand, - const struct spinand_otp_layout *layout) +/** + * spinand_otp_page_size() - Get SPI-NAND OTP page size + * @spinand: the spinand device + * + * Return: the OTP page size. + */ +size_t spinand_otp_page_size(struct spinand_device *spinand) { struct nand_device *nand =3D spinand_to_nand(spinand); - size_t otp_pagesize =3D nanddev_page_size(nand) + - nanddev_per_page_oobsize(nand); =20 - return layout->npages * otp_pagesize; + return nanddev_page_size(nand) + nanddev_per_page_oobsize(nand); +} + +static size_t spinand_otp_size(struct spinand_device *spinand, + const struct spinand_otp_layout *layout) +{ + return layout->npages * spinand_otp_page_size(spinand); } =20 /** diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index 458bf4b0bea2d..e0fdd3408ffa1 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -626,12 +626,16 @@ int spinand_upd_cfg(struct spinand_device *spinand, u= 8 mask, u8 val); int spinand_write_reg_op(struct spinand_device *spinand, u8 reg, u8 val); int spinand_select_target(struct spinand_device *spinand, unsigned int tar= get); =20 +int spinand_wait(struct spinand_device *spinand, unsigned long initial_del= ay_us, + unsigned long poll_delay_us, u8 *s); + int spinand_read_page(struct spinand_device *spinand, const struct nand_page_io_req *req); =20 int spinand_write_page(struct spinand_device *spinand, const struct nand_page_io_req *req); =20 +size_t spinand_otp_page_size(struct spinand_device *spinand); size_t spinand_fact_otp_size(struct spinand_device *spinand); size_t spinand_user_otp_size(struct spinand_device *spinand); =20 --=20 2.43.0