[linux-yocto][v5.15/standard/preempt-rt/nxp-sdk-5.10/nxp-s32g][PATCH 2/3] s32gen1: qspi: use get_cmd_opcode to get valid opcode.

[quanyang.wang]

From: Quanyang Wang <quanyang.w...@windriver.com>

Because of upstream commit 0e30f47232ab57 ("mtd: spi-nor: add support
for DTR protocol"), the 8-8-8 DTR mode read opcode needs to be adjusted
to be "(code << 8) | code" or (code << 8 | ~ code) according to the cmd
opcode extension which is clarified as "repeat" or "revert".

Since the s32g qspi driver only recognize 8-bit cmd opcode, we need get
correct 8-8-8 read opcode from op->cmd.opcode by adding new function
get_cmd_opcode.

Signed-off-by: Quanyang Wang <quanyang.w...@windriver.com>
---
 drivers/spi/s32gen1-qspi.c | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/drivers/spi/s32gen1-qspi.c b/drivers/spi/s32gen1-qspi.c
index b5f9f566c5844..d7707e3dc10c5 100644
--- a/drivers/spi/s32gen1-qspi.c
+++ b/drivers/spi/s32gen1-qspi.c
@@ -169,6 +169,18 @@ SPI_MEM_OP(SPI_MEM_OP_CMD(0x99, 8),
           SPI_MEM_OP_NO_DUMMY,
           SPI_MEM_OP_NO_DATA);
 
+static u8 get_cmd_opcode(const struct spi_mem_op *op)
+{
+       /*
+        * No matter "repeat" or "revert" mode, valid opcode is always at
+        * the higher byte.
+        */
+       if (op->cmd.dtr)
+               return op->cmd.opcode >> 8;
+       else
+               return op->cmd.opcode;
+}
+
 static u32 clear_fifos(struct fsl_qspi *q)
 {
        u32 mcr_reg;
@@ -338,7 +350,7 @@ static bool fill_qspi_cmd(struct fsl_qspi *q,
 {
        u16 lut;
        int status;
-       u8 opcode = op->cmd.opcode;
+       u8 opcode  = get_cmd_opcode(op);
        u8 lut_cmd;
 
        switch (op->cmd.buswidth) {
@@ -475,7 +487,7 @@ static bool fill_qspi_data(struct fsl_qspi *q,
 static bool add_op_to_lutdb(struct fsl_qspi *q,
                            const struct spi_mem_op *op, u8 *index)
 {
-       u8 opcode = op->cmd.opcode;
+       u8 opcode  = get_cmd_opcode(op);
        struct lut_config *lut_conf;
        u16 lut;
        int status;
@@ -545,7 +557,7 @@ static void set_lut(struct fsl_qspi *q, u8 index, u8 opcode)
 static bool enable_op(struct fsl_qspi *q, const struct spi_mem_op *op)
 {
        u8 lut_index;
-       u8 opcode = op->cmd.opcode;
+       u8 opcode  = get_cmd_opcode(op);
 
        if (q->luts_next_config >= S32GEN1_MAX_LUTS_CONFIGS)
                return false;
@@ -568,17 +580,19 @@ static bool enable_operators(struct fsl_qspi *q,
        size_t i;
        const struct spi_mem_op *op;
        u8 *cfg;
+       u8 opcode;
 
        for (i = 0; i < n_ops; i++) {
                op = ops[i].op;
                cfg = ops[i].cfg;
+               opcode = get_cmd_opcode(op);
 
                /* In case it's already enabled */
-               q->lut_configs[op->cmd.opcode].enabled = false;
+               q->lut_configs[opcode].enabled = false;
                res = enable_op(q, op);
-               *cfg = q->lut_configs[op->cmd.opcode].index;
+               *cfg = q->lut_configs[opcode].index;
 
-               if (!res || !q->lut_configs[op->cmd.opcode].enabled)
+               if (!res || !q->lut_configs[opcode].enabled)
                        return false;
        }
 
@@ -590,11 +604,13 @@ static void disable_operators(struct fsl_qspi *q,
 {
        size_t i;
        const struct spi_mem_op *op;
+       u8 opcode;
 
        for (i = 0; i < n_ops; i++) {
                op = ops[i].op;
+               opcode = get_cmd_opcode(op);
 
-               q->lut_configs[op->cmd.opcode].enabled = false;
+               q->lut_configs[opcode].enabled = false;
        }
 }
 
@@ -1076,16 +1092,17 @@ int s32gen1_exec_op(struct spi_mem *mem, const struct 
spi_mem_op *op)
        u8 lut_cfg;
        bool enabled = false;
        int ret;
+       u8 opcode  = get_cmd_opcode(op);
 
        lut_cfg = LUT_INVALID_INDEX;
        if (!s32gen1_supports_op(mem, op))
                return -1;
 
-       enabled = q->lut_configs[op->cmd.opcode].enabled;
+       enabled = q->lut_configs[opcode].enabled;
        if (!enabled)
                return -1;
 
-       lut_cfg = q->lut_configs[op->cmd.opcode].index;
+       lut_cfg = q->lut_configs[opcode].index;
        if (lut_cfg == LUT_INVALID_INDEX)
                return -1;
 
-- 
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#11342): 
https://lists.yoctoproject.org/g/linux-yocto/message/11342
Mute This Topic: https://lists.yoctoproject.org/mt/91425135/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-