From: Boris Brezillon <boris.brezillon@collabora.com>
To: Pratyush Yadav <p.yadav@ti.com>
Cc: Mark Rutland <mark.rutland@arm.com>,
devicetree@vger.kernel.org, Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>,
Richard Weinberger <richard@nod.at>, Sekhar Nori <nsekhar@ti.com>,
linux-kernel@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
linux-spi@vger.kernel.org, Mark Brown <broonie@kernel.org>,
linux-mtd@lists.infradead.org,
Miquel Raynal <miquel.raynal@bootlin.com>
Subject: Re: [PATCH v2 03/11] spi: spi-mem: allow specifying whether an op is DTR or not
Date: Thu, 27 Feb 2020 17:36:30 +0100 [thread overview]
Message-ID: <20200227173630.40da81da@collabora.com> (raw)
In-Reply-To: <20200226093703.19765-4-p.yadav@ti.com>
On Wed, 26 Feb 2020 15:06:55 +0530
Pratyush Yadav <p.yadav@ti.com> wrote:
> Each phase is given a separate 'is_dtr' field so mixed protocols like
> 4S-4D-4D can be supported.
>
> Also add the mode bits SPI_RX_DTR and SPI_TX_DTR so controllers can
> specify whether they support DTR modes or not.
>
> Signed-off-by: Pratyush Yadav <p.yadav@ti.com>
> ---
> drivers/spi/spi-mem.c | 23 +++++++++++++++++++++++
> include/linux/spi/spi-mem.h | 8 ++++++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
> index e5a46f0eb93b..cb13e0878b95 100644
> --- a/drivers/spi/spi-mem.c
> +++ b/drivers/spi/spi-mem.c
> @@ -99,6 +99,16 @@ void spi_controller_dma_unmap_mem_op_data(struct spi_controller *ctlr,
> }
> EXPORT_SYMBOL_GPL(spi_controller_dma_unmap_mem_op_data);
>
> +static int spi_check_dtr_req(struct spi_mem *mem, bool tx)
> +{
> + u32 mode = mem->spi->mode;
> +
> + if ((tx && (mode & SPI_TX_DTR)) || (!tx && (mode & SPI_RX_DTR)))
> + return 0;
> +
> + return -ENOTSUPP;
> +}
> +
> static int spi_check_buswidth_req(struct spi_mem *mem, u8 buswidth, bool tx)
> {
> u32 mode = mem->spi->mode;
> @@ -154,6 +164,19 @@ bool spi_mem_default_supports_op(struct spi_mem *mem,
> op->data.dir == SPI_MEM_DATA_OUT))
> return false;
>
> + if (op->cmd.is_dtr && spi_check_dtr_req(mem, true))
> + return false;
> +
> + if (op->addr.is_dtr && spi_check_dtr_req(mem, true))
> + return false;
> +
> + if (op->dummy.is_dtr && spi_check_dtr_req(mem, true))
> + return false;
> +
> + if (op->data.dir != SPI_MEM_NO_DATA && op->data.is_dtr &&
> + spi_check_dtr_req(mem, op->data.dir == SPI_MEM_DATA_OUT))
> + return false;
> +
Not all controllers use spi_mem_default_supports_op(). Those should be
patched to reject DTR ops too.
> return true;
> }
> EXPORT_SYMBOL_GPL(spi_mem_default_supports_op);
> diff --git a/include/linux/spi/spi-mem.h b/include/linux/spi/spi-mem.h
> index af9ff2f0f1b2..4669082b4e3b 100644
> --- a/include/linux/spi/spi-mem.h
> +++ b/include/linux/spi/spi-mem.h
> @@ -71,6 +71,7 @@ enum spi_mem_data_dir {
> * struct spi_mem_op - describes a SPI memory operation
> * @cmd.buswidth: number of IO lines used to transmit the command
> * @cmd.opcode: operation opcode
> + * @cmd.is_dtr: whether the command opcode should be sent in DTR mode or not
> * @addr.nbytes: number of address bytes to send. Can be zero if the operation
> * does not need to send an address
> * @addr.buswidth: number of IO lines used to transmit the address cycles
> @@ -78,10 +79,13 @@ enum spi_mem_data_dir {
> * Note that only @addr.nbytes are taken into account in this
> * address value, so users should make sure the value fits in the
> * assigned number of bytes.
> + * @addr.is_dtr: whether the address should be sent in DTR mode or not
> * @dummy.nbytes: number of dummy bytes to send after an opcode or address. Can
> * be zero if the operation does not require dummy bytes
> * @dummy.buswidth: number of IO lanes used to transmit the dummy bytes
> + * @dummy.is_dtr: whether the dummy bytes should be sent in DTR mode or not
> * @data.buswidth: number of IO lanes used to send/receive the data
> + * @data.is_dtr: whether the data should be sent in DTR mode or not
> * @data.dir: direction of the transfer
> * @data.nbytes: number of data bytes to send/receive. Can be zero if the
> * operation does not involve transferring data
> @@ -92,21 +96,25 @@ struct spi_mem_op {
> struct {
> u8 buswidth;
> u8 opcode;
> + bool is_dtr;
Hm, maybe use a bitfield here so we can pack other fields if needed.
Also not convince the 'is_' prefix is useful.
u8 dtr : 1;
> } cmd;
>
> struct {
> u8 nbytes;
> u8 buswidth;
Maybe move the dtr field here so the compiler can pack things instead of
adding extra padding for the u64 alignment.
u8 dtr : 1;
> u64 val;
> + bool is_dtr;
> } addr;
>
> struct {
> u8 nbytes;
> u8 buswidth;
> + bool is_dtr;
> } dummy;
>
> struct {
> u8 buswidth;
> + bool is_dtr;
> enum spi_mem_data_dir dir;
> unsigned int nbytes;
> union {
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2020-02-27 16:36 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-26 9:36 [PATCH v2 00/11] mtd: spi-nor: add xSPI Octal DTR support Pratyush Yadav
2020-02-26 9:36 ` [PATCH v2 01/11] dt-bindings: spi: allow expressing DTR capability Pratyush Yadav
2020-02-27 16:11 ` Boris Brezillon
2020-02-27 16:28 ` Mark Brown
2020-02-27 16:40 ` Geert Uytterhoeven
2020-02-27 16:44 ` Mark Brown
2020-02-27 17:03 ` Geert Uytterhoeven
2020-03-02 9:53 ` Pratyush Yadav
2020-02-27 17:06 ` Boris Brezillon
2020-02-27 16:29 ` Geert Uytterhoeven
2020-02-28 9:46 ` Pratyush Yadav
2020-02-26 9:36 ` [PATCH v2 02/11] spi: set mode bits for "spi-rx-dtr" and "spi-tx-dtr" Pratyush Yadav
2020-02-27 16:23 ` Boris Brezillon
2020-03-02 9:48 ` Pratyush Yadav
2020-03-02 10:20 ` Boris Brezillon
2020-02-26 9:36 ` [PATCH v2 03/11] spi: spi-mem: allow specifying whether an op is DTR or not Pratyush Yadav
2020-02-27 16:36 ` Boris Brezillon [this message]
2020-02-26 9:36 ` [PATCH v2 04/11] spi: spi-mem: allow specifying a command's extension Pratyush Yadav
2020-02-27 16:44 ` Boris Brezillon
2020-02-28 9:41 ` Pratyush Yadav
2020-02-26 9:36 ` [PATCH v2 05/11] spi: cadence-quadspi: Add support for octal DTR flashes Pratyush Yadav
2020-02-26 9:36 ` [PATCH v2 06/11] mtd: spi-nor: add support for DTR protocol Pratyush Yadav
2020-02-27 16:58 ` Boris Brezillon
2020-02-28 9:36 ` Pratyush Yadav
2020-02-28 10:53 ` Boris Brezillon
2020-02-28 12:07 ` Pratyush Yadav
2020-02-28 13:18 ` Boris Brezillon
2020-02-26 9:36 ` [PATCH v2 07/11] mtd: spi-nor: get command opcode extension type from BFPT Pratyush Yadav
2020-02-26 9:37 ` [PATCH v2 08/11] mtd: spi-nor: parse xSPI Profile 1.0 table Pratyush Yadav
2020-02-26 9:37 ` [PATCH v2 09/11] mtd: spi-nor: use dummy cycle and address width info from SFDP Pratyush Yadav
2020-02-26 9:37 ` [PATCH v2 10/11] mtd: spi-nor: enable octal DTR mode when possible Pratyush Yadav
2020-02-26 9:37 ` [PATCH v2 11/11] mtd: spi-nor: add support for Cypress Semper flash Pratyush Yadav
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=20200227173630.40da81da@collabora.com \
--to=boris.brezillon@collabora.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=miquel.raynal@bootlin.com \
--cc=nsekhar@ti.com \
--cc=p.yadav@ti.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=tudor.ambarus@microchip.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).