From: Boris Brezillon <boris.brezillon@bootlin.com> To: David Woodhouse <dwmw2@infradead.org>, Brian Norris <computersforpeace@gmail.com>, Boris Brezillon <boris.brezillon@bootlin.com>, Marek Vasut <marek.vasut@gmail.com>, Richard Weinberger <richard@nod.at>, Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>, linux-mtd@lists.infradead.org, Miquel Raynal <miquel.raynal@bootlin.com>, Mark Brown <broonie@kernel.org>, linux-spi@vger.kernel.org Cc: "Yogesh Gaur" <yogeshnarayan.gaur@nxp.com>, "Vignesh R" <vigneshr@ti.com>, "Kamal Dasu" <kdasu.kdev@gmail.com>, "Maxime Chevallier" <maxime.chevallier@bootlin.com>, "Peter Pan" <peterpansjtu@gmail.com>, "Frieder Schrempf" <frieder.schrempf@exceet.de>, "Rafał Miłecki" <rafal@milecki.pl>, "Sourav Poddar" <sourav.poddar@ti.com> Subject: [PATCH v2 07/10] spi: bcm53xx: Implement the spi_mem interface Date: Wed, 11 Apr 2018 00:44:36 +0200 [thread overview] Message-ID: <20180410224439.9260-8-boris.brezillon@bootlin.com> (raw) In-Reply-To: <20180410224439.9260-1-boris.brezillon@bootlin.com> The spi_mem interface is meant to replace the spi_flash_read() one. Implement the ->exec_op() method so that we can smoothly get rid of the old interface. Note that the current ->flash_read() implementation looks a bit fragile since it does not take the ->read_opcode passed by the spi-nor layer into account, which means if might not work with all kind of NORs. Anyway, I left the logic unchanged and added a few extra checks to make sure we're receiving something that looks like a NOR read operation. Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- Changes in v2: - include spi-mem.h - treat op->addr.val differently since it's now an u64 --- drivers/spi/spi-bcm2835.c | 1 + drivers/spi/spi-bcm53xx.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index f35cc10772f6..41ed371eaf15 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -37,6 +37,7 @@ #include <linux/of_gpio.h> #include <linux/of_irq.h> #include <linux/spi/spi.h> +#include <linux/spi/spi-mem.h> /* SPI register offsets */ #define BCM2835_SPI_CS 0x00 diff --git a/drivers/spi/spi-bcm53xx.c b/drivers/spi/spi-bcm53xx.c index d02ceb7a29d1..016059d3160b 100644 --- a/drivers/spi/spi-bcm53xx.c +++ b/drivers/spi/spi-bcm53xx.c @@ -257,6 +257,38 @@ static int bcm53xxspi_transfer_one(struct spi_master *master, return 0; } +static int bcm53xxspi_exec_mem_op(struct spi_mem *mem, + const struct spi_mem_op *op) +{ + struct bcm53xxspi *b53spi = spi_master_get_devdata(mem->spi->master); + u32 from; + + /* + * FIXME: There's nothing in this driver programming the opcode and + * buswidth to be used when a read is done on the mmio window, but it + * seems to be used to access a SPI NOR device, so restrict access + * access to SPINOR_OP_READ commands. + */ + if (!op->data.nbytes || op->data.dir != SPI_MEM_DATA_IN || + op->addr.nbytes != 3 || op->cmd.opcode != 0x3) + return -ENOTSUPP; + + /* Return -ENOTSUPP so that the core can fall back to normal reads. */ + from = op->addr.val; + if (from + op->data.nbytes > BCM53XXSPI_FLASH_WINDOW) + return -ENOTSUPP; + + bcm53xxspi_enable_bspi(b53spi); + memcpy_fromio(op->data.buf.in, b53spi->mmio_base + from, + op->data.nbytes); + + return 0; +} + +static const struct spi_controller_mem_ops bcm53xxspi_mem_ops = { + .exec_op = bcm53xxspi_exec_mem_op, +}; + static int bcm53xxspi_flash_read(struct spi_device *spi, struct spi_flash_read_message *msg) { @@ -311,8 +343,10 @@ static int bcm53xxspi_bcma_probe(struct bcma_device *core) master->dev.of_node = dev->of_node; master->transfer_one = bcm53xxspi_transfer_one; - if (b53spi->mmio_base) + if (b53spi->mmio_base) { + master->mem_ops = &bcm53xxspi_mem_ops; master->spi_flash_read = bcm53xxspi_flash_read; + } bcma_set_drvdata(core, b53spi); -- 2.14.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon@bootlin.com> To: David Woodhouse <dwmw2@infradead.org>, Brian Norris <computersforpeace@gmail.com>, Boris Brezillon <boris.brezillon@bootlin.com>, Marek Vasut <marek.vasut@gmail.com>, Richard Weinberger <richard@nod.at>, Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>, linux-mtd@lists.infradead.org, Miquel Raynal <miquel.raynal@bootlin.com>, Mark Brown <broonie@kernel.org>, linux-spi@vger.kernel.org Cc: "Peter Pan" <peterpansjtu@gmail.com>, "Frieder Schrempf" <frieder.schrempf@exceet.de>, "Vignesh R" <vigneshr@ti.com>, "Yogesh Gaur" <yogeshnarayan.gaur@nxp.com>, "Rafał Miłecki" <rafal@milecki.pl>, "Kamal Dasu" <kdasu.kdev@gmail.com>, "Sourav Poddar" <sourav.poddar@ti.com>, "Maxime Chevallier" <maxime.chevallier@bootlin.com> Subject: [PATCH v2 07/10] spi: bcm53xx: Implement the spi_mem interface Date: Wed, 11 Apr 2018 00:44:36 +0200 [thread overview] Message-ID: <20180410224439.9260-8-boris.brezillon@bootlin.com> (raw) In-Reply-To: <20180410224439.9260-1-boris.brezillon@bootlin.com> The spi_mem interface is meant to replace the spi_flash_read() one. Implement the ->exec_op() method so that we can smoothly get rid of the old interface. Note that the current ->flash_read() implementation looks a bit fragile since it does not take the ->read_opcode passed by the spi-nor layer into account, which means if might not work with all kind of NORs. Anyway, I left the logic unchanged and added a few extra checks to make sure we're receiving something that looks like a NOR read operation. Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com> --- Changes in v2: - include spi-mem.h - treat op->addr.val differently since it's now an u64 --- drivers/spi/spi-bcm2835.c | 1 + drivers/spi/spi-bcm53xx.c | 36 +++++++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index f35cc10772f6..41ed371eaf15 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -37,6 +37,7 @@ #include <linux/of_gpio.h> #include <linux/of_irq.h> #include <linux/spi/spi.h> +#include <linux/spi/spi-mem.h> /* SPI register offsets */ #define BCM2835_SPI_CS 0x00 diff --git a/drivers/spi/spi-bcm53xx.c b/drivers/spi/spi-bcm53xx.c index d02ceb7a29d1..016059d3160b 100644 --- a/drivers/spi/spi-bcm53xx.c +++ b/drivers/spi/spi-bcm53xx.c @@ -257,6 +257,38 @@ static int bcm53xxspi_transfer_one(struct spi_master *master, return 0; } +static int bcm53xxspi_exec_mem_op(struct spi_mem *mem, + const struct spi_mem_op *op) +{ + struct bcm53xxspi *b53spi = spi_master_get_devdata(mem->spi->master); + u32 from; + + /* + * FIXME: There's nothing in this driver programming the opcode and + * buswidth to be used when a read is done on the mmio window, but it + * seems to be used to access a SPI NOR device, so restrict access + * access to SPINOR_OP_READ commands. + */ + if (!op->data.nbytes || op->data.dir != SPI_MEM_DATA_IN || + op->addr.nbytes != 3 || op->cmd.opcode != 0x3) + return -ENOTSUPP; + + /* Return -ENOTSUPP so that the core can fall back to normal reads. */ + from = op->addr.val; + if (from + op->data.nbytes > BCM53XXSPI_FLASH_WINDOW) + return -ENOTSUPP; + + bcm53xxspi_enable_bspi(b53spi); + memcpy_fromio(op->data.buf.in, b53spi->mmio_base + from, + op->data.nbytes); + + return 0; +} + +static const struct spi_controller_mem_ops bcm53xxspi_mem_ops = { + .exec_op = bcm53xxspi_exec_mem_op, +}; + static int bcm53xxspi_flash_read(struct spi_device *spi, struct spi_flash_read_message *msg) { @@ -311,8 +343,10 @@ static int bcm53xxspi_bcma_probe(struct bcma_device *core) master->dev.of_node = dev->of_node; master->transfer_one = bcm53xxspi_transfer_one; - if (b53spi->mmio_base) + if (b53spi->mmio_base) { + master->mem_ops = &bcm53xxspi_mem_ops; master->spi_flash_read = bcm53xxspi_flash_read; + } bcma_set_drvdata(core, b53spi); -- 2.14.1
next prev parent reply other threads:[~2018-04-10 22:44 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-10 22:44 [PATCH v2 00/10] spi: Extend the framework to generically support memory devices Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 01/10] spi: Check presence the of ->transfer[_xxx]() before registering a controller Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-16 12:13 ` Applied "spi: Check presence the of ->transfer[_xxx]() before registering a controller" to the spi tree Mark Brown 2018-04-16 12:13 ` Mark Brown 2018-04-26 12:14 ` Boris Brezillon 2018-04-26 12:14 ` Boris Brezillon 2018-04-26 12:37 ` Mark Brown 2018-04-26 12:37 ` Mark Brown 2018-04-26 12:54 ` Mark Brown 2018-04-26 12:54 ` Mark Brown 2018-04-10 22:44 ` [PATCH v2 02/10] spi: Expose spi_{map,unmap}_buf() for internal use Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-16 12:11 ` Mark Brown 2018-04-16 12:11 ` Mark Brown 2018-04-18 14:20 ` Boris Brezillon 2018-04-18 14:20 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 03/10] spi: Add an helper to flush the message queue Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 04/10] spi: Extend the core to ease integration of SPI memory controllers Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-12 14:38 ` Vignesh R 2018-04-12 14:38 ` Vignesh R 2018-04-12 15:10 ` Boris Brezillon 2018-04-12 15:10 ` Boris Brezillon 2018-04-12 19:59 ` Boris Brezillon 2018-04-12 19:59 ` Boris Brezillon 2018-04-17 4:12 ` Vignesh R 2018-04-17 4:12 ` Vignesh R 2018-04-18 14:17 ` Boris Brezillon 2018-04-18 14:17 ` Boris Brezillon 2018-04-16 10:33 ` Frieder Schrempf 2018-04-16 10:33 ` Frieder Schrempf 2018-04-18 14:23 ` Boris Brezillon 2018-04-18 14:23 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 05/10] spi: Make support for regular transfers optional when ->mem_ops != NULL Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 06/10] spi: bcm-qspi: Implement the spi_mem interface Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-05-11 2:56 ` Applied "spi: bcm-qspi: Implement the spi_mem interface" to the spi tree Mark Brown 2018-05-11 2:56 ` Mark Brown 2018-04-10 22:44 ` Boris Brezillon [this message] 2018-04-10 22:44 ` [PATCH v2 07/10] spi: bcm53xx: Implement the spi_mem interface Boris Brezillon 2018-04-12 13:09 ` Boris Brezillon 2018-04-12 13:09 ` Boris Brezillon 2018-05-07 9:35 ` Rafał Miłecki 2018-05-07 9:35 ` Rafał Miłecki 2018-04-10 22:44 ` [PATCH v2 08/10] spi: ti-qspi: " Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-10 22:44 ` [PATCH v2 09/10] mtd: spi-nor: Use the spi_mem_xx() API Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-05-11 2:55 ` Applied "mtd: spi-nor: Use the spi_mem_xx() API" to the spi tree Mark Brown 2018-05-11 2:55 ` Mark Brown 2018-04-10 22:44 ` [PATCH v2 10/10] spi: Get rid of the spi_flash_read() API Boris Brezillon 2018-04-10 22:44 ` Boris Brezillon 2018-04-17 10:57 ` [PATCH v2 00/10] spi: Extend the framework to generically support memory devices Mark Brown 2018-04-17 10:57 ` Mark Brown 2018-04-18 14:25 ` Boris Brezillon 2018-04-18 14:25 ` Boris Brezillon
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=20180410224439.9260-8-boris.brezillon@bootlin.com \ --to=boris.brezillon@bootlin.com \ --cc=broonie@kernel.org \ --cc=computersforpeace@gmail.com \ --cc=cyrille.pitchen@wedev4u.fr \ --cc=dwmw2@infradead.org \ --cc=frieder.schrempf@exceet.de \ --cc=kdasu.kdev@gmail.com \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=marek.vasut@gmail.com \ --cc=maxime.chevallier@bootlin.com \ --cc=miquel.raynal@bootlin.com \ --cc=peterpansjtu@gmail.com \ --cc=rafal@milecki.pl \ --cc=richard@nod.at \ --cc=sourav.poddar@ti.com \ --cc=vigneshr@ti.com \ --cc=yogeshnarayan.gaur@nxp.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.