[PATCH v2 2/5] spi: spi-mtk-nor: fix mishandled logics in checking SPI memory operation
Ikjoon Jang
ikjn at chromium.org
Mon Sep 21 02:10:19 EDT 2020
On Fri, Sep 18, 2020 at 9:09 PM Chuanhong Guo <gch981213 at gmail.com> wrote:
>
> Hi!
>
> On Fri, Sep 18, 2020 at 4:34 PM Ikjoon Jang <ikjn at chromium.org> wrote:
> >
> > Fix a simple bug which can limits its transfer size,
> > and add a simple helper function for code cleanups.
> >
> > Fixes: a59b2c7c56bf ("spi: spi-mtk-nor: support standard spi properties")
> > Signed-off-by: Ikjoon Jang <ikjn at chromium.org>
> >
> > ---
> >
> > (no changes since v1)
> >
> > drivers/spi/spi-mtk-nor.c | 62 ++++++++++++++++++++++++---------------
> > 1 file changed, 38 insertions(+), 24 deletions(-)
> >
> > diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
> > index 6e6ca2b8e6c8..54b2c0fde95b 100644
> > --- a/drivers/spi/spi-mtk-nor.c
> > +++ b/drivers/spi/spi-mtk-nor.c
> > @@ -167,52 +167,63 @@ static bool mtk_nor_match_read(const struct spi_mem_op *op)
> > return false;
> > }
> >
> > -static int mtk_nor_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
> > +static bool need_bounce(void *cpu_addr, unsigned long len)
> > {
> > - size_t len;
> > + return !!(((uintptr_t)cpu_addr) & MTK_NOR_DMA_ALIGN_MASK);
> > +}
>
> parameter 'len' isn't used in this function.
ACK.
>
> >
> > +static int mtk_nor_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
> > +{
> > if (!op->data.nbytes)
> > return 0;
> >
> > if ((op->addr.nbytes == 3) || (op->addr.nbytes == 4)) {
> > - if ((op->data.dir == SPI_MEM_DATA_IN) &&
> > - mtk_nor_match_read(op)) {
>
> I think replacing a if/else if with a two-case switch is more
> of a personal code preference rather than code cleanup.
> I'd prefer only adding need_bounce to replace alignment
> check using a separated commit and leave other stuff
> untouched because:
> 1. This "cleanup" made unintended logic changes (see below)
> 2. The "cleanup" itself actually becomes the major part of
> this patch, while the actual fix mentioned in commit
> message is the minor part.
> 3. A fix commit should contain the fix itself. It shouldn't
> mix with these code changes.
Got it, v3 will only include the fix itself.
>
> > + switch (op->data.dir) {
> > + case SPI_MEM_DATA_IN:
> > + if (!mtk_nor_match_read(op))
> > + return -EINVAL;
>
> You are changing the code logic here.
> mtk_nor_match_read checks if the operation can be executed
> using controller PIO/DMA reading. Even if it's not supported,
> we can still use PRG mode to execute the operation.
> One example of such an operation is SPI NOR SFDP reading.
> Your change breaks that which then breaks 1_2_2 and 1_4_4
> reading capability because spi-nor driver parses these op formats
> from SFDP table.
As you already noticed it, this is a bug from the last patch I made
and v2 isn't fixing this problem. This should be restored & fixed in v3.
And will not include other changes in a same patch.
>
> > + /* check if it's DMAable */
> > if ((op->addr.val & MTK_NOR_DMA_ALIGN_MASK) ||
> > - (op->data.nbytes < MTK_NOR_DMA_ALIGN))
> > + (op->data.nbytes < MTK_NOR_DMA_ALIGN)) {
> > op->data.nbytes = 1;
> > - else if (!((ulong)(op->data.buf.in) &
> > - MTK_NOR_DMA_ALIGN_MASK))
> > + } else {
> > + if (need_bounce(op->data.buf.in, op->data.nbytes) &&
> > + (op->data.nbytes > MTK_NOR_BOUNCE_BUF_SIZE))
> > + op->data.nbytes = MTK_NOR_BOUNCE_BUF_SIZE;
> > op->data.nbytes &= ~MTK_NOR_DMA_ALIGN_MASK;
> > - else if (op->data.nbytes > MTK_NOR_BOUNCE_BUF_SIZE)
> > - op->data.nbytes = MTK_NOR_BOUNCE_BUF_SIZE;
>
> data length alignment is intentionally done only for DMA reading
> without the bounce buffer.
> My intention here:
> If we use the bounce buffer, we can read more data than needed to.
> Say we want 25 bytes of data, reading 32 bytes using DMA and
> bounce buffer should be faster than reading 16 bytes with DMA
> and another 9 bytes with PIO, because for every single byte of PIO
> reading, adjust_op_size and exec_op is called once, we
> program controller with new cmd/address, and controller need
> to send extra cmd/address to flash.
> I noticed that you removed this part of logic from DMA reading
> execution in 3/5 as well. Please revert the logic change here
> add in DMA reading function (see later comment in 3/5).
In v2, I wasn't sure whether this behavior is sane (read more than requested)
Now I think this is okay, I've missed the fact that flash address is
also aligned together.
I'll just keep the previous logics with padding in v3.
Thanks!
>
> > - return 0;
> > - } else if (op->data.dir == SPI_MEM_DATA_OUT) {
> > + }
> > + break;
> > + case SPI_MEM_DATA_OUT:
> > if (op->data.nbytes >= MTK_NOR_PP_SIZE)
> > op->data.nbytes = MTK_NOR_PP_SIZE;
> > else
> > op->data.nbytes = 1;
> > - return 0;
> > + break;
> > + default:
> > + break;
> > }
> > + } else {
> > + u8 len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes;
> > +
> > + if (len > MTK_NOR_PRG_MAX_SIZE)
> > + return -EINVAL;
> > + if (op->data.nbytes && !(MTK_NOR_PRG_MAX_SIZE - len))
> > + return -EINVAL;
> > + if (op->data.nbytes > (MTK_NOR_PRG_MAX_SIZE - len))
> > + op->data.nbytes = MTK_NOR_PRG_MAX_SIZE - len;
> > }
> >
> > - len = MTK_NOR_PRG_MAX_SIZE - op->cmd.nbytes - op->addr.nbytes -
> > - op->dummy.nbytes;
> > - if (op->data.nbytes > len)
> > - op->data.nbytes = len;
> > -
> > return 0;
> > }
> >
> > static bool mtk_nor_supports_op(struct spi_mem *mem,
> > const struct spi_mem_op *op)
> > {
> > - size_t len;
> > -
> > if (op->cmd.buswidth != 1)
> > return false;
> >
> > if ((op->addr.nbytes == 3) || (op->addr.nbytes == 4)) {
> > - switch(op->data.dir) {
> > + switch (op->data.dir) {
> > case SPI_MEM_DATA_IN:
> > if (!mtk_nor_match_read(op))
> > return false;
> > @@ -226,11 +237,14 @@ static bool mtk_nor_supports_op(struct spi_mem *mem,
> > default:
> > break;
> > }
> > + } else {
> > + u8 len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes;
> > +
> > + if (len > MTK_NOR_PRG_MAX_SIZE)
> > + return false;
> > + if (op->data.nbytes && !(MTK_NOR_PRG_MAX_SIZE - len))
> > + return false;
> > }
> > - len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes;
> > - if ((len > MTK_NOR_PRG_MAX_SIZE) ||
> > - ((op->data.nbytes) && (len == MTK_NOR_PRG_MAX_SIZE)))
> > - return false;
> >
> > return spi_mem_default_supports_op(mem, op);
> > }
> > --
> > 2.28.0.681.g6f77f65b4e-goog
> >
>
>
> --
> Regards,
> Chuanhong Guo
More information about the linux-arm-kernel
mailing list