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 6/8] mtd: spinand: micron: Turn driver implementation generic Date: Mon, 22 Jul 2019 07:56:19 +0200 [thread overview] Message-ID: <20190722055621.23526-7-sshivamurthy@micron.com> (raw) In-Reply-To: <20190722055621.23526-1-sshivamurthy@micron.com> From: Shivamurthy Shastri <sshivamurthy@micron.com> Driver is redesigned using parameter page to support Micron SPI NAND flashes. The reason why spinand_select_op_variant globalized is that the Micron driver no longer calling spinand_match_and_init. Signed-off-by: Shivamurthy Shastri <sshivamurthy@micron.com> --- drivers/mtd/nand/spi/core.c | 2 +- drivers/mtd/nand/spi/micron.c | 61 +++++++++++++++++++++++++---------- include/linux/mtd/spinand.h | 4 +++ 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 7ae76dab9141..aae715d388b7 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -920,7 +920,7 @@ static void spinand_manufacturer_cleanup(struct spinand_device *spinand) return spinand->manufacturer->ops->cleanup(spinand); } -static const struct spi_mem_op * +const struct spi_mem_op * spinand_select_op_variant(struct spinand_device *spinand, const struct spinand_op_variants *variants) { diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c index 95bc5264ebc1..6fde93ec23a1 100644 --- a/drivers/mtd/nand/spi/micron.c +++ b/drivers/mtd/nand/spi/micron.c @@ -90,22 +90,10 @@ static int micron_ecc_get_status(struct spinand_device *spinand, return -EINVAL; } -static const struct spinand_info micron_spinand_table[] = { - SPINAND_INFO("MT29F2G01ABAGD", 0x24, - 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), - 0, - SPINAND_ECCINFO(µn_ooblayout_ops, - micron_ecc_get_status)), -}; - static int micron_spinand_detect(struct spinand_device *spinand) { + const struct spi_mem_op *op; u8 *id = spinand->id.data; - int ret; /* * Micron SPI NAND read ID need a dummy byte, @@ -114,16 +102,55 @@ static int micron_spinand_detect(struct spinand_device *spinand) if (id[1] != SPINAND_MFR_MICRON) return 0; - ret = spinand_match_and_init(spinand, micron_spinand_table, - ARRAY_SIZE(micron_spinand_table), id[2]); - if (ret) - return ret; + spinand->flags = 0; + spinand->eccinfo.get_status = micron_ecc_get_status; + spinand->eccinfo.ooblayout = µn_ooblayout_ops; + + op = spinand_select_op_variant(spinand, + &read_cache_variants); + if (!op) + return -ENOTSUPP; + + spinand->op_templates.read_cache = op; + + op = spinand_select_op_variant(spinand, + &write_cache_variants); + if (!op) + return -ENOTSUPP; + + spinand->op_templates.write_cache = op; + + op = spinand_select_op_variant(spinand, + &update_cache_variants); + spinand->op_templates.update_cache = op; return 1; } +static void micron_fixup_param_page(struct spinand_device *spinand, + struct nand_onfi_params *p) +{ + /* + * As per Micron datasheets vendor[83] is defined as + * die_select_feature + */ + if (p->vendor[83] && !p->interleaved_bits) + spinand->base.memorg.planes_per_lun = 1 << p->vendor[0]; + + spinand->base.memorg.ntargets = p->lun_count; + spinand->base.memorg.luns_per_target = 1; + + /* + * As per Micron datasheets, + * vendor[82] is ECC maximum correctability + */ + spinand->base.eccreq.strength = p->vendor[82]; + spinand->base.eccreq.step_size = 512; +} + static const struct spinand_manufacturer_ops micron_spinand_manuf_ops = { .detect = micron_spinand_detect, + .fixup_param_page = micron_fixup_param_page, }; const struct spinand_manufacturer micron_spinand_manufacturer = { diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index fea820a20bc9..ddb2194273a8 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -461,4 +461,8 @@ int spinand_match_and_init(struct spinand_device *dev, int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val); int spinand_select_target(struct spinand_device *spinand, unsigned int target); +const struct spi_mem_op * +spinand_select_op_variant(struct spinand_device *spinand, + const struct spinand_op_variants *variants); + #endif /* __LINUX_MTD_SPINAND_H */ -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
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 6/8] mtd: spinand: micron: Turn driver implementation generic Date: Mon, 22 Jul 2019 07:56:19 +0200 [thread overview] Message-ID: <20190722055621.23526-7-sshivamurthy@micron.com> (raw) In-Reply-To: <20190722055621.23526-1-sshivamurthy@micron.com> From: Shivamurthy Shastri <sshivamurthy@micron.com> Driver is redesigned using parameter page to support Micron SPI NAND flashes. The reason why spinand_select_op_variant globalized is that the Micron driver no longer calling spinand_match_and_init. Signed-off-by: Shivamurthy Shastri <sshivamurthy@micron.com> --- drivers/mtd/nand/spi/core.c | 2 +- drivers/mtd/nand/spi/micron.c | 61 +++++++++++++++++++++++++---------- include/linux/mtd/spinand.h | 4 +++ 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/drivers/mtd/nand/spi/core.c b/drivers/mtd/nand/spi/core.c index 7ae76dab9141..aae715d388b7 100644 --- a/drivers/mtd/nand/spi/core.c +++ b/drivers/mtd/nand/spi/core.c @@ -920,7 +920,7 @@ static void spinand_manufacturer_cleanup(struct spinand_device *spinand) return spinand->manufacturer->ops->cleanup(spinand); } -static const struct spi_mem_op * +const struct spi_mem_op * spinand_select_op_variant(struct spinand_device *spinand, const struct spinand_op_variants *variants) { diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c index 95bc5264ebc1..6fde93ec23a1 100644 --- a/drivers/mtd/nand/spi/micron.c +++ b/drivers/mtd/nand/spi/micron.c @@ -90,22 +90,10 @@ static int micron_ecc_get_status(struct spinand_device *spinand, return -EINVAL; } -static const struct spinand_info micron_spinand_table[] = { - SPINAND_INFO("MT29F2G01ABAGD", 0x24, - 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), - 0, - SPINAND_ECCINFO(µn_ooblayout_ops, - micron_ecc_get_status)), -}; - static int micron_spinand_detect(struct spinand_device *spinand) { + const struct spi_mem_op *op; u8 *id = spinand->id.data; - int ret; /* * Micron SPI NAND read ID need a dummy byte, @@ -114,16 +102,55 @@ static int micron_spinand_detect(struct spinand_device *spinand) if (id[1] != SPINAND_MFR_MICRON) return 0; - ret = spinand_match_and_init(spinand, micron_spinand_table, - ARRAY_SIZE(micron_spinand_table), id[2]); - if (ret) - return ret; + spinand->flags = 0; + spinand->eccinfo.get_status = micron_ecc_get_status; + spinand->eccinfo.ooblayout = µn_ooblayout_ops; + + op = spinand_select_op_variant(spinand, + &read_cache_variants); + if (!op) + return -ENOTSUPP; + + spinand->op_templates.read_cache = op; + + op = spinand_select_op_variant(spinand, + &write_cache_variants); + if (!op) + return -ENOTSUPP; + + spinand->op_templates.write_cache = op; + + op = spinand_select_op_variant(spinand, + &update_cache_variants); + spinand->op_templates.update_cache = op; return 1; } +static void micron_fixup_param_page(struct spinand_device *spinand, + struct nand_onfi_params *p) +{ + /* + * As per Micron datasheets vendor[83] is defined as + * die_select_feature + */ + if (p->vendor[83] && !p->interleaved_bits) + spinand->base.memorg.planes_per_lun = 1 << p->vendor[0]; + + spinand->base.memorg.ntargets = p->lun_count; + spinand->base.memorg.luns_per_target = 1; + + /* + * As per Micron datasheets, + * vendor[82] is ECC maximum correctability + */ + spinand->base.eccreq.strength = p->vendor[82]; + spinand->base.eccreq.step_size = 512; +} + static const struct spinand_manufacturer_ops micron_spinand_manuf_ops = { .detect = micron_spinand_detect, + .fixup_param_page = micron_fixup_param_page, }; const struct spinand_manufacturer micron_spinand_manufacturer = { diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h index fea820a20bc9..ddb2194273a8 100644 --- a/include/linux/mtd/spinand.h +++ b/include/linux/mtd/spinand.h @@ -461,4 +461,8 @@ int spinand_match_and_init(struct spinand_device *dev, int spinand_upd_cfg(struct spinand_device *spinand, u8 mask, u8 val); int spinand_select_target(struct spinand_device *spinand, unsigned int target); +const struct spi_mem_op * +spinand_select_op_variant(struct spinand_device *spinand, + const struct spinand_op_variants *variants); + #endif /* __LINUX_MTD_SPINAND_H */ -- 2.17.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2019-07-22 5:57 UTC|newest] Thread overview: 56+ 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 ` shiva.linuxworks 2019-07-22 5:56 ` [PATCH 1/8] mtd: nand: move ONFI related functions to onfi.h shiva.linuxworks 2019-07-22 5:56 ` shiva.linuxworks 2019-08-07 8:34 ` Miquel Raynal 2019-08-07 8:34 ` Miquel Raynal 2019-08-19 8:35 ` [EXT] " Shivamurthy Shastri (sshivamurthy) 2019-08-19 8:35 ` 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-07-22 5:56 ` shiva.linuxworks 2019-08-07 9:03 ` Miquel Raynal 2019-08-07 9:03 ` Miquel Raynal 2019-08-19 8:36 ` [EXT] " Shivamurthy Shastri (sshivamurthy) 2019-08-19 8:36 ` Shivamurthy Shastri (sshivamurthy) 2019-07-22 5:56 ` [PATCH 3/8] mtd: nand: create ONFI table parsing instance shiva.linuxworks 2019-07-22 5:56 ` shiva.linuxworks 2019-08-07 9:09 ` Miquel Raynal 2019-08-07 9:09 ` Miquel Raynal 2019-07-22 5:56 ` [PATCH 4/8] mtd: spinand: enabled parameter page support shiva.linuxworks 2019-07-22 5:56 ` shiva.linuxworks 2019-08-07 9:48 ` Miquel Raynal 2019-08-07 9:48 ` Miquel Raynal 2019-08-19 8:51 ` [EXT] " Shivamurthy Shastri (sshivamurthy) 2019-08-19 8:51 ` Shivamurthy Shastri (sshivamurthy) 2019-08-19 9:21 ` Miquel Raynal 2019-08-19 9:21 ` Miquel Raynal 2019-09-30 13:23 ` Shivamurthy Shastri (sshivamurthy) 2019-09-30 13:23 ` Shivamurthy Shastri (sshivamurthy) 2019-10-07 7:52 ` Boris Brezillon 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-07-22 5:56 ` shiva.linuxworks 2019-08-07 9:51 ` Miquel Raynal 2019-08-07 9:51 ` Miquel Raynal 2019-07-22 5:56 ` shiva.linuxworks [this message] 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-07 10:04 ` Miquel Raynal 2019-08-19 9:03 ` [EXT] " Shivamurthy Shastri (sshivamurthy) 2019-08-19 9:03 ` Shivamurthy Shastri (sshivamurthy) 2019-08-19 9:19 ` Miquel Raynal 2019-08-19 9:19 ` Miquel Raynal 2019-09-16 10:41 ` Shivamurthy Shastri (sshivamurthy) 2019-09-16 10:41 ` Shivamurthy Shastri (sshivamurthy) 2019-10-07 8:13 ` Boris Brezillon 2019-10-07 8:13 ` Boris Brezillon 2019-10-14 12:49 ` Shivamurthy Shastri (sshivamurthy) 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-07-22 5:56 ` shiva.linuxworks 2019-08-07 10:05 ` Miquel Raynal 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-07-22 5:56 ` shiva.linuxworks 2019-08-07 10:08 ` Miquel Raynal 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-7-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.