From: shiva.linuxworks@gmail.com
To: Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
David Woodhouse <dwmw2@infradead.org>,
Brian Norris <computersforpeace@gmail.com>,
Marek Vasut <marek.vasut@gmail.com>,
Vignesh Raghavendra <vigneshr@ti.com>,
Boris Brezillon <bbrezillon@kernel.org>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Frieder Schrempf <frieder.schrempf@kontron.de>,
Shivamurthy Shastri <sshivamurthy@micron.com>,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
Jeff Kletsky <git-commits@allycomm.com>,
Chuanhong Guo <gch981213@gmail.com>,
liaoweixiong <liaoweixiong@allwinnertech.com>
Subject: [PATCH 3/8] mtd: nand: create ONFI table parsing instance
Date: Mon, 22 Jul 2019 07:56:16 +0200 [thread overview]
Message-ID: <20190722055621.23526-4-sshivamurthy@micron.com> (raw)
In-Reply-To: <20190722055621.23526-1-sshivamurthy@micron.com>
From: Shivamurthy Shastri <sshivamurthy@micron.com>
ONFI table parsing is common, as most of the variables are common
between raw and SPI NAND. The parsing function is instantiated in
onfi.c, which fills ONFI parameters into nand_memory_organization.
Signed-off-by: Shivamurthy Shastri <sshivamurthy@micron.com>
---
drivers/mtd/nand/onfi.c | 32 ++++++++++++++++++++++++++++++++
drivers/mtd/nand/raw/nand_onfi.c | 22 ++--------------------
include/linux/mtd/onfi.h | 2 ++
3 files changed, 36 insertions(+), 20 deletions(-)
diff --git a/drivers/mtd/nand/onfi.c b/drivers/mtd/nand/onfi.c
index 7aaf36dfc5e0..e78700894aea 100644
--- a/drivers/mtd/nand/onfi.c
+++ b/drivers/mtd/nand/onfi.c
@@ -87,3 +87,35 @@ void sanitize_string(u8 *s, size_t len)
strim(s);
}
EXPORT_SYMBOL_GPL(sanitize_string);
+
+/**
+ * fill_nand_memorg() - Parse ONFI table and fill memorg
+ * @memorg: NAND memorg to be filled
+ * @p: ONFI table to be parsed
+ *
+ */
+void parse_onfi_params(struct nand_memory_organization *memorg,
+ struct nand_onfi_params *p)
+{
+ memorg->pagesize = le32_to_cpu(p->byte_per_page);
+
+ /*
+ * pages_per_block and blocks_per_lun may not be a power-of-2 size
+ * (don't ask me who thought of this...). MTD assumes that these
+ * dimensions will be power-of-2, so just truncate the remaining area.
+ */
+ memorg->pages_per_eraseblock =
+ 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+
+ memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
+
+ memorg->luns_per_target = p->lun_count;
+ memorg->planes_per_lun = 1 << p->interleaved_bits;
+
+ /* See erasesize comment */
+ memorg->eraseblocks_per_lun =
+ 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
+ memorg->max_bad_eraseblocks_per_lun = le32_to_cpu(p->blocks_per_lun);
+ memorg->bits_per_cell = p->bits_per_cell;
+}
+EXPORT_SYMBOL_GPL(parse_onfi_params);
diff --git a/drivers/mtd/nand/raw/nand_onfi.c b/drivers/mtd/nand/raw/nand_onfi.c
index 2e8edfa636ef..263796d3298c 100644
--- a/drivers/mtd/nand/raw/nand_onfi.c
+++ b/drivers/mtd/nand/raw/nand_onfi.c
@@ -181,30 +181,12 @@ int nand_onfi_detect(struct nand_chip *chip)
goto free_onfi_param_page;
}
- memorg->pagesize = le32_to_cpu(p->byte_per_page);
- mtd->writesize = memorg->pagesize;
+ parse_onfi_params(memorg, p);
- /*
- * pages_per_block and blocks_per_lun may not be a power-of-2 size
- * (don't ask me who thought of this...). MTD assumes that these
- * dimensions will be power-of-2, so just truncate the remaining area.
- */
- memorg->pages_per_eraseblock =
- 1 << (fls(le32_to_cpu(p->pages_per_block)) - 1);
+ mtd->writesize = memorg->pagesize;
mtd->erasesize = memorg->pages_per_eraseblock * memorg->pagesize;
-
- memorg->oobsize = le16_to_cpu(p->spare_bytes_per_page);
mtd->oobsize = memorg->oobsize;
- memorg->luns_per_target = p->lun_count;
- memorg->planes_per_lun = 1 << p->interleaved_bits;
-
- /* See erasesize comment */
- memorg->eraseblocks_per_lun =
- 1 << (fls(le32_to_cpu(p->blocks_per_lun)) - 1);
- memorg->max_bad_eraseblocks_per_lun = le32_to_cpu(p->blocks_per_lun);
- memorg->bits_per_cell = p->bits_per_cell;
-
if (le16_to_cpu(p->features) & ONFI_FEATURE_16_BIT_BUS)
chip->options |= NAND_BUSWIDTH_16;
diff --git a/include/linux/mtd/onfi.h b/include/linux/mtd/onfi.h
index 2c8a05a02bb0..4cacf4e9db6d 100644
--- a/include/linux/mtd/onfi.h
+++ b/include/linux/mtd/onfi.h
@@ -183,5 +183,7 @@ void nand_bit_wise_majority(const void **srcbufs,
void *dstbuf,
unsigned int bufsize);
void sanitize_string(u8 *s, size_t len);
+void parse_onfi_params(struct nand_memory_organization *memorg,
+ struct nand_onfi_params *p);
#endif /* __LINUX_MTD_ONFI_H */
--
2.17.1
next prev parent reply other threads:[~2019-07-22 5:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-22 5:56 [PATCH 0/8] Introduce generic ONFI support shiva.linuxworks
2019-07-22 5:56 ` [PATCH 1/8] mtd: nand: move ONFI related functions to onfi.h shiva.linuxworks
2019-08-07 8:34 ` Miquel Raynal
2019-08-19 8:35 ` [EXT] " Shivamurthy Shastri (sshivamurthy)
2019-07-22 5:56 ` [PATCH 2/8] mtd: nand: move support functions for ONFI to nand/onfi.c shiva.linuxworks
2019-08-07 9:03 ` Miquel Raynal
2019-08-19 8:36 ` [EXT] " Shivamurthy Shastri (sshivamurthy)
2019-07-22 5:56 ` shiva.linuxworks [this message]
2019-08-07 9:09 ` [PATCH 3/8] mtd: nand: create ONFI table parsing instance Miquel Raynal
2019-07-22 5:56 ` [PATCH 4/8] mtd: spinand: enabled parameter page support shiva.linuxworks
2019-08-07 9:48 ` Miquel Raynal
2019-08-19 8:51 ` [EXT] " Shivamurthy Shastri (sshivamurthy)
2019-08-19 9:21 ` Miquel Raynal
2019-09-30 13:23 ` Shivamurthy Shastri (sshivamurthy)
2019-10-07 7:52 ` Boris Brezillon
2019-07-22 5:56 ` [PATCH 5/8] mtd: spinand: micron: prepare for generalizing driver shiva.linuxworks
2019-08-07 9:51 ` Miquel Raynal
2019-07-22 5:56 ` [PATCH 6/8] mtd: spinand: micron: Turn driver implementation generic shiva.linuxworks
2019-08-07 10:04 ` Miquel Raynal
2019-08-19 9:03 ` [EXT] " Shivamurthy Shastri (sshivamurthy)
2019-08-19 9:19 ` Miquel Raynal
2019-09-16 10:41 ` Shivamurthy Shastri (sshivamurthy)
2019-10-07 8:13 ` Boris Brezillon
2019-10-14 12:49 ` Shivamurthy Shastri (sshivamurthy)
2019-07-22 5:56 ` [PATCH 7/8] mtd: spinand: micron: Fix read failure in Micron M70A flashes shiva.linuxworks
2019-08-07 10:05 ` Miquel Raynal
2019-07-22 5:56 ` [PATCH 8/8] mtd: spinand: micron: Enable micron flashes with multi-die shiva.linuxworks
2019-08-07 10:08 ` Miquel Raynal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190722055621.23526-4-sshivamurthy@micron.com \
--to=shiva.linuxworks@gmail.com \
--cc=bbrezillon@kernel.org \
--cc=computersforpeace@gmail.com \
--cc=dwmw2@infradead.org \
--cc=frieder.schrempf@kontron.de \
--cc=gch981213@gmail.com \
--cc=git-commits@allycomm.com \
--cc=liaoweixiong@allwinnertech.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=marcel.ziswiler@toradex.com \
--cc=marek.vasut@gmail.com \
--cc=miquel.raynal@bootlin.com \
--cc=richard@nod.at \
--cc=sshivamurthy@micron.com \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).