spi: cadence_qspi: Fixes for DTR ops and improve STIG support
cover spi: cadence_qspi: Fixes for DTR ops and improve STIG support
This series aims to address some critical bugs in the cadence qspi driver like the need to Flush the CMDCTRL reg after the execution due to a hardware limitation and also fixes the check conditions for DTR ops.
Logs with sf read and update commands:
https://gist.github.com/DhruvaG2000/874b3eb683bba92f25d7fe49d09f76fa
Dhruva Gole (2):
spi: cadence-quadspi: Fix check condition for DTR ops
spi: cadence-quadspi: Use STIG mode for all ops with small payload
drivers/spi/cadence_qspi.c | 16 ++++++---- drivers/spi/cadence_qspi_apb.c | 53 ++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 26 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/2 spi: cadence-quadspi: Fix check condition for DTR ops
buswidth and dtr fields in spi_mem_op are only valid when the corresponding spi_mem_op phase has a non-zero length. For example, SPI NAND core doesn't set buswidth when using SPI_MEM_OP_NO_ADDR phase.
Fix the dtr checks in set_protocol() to ignore empty spi_mem_op phases, as checking for dtr field in empty phase will result in false negatives.
--- drivers/spi/cadence_qspi.c | 11 +++++++++-- drivers/spi/cadence_qspi_apb.c | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-)
drivers/spi/cadence_qspi.c +9 -2
@@ -362,8 +362,15 @@ static bool cadence_spi_mem_supports_op(struct spi_slave *slave, {bool all_true, all_false; - all_true = op->cmd.dtr && op->addr.dtr && op->dummy.dtr && - op->data.dtr; +/* +* op->dummy.dtr is required for converting nbytes into ncycles. +* Also, don't check the dtr field of the op phase having zero nbytes. +*/ + all_true = op->cmd.dtr && + (!op->addr.nbytes || op->addr.dtr) && + (!op->dummy.nbytes || op->dummy.dtr) && + (!op->data.nbytes || op->data.dtr); + all_false = !op->cmd.dtr && !op->addr.dtr && !op->dummy.dtr && !op->data.dtr;
drivers/spi/cadence_qspi_apb.c +8 -1
@@ -120,7 +120,14 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv, {int ret; - priv->dtr = op->data.dtr && op->cmd.dtr && op->addr.dtr; +/* +* For an op to be DTR, cmd phase along with every other non-empty +* phase should have dtr field set to 1. If an op phase has zero +* nbytes, ignore its dtr field; otherwise, check its dtr field. +*/ + priv->dtr = op->cmd.dtr && + (!op->addr.nbytes || op->addr.dtr) && + (!op->data.nbytes || op->data.dtr); ret =cadence_qspi_buswidth_to_inst_type (op->cmd.buswidth);if (ret <0 )
Signature · 1 line
2.25.1
Re: [PATCH 1/2] spi: cadence-quadspi: Fix check condition for DTR ops
Quoted 2 lines · Dhruva Gole
buswidth and dtr fields in
spi_mem_opare only valid when the correspondingspi_mem_opphase has a non-zero length. For example,
Right.
Quoted 22 lines
SPI NAND core doesn't set buswidth when using
SPI_MEM_OP_NO_ADDRphase.Fix the dtr checks in
set_protocol()to ignore emptyspi_mem_opphases, as checking for dtr field in empty phase will result in false negatives.Signed-off-by Apurva Nandan <[email protected]>Signed-off-by Dhruva Gole <[email protected]>--- drivers/spi/cadence_qspi.c | 11 +++++++++-- drivers/spi/cadence_qspi_apb.c | 9 ++++++++- 2 files changed, 17 insertions(+), 3 deletions(-)drivers/spi/cadence_qspi.c +0
-0@@ -362,8 +362,15 @@ static bool cadence_spi_mem_supports_op(struct spi_slave *slave, {bool all_true, all_false;
drivers/spi/cadence_qspi.c static bool cadence_spi_mem_supports_op(struct spi_slave *slave, · line 372
Quoted 10 lines
drivers/spi/cadence_qspi.c +8
-2- all_true = op->cmd.dtr && op->addr.dtr && op->dummy.dtr && - op->data.dtr; +/* +* op->dummy.dtr is required for converting nbytes into ncycles. +* Also, don't check the dtr field of the op phase having zero nbytes. +*/ + all_true = op->cmd.dtr && + (!op->addr.nbytes || op->addr.dtr) && + (!op->dummy.nbytes || op->dummy.dtr) && + (!op->data.nbytes || op->data.dtr);
Looks good!
drivers/spi/cadence_qspi.c static bool cadence_spi_mem_supports_op(struct spi_slave *slave, · line 375
Quoted 3 lines
drivers/spi/cadence_qspi.c +1
-0+ all_false = !op->cmd.dtr && !op->addr.dtr && !op->dummy.dtr && !op->data.dtr;
Since we treat DTR as "do not care" when the phase does not exist, you should check for that here as well. What if someone _sets_ DTR for a field with nbytes == 0? This check would fail.
Since no one reasonable should do this, I will not insist upon this. Fine by me if you don't do this. Your choice.
Quoted 8 lines
drivers/spi/cadence_qspi_apb.c +0
-0@@ -120,7 +120,14 @@ static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv, {int ret;
drivers/spi/cadence_qspi_apb.c static int cadence_qspi_set_protocol(struct cadence_spi_priv *priv, · line 130
Quoted 10 lines
drivers/spi/cadence_qspi_apb.c +8
-1- priv->dtr = op->data.dtr && op->cmd.dtr && op->addr.dtr; +/* +* For an op to be DTR, cmd phase along with every other non-empty +* phase should have dtr field set to 1. If an op phase has zero +* nbytes, ignore its dtr field; otherwise, check its dtr field. +*/ + priv->dtr = op->cmd.dtr && + (!op->addr.nbytes || op->addr.dtr) && + (!op->data.nbytes || op->data.dtr);
Why not check dummy? Since supports_op() already checks that _all_ or _none_ of the fields are DTR, you can get away with just checking for op->cmd.dtr here (do add a comment here or it can be a bit confusing).
BTW, I think it would be better if you get rid of cadence_qspi_set_protocol() entirely. I see no point in carrying the state around. Wherever you use priv->dtr or priv->inst_width, etc. you also have access to the spi_mem_op. You can derive that information from the op. Something to fix when you have some free time on your hands. Will make the driver a bit simpler.
Quoted 6 lines
drivers/spi/cadence_qspi_apb.c +0
-1ret =cadence_qspi_buswidth_to_inst_type (op->cmd.buswidth);if (ret <0 ) --2.25.1
Signature · 12 lines
Regards, Pratyush Yadav Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 2/2 spi: cadence-quadspi: Use STIG mode for all ops with small payload
In reply to Dhruva GoleOSPI controller supports all types of op variants in STIG mode, only limitation being that the data payload should be less than 8 bytes when not using memory banks.
STIG mode is more stable for operations that send small data payload and is more efficient than using DMA for few bytes of memory accesses. It overcomes the limitation of minimum 4 bytes read from flash into RAM seen in DAC mode.
Use STIG mode for all read and write operations that require data input/output of less than 8 bytes from the flash, and thereby support all four phases, cmd/address/dummy/data, through OSPI STIG.
--- drivers/spi/cadence_qspi.c | 5 ++-- drivers/spi/cadence_qspi_apb.c | 44 ++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 23 deletions(-)
drivers/spi/cadence_qspi.c +2 -3
@@ -312,13 +312,12 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi,* which is unsupported on some flash devices during register * reads, prefer STIG mode for such small reads. */ -if (!op->addr.nbytes || - op->data.nbytes <=CQSPI_STIG_DATA_LEN_MAX ) +if (op->data.nbytes <=CQSPI_STIG_DATA_LEN_MAX ) mode =CQSPI_STIG_READ ;else mode =CQSPI_READ ; }else { -if (!op->addr.nbytes || !op->data.buf.out) +if (op->data.nbytes <=CQSPI_STIG_DATA_LEN_MAX ) mode =CQSPI_STIG_WRITE ;else mode =CQSPI_WRITE ;
drivers/spi/cadence_qspi_apb.c +24 -20
73 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH 2/2] spi: cadence-quadspi: Use STIG mode for all ops with small payload
Quoted 25 lines · Dhruva Gole
OSPI controller supports all types of op variants in STIG mode, only limitation being that the data payload should be less than 8 bytes when not using memory banks.
STIG mode is more stable for operations that send small data payload and is more efficient than using DMA for few bytes of memory accesses. It overcomes the limitation of minimum 4 bytes read from flash into RAM seen in DAC mode.
Use STIG mode for all read and write operations that require data input/output of less than 8 bytes from the flash, and thereby support all four phases, cmd/address/dummy/data, through OSPI STIG.
Signed-off-by Apurva Nandan <[email protected]>Signed-off-by Dhruva Gole <[email protected]>--- drivers/spi/cadence_qspi.c | 5 ++-- drivers/spi/cadence_qspi_apb.c | 44 ++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 23 deletions(-)drivers/spi/cadence_qspi.c +0
-0
drivers/spi/cadence_qspi.c static int cadence_spi_mem_exec_op(struct spi_slave *spi, · line 315
Quoted 4 lines
drivers/spi/cadence_qspi.c +0
-1@@ -312,13 +312,12 @@ static int cadence_spi_mem_exec_op(struct spi_slave *spi,* which is unsupported on some flash devices during register * reads, prefer STIG mode for such small reads. */ - if (!op->addr.nbytes ||
What if someone sends us a command that has no address phase but reads more than CQSPI_STIG_DATA_LEN_MAX bytes? You would happily send it to cadence_qspi_apb_read_setup(), which would then do reg |= (op->addr.nbytes - 1) causing an underflow and having corrputing the register.
Since there is no way to execute a command with no address phase and data bytes > CQSPI_STIG_DATA_LEN_MAX, you should add a check for this in the supports_op() hook.
drivers/spi/cadence_qspi.c static int cadence_spi_mem_exec_op(struct spi_slave *spi, · line 320
Quoted 8 lines
drivers/spi/cadence_qspi.c +2
-2- op->data.nbytes <= CQSPI_STIG_DATA_LEN_MAX) +if (op->data.nbytes <=CQSPI_STIG_DATA_LEN_MAX ) mode =CQSPI_STIG_READ ;else mode =CQSPI_READ ; }else { -if (!op->addr.nbytes || !op->data.buf.out) +if (op->data.nbytes <=CQSPI_STIG_DATA_LEN_MAX )
Same here.
drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_exec_flash_cmd(void *reg_base, unsigned int reg) · line 378
Quoted 13 lines
drivers/spi/cadence_qspi.c +0
-0mode =CQSPI_STIG_WRITE ; else mode =CQSPI_WRITE ;drivers/spi/cadence_qspi_apb.c +2
-0@@ -374,6 +374,8 @@ int cadence_qspi_apb_exec_flash_cmd(void *reg_base, unsigned int reg)if (!cadence_qspi_wait_idle (reg_base))return -EIO ; +/* Flush the CMDCTRL reg after the execution */ +writel (0 , reg_base +CQSPI_REG_CMDCTRL );
Do this in a separate patch with its own explanation please.
drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_command_read(struct cadence_spi_priv *priv, · line 467
Quoted 12 lines
drivers/spi/cadence_qspi_apb.c +0
-5return 0 ; }@@ -460,11 +462,6 @@ int cadence_qspi_apb_command_read(struct cadence_spi_priv *priv,unsigned int dummy_clk;u8 opcode; -if (rxlen >CQSPI_STIG_DATA_LEN_MAX || !rxbuf) { -printf ("QSPI: Invalid input arguments rxlen %u\n" , rxlen); -return -EINVAL ; - } -
Ok.
Quoted 12 lines
drivers/spi/cadence_qspi_apb.c +1
-1if (priv->dtr) opcode = op->cmd.opcode >>8 ;else @@ -547,26 +544,12 @@ int cadence_qspi_apb_command_write(struct cadence_spi_priv *priv,unsigned int reg =0 ;unsigned int wr_data;unsigned int wr_len; +unsigned int dummy_clk;unsigned int txlen = op->data.nbytes;const void *txbuf = op->data.buf.out;void *reg_base = priv->regbase; -u32 addr;
drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_command_write(struct cadence_spi_priv *priv, · line 563
Quoted 10 lines
drivers/spi/cadence_qspi_apb.c +0
-8u8 opcode; -/* Reorder address to SPI bus order if only transferring address */ -if (!txlen) { - addr =cpu_to_be32 (op->addr.val); -if (op->addr.nbytes ==3 ) - addr >>=8 ; - txbuf = &addr; - txlen = op->addr.nbytes; - }
You should explain why you are removing this.
Quoted 24 lines
drivers/spi/cadence_qspi_apb.c +11
-6- -if (txlen >CQSPI_STIG_DATA_LEN_MAX ) { -printf ("QSPI: Invalid input arguments txlen %u\n" , txlen); -return -EINVAL ; - } -if (priv->dtr) opcode = op->cmd.opcode >>8 ;else @@ -574,6 +557,27 @@ int cadence_qspi_apb_command_write(struct cadence_spi_priv *priv, reg |= opcode <<CQSPI_REG_CMDCTRL_OPCODE_LSB ; +/* setup ADDR BIT field */ +if (op->addr.nbytes) { +writel (op->addr.val, priv->regbase +CQSPI_REG_CMDADDRESS ); +/* +* address bytes are zero indexed +*/ + reg |= (((op->addr.nbytes -1 ) & +CQSPI_REG_CMDCTRL_ADD_BYTES_MASK ) << +CQSPI_REG_CMDCTRL_ADD_BYTES_LSB ); + reg |= (0x1 <<CQSPI_REG_CMDCTRL_ADDR_EN_LSB ); + }
drivers/spi/cadence_qspi_apb.c int cadence_qspi_apb_command_write(struct cadence_spi_priv *priv, · line 580
Quoted 10 lines
drivers/spi/cadence_qspi_apb.c +10
-0+ +/* Set up dummy cycles. */ + dummy_clk =cadence_qspi_calc_dummy (op, priv->dtr); +if (dummy_clk >CQSPI_DUMMY_CLKS_MAX ) +return -EOPNOTSUPP ; + +if (dummy_clk) + reg |= (dummy_clk &CQSPI_REG_CMDCTRL_DUMMY_MASK ) + <<CQSPI_REG_CMDCTRL_DUMMY_LSB ; +
Ok.
Quoted 3 lines
drivers/spi/cadence_qspi_apb.c +0
-0if (txlen) {/* writing data = yes */ reg |= (0x1 <<CQSPI_REG_CMDCTRL_WR_EN_LSB );
Signature · 12 lines
Regards, Pratyush Yadav Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879