spi: spi-mtk-nor: fix op checks in supports_op

commit a59b2c7c56bf7 ("spi: spi-mtk-nor: support standard spi properties")
tries to inverse the logic of supports_op when adding
spi_mem_default_supports_op check, but it didn't get it done properly.
There are two regressions introduced by this commit:
1. reading ops supported by program mode is rejected.
2. all ops with special controller routines are incorrectly further
   checked against program mode.

This commits inverses the logic back:
1. check spi_mem_default_supports_op and reject unsupported ops first.
2. return true for ops with special controller routines.
3. check the left ops against controller program mode.

Fixes: a59b2c7c56bf7 ("spi: spi-mtk-nor: support standard spi properties")
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
Link: https://lore.kernel.org/r/20200924152730.733243-4-gch981213@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
index 4bbf38e..ea39736 100644 (file)
--- a/drivers/spi/spi-mtk-nor.c
+++ b/drivers/spi/spi-mtk-nor.c
@@ -273,7 +273,8 @@ static int mtk_nor_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
 static bool mtk_nor_supports_op(struct spi_mem *mem,
                                const struct spi_mem_op *op)
 {
-       size_t len;
+       if (!spi_mem_default_supports_op(mem, op))
+               return false;
 
        if (op->cmd.buswidth != 1)
                return false;
@@ -281,25 +282,21 @@ static bool mtk_nor_supports_op(struct spi_mem *mem,
        if ((op->addr.nbytes == 3) || (op->addr.nbytes == 4)) {
                switch(op->data.dir) {
                case SPI_MEM_DATA_IN:
-                       if (!mtk_nor_match_read(op))
-                               return false;
+                       if (mtk_nor_match_read(op))
+                               return true;
                        break;
                case SPI_MEM_DATA_OUT:
-                       if ((op->addr.buswidth != 1) ||
-                           (op->dummy.nbytes != 0) ||
-                           (op->data.buswidth != 1))
-                               return false;
+                       if ((op->addr.buswidth == 1) &&
+                           (op->dummy.nbytes == 0) &&
+                           (op->data.buswidth == 1))
+                               return true;
                        break;
                default:
                        break;
                }
        }
-       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);
+       return mtk_nor_match_prg(op);
 }
 
 static void mtk_nor_setup_bus(struct mtk_nor *sp, const struct spi_mem_op *op)