From: Ikjoon Jang <ikjn@chromium.org>
To: Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>,
devicetree@vger.kernel.org, linux-spi@vger.kernel.org,
linux-mtd@lists.infradead.org
Cc: Ikjoon Jang <ikjn@chromium.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org
Subject: [PATCH v3 2/6] spi: spi-mtk-nor: fix mishandled logics in checking SPI memory operation
Date: Fri, 25 Sep 2020 14:54:13 +0800 [thread overview]
Message-ID: <20200925145255.v3.2.I48d59ef5398f3633c6ebbab093da6b4b06495780@changeid> (raw)
In-Reply-To: <20200925065418.1077472-1-ikjn@chromium.org>
Fix a bug which limits its protocol availability in supports_op().
Fixes: a59b2c7c56bf ("spi: spi-mtk-nor: support standard spi properties")
Signed-off-by: Ikjoon Jang <ikjn@chromium.org>
---
(no changes since v1)
drivers/spi/spi-mtk-nor.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
index 6e6ca2b8e6c8..0f7d4ec68730 100644
--- a/drivers/spi/spi-mtk-nor.c
+++ b/drivers/spi/spi-mtk-nor.c
@@ -211,28 +211,24 @@ static bool mtk_nor_supports_op(struct spi_mem *mem,
if (op->cmd.buswidth != 1)
return false;
+ if (!spi_mem_default_supports_op(mem, op))
+ return false;
+
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;
- break;
- case SPI_MEM_DATA_OUT:
- if ((op->addr.buswidth != 1) ||
- (op->dummy.nbytes != 0) ||
- (op->data.buswidth != 1))
- return false;
- break;
- default:
- break;
- }
+ if ((op->data.dir == SPI_MEM_DATA_IN) && mtk_nor_match_read(op))
+ return true;
+ else if (op->data.dir == SPI_MEM_DATA_OUT)
+ return (op->addr.buswidth == 1) &&
+ (op->dummy.nbytes == 0) &&
+ (op->data.buswidth == 1);
}
+
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 true;
}
static void mtk_nor_setup_bus(struct mtk_nor *sp, const struct spi_mem_op *op)
--
2.28.0.681.g6f77f65b4e-goog
next prev parent reply other threads:[~2020-09-25 6:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 6:54 [PATCH v3 0/6] spi: spi-mtk-nor: Add mt8192 support Ikjoon Jang
2020-09-25 6:54 ` [PATCH v3 1/6] dt-bindings: spi: add mt8192-nor compatible string Ikjoon Jang
2020-09-25 6:54 ` Ikjoon Jang [this message]
2020-09-25 9:36 ` [PATCH v3 2/6] spi: spi-mtk-nor: fix mishandled logics in checking SPI memory operation Ikjoon Jang
2020-09-25 6:54 ` [PATCH v3 3/6] spi: spi-mtk-nor: support 7 bytes transfer of generic spi Ikjoon Jang
2020-09-25 7:47 ` Chuanhong Guo
2020-09-25 9:24 ` Ikjoon Jang
2020-09-25 7:53 ` Chuanhong Guo
2020-09-25 6:54 ` [PATCH v3 4/6] spi: spi-mtk-nor: use dma_alloc_coherent() for bounce buffer Ikjoon Jang
2020-09-25 8:21 ` Chuanhong Guo
2020-09-25 6:54 ` [PATCH v3 5/6] spi: spi-mtk-nor: support 36bit dma addressing Ikjoon Jang
2020-09-25 8:26 ` Chuanhong Guo
2020-09-25 9:11 ` Ikjoon Jang
2020-09-27 8:30 ` Yingjoe Chen
2020-09-28 2:18 ` Ikjoon Jang
2020-09-25 6:54 ` [PATCH v3 6/6] spi: spi-mtk-nor: Add power management support Ikjoon Jang
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=20200925145255.v3.2.I48d59ef5398f3633c6ebbab093da6b4b06495780@changeid \
--to=ikjn@chromium.org \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
/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).