mtd: spi-nor: add xSPI Octal DTR support
Subsystems (2)
v13 cover mtd: spi-nor: add xSPI Octal DTR support
Hi,
This series adds support for Octal DTR flashes in the SPI NOR framework, and then adds hooks for the Cypress Semper and Micron Xcella flashes to allow running them in Octal DTR mode. This series assumes that the flash is handed to the kernel in Legacy SPI mode.
Tested on TI J721E EVM with 1-bit ECC on the Cypress flash.
Changes in v13:
- Do not use multiple assignments in spi_nor_spimem_setup_op().
- Use EOPNOTSUPP instead of ENOTSUPP.
- Fix unbalanced braces around else statements.
- Fix whitespace alignment for spi_nor_set_read_settings() prototype.
Changes in v12:
- Rebase on latest master.
- Set dummy and data nbytes to 1 in spi_nor_spimem_check_readop() before calling spi_nor_spimem_check_op() to make sure the buswidth for them is properly set up. Similarly, set data nbytes to 1 for spi_nor_spimem_check_pp(). This makes sure we don't send the wrong dummy and data buswidth to the controller's supports_op().
- Enable DQS for Micron MT35XU512ABA. No reason not to.
- Update doc comment for spi_nor_parse_profile1() and spi_nor_cypress_octal_dtr_enable() to add missing fields.
Changes in v11:
- Add helpers spi_nor_{read,write}_reg() to make it easier to reject DTR ops for them.
- Add helper for spi_nor_controller_ops_erase() to make it easier to reject DTR ops.
- s/spi-mem/SPIMEM/ and s/spi-nor/SPI NOR/
- Avoid enabling 4-byte addressing mode for all DTR ops instead of just Octal DTR ops. This is based on the assumption that DTR ops can only use 4-byte addressing.
- Use round_up() instead of defining ROUND_UP_TO().
- Rename 'table' to 'dwords' in xSPI Profile 1.0 parsing.
- Re-order Profile 1.0 related defines by DWORD order.
- Move rdsr parameter parsing to where opcode is parsed because it is from the same DWORD.
- Drop local variables addr_width and dummy in spi_nor_read_sr() spi_nor_read_fsr().
- Allow soft reset for all protocols, not just 8D-8D-8D.
- Do not set address value to 0 is spi_nor_read_sr() and spi_nor_read_fsr(). It is 0 by default when we create the op.
- Do not make having command opcode extension as a reserved field fatal.
- Introduce the flag SPI_NOR_OCTAL_DTR_PP to indicate 8D page program support since it can't be detected from SFDP.
- Move the call to spi_nor_spimem_setup_op() in spi_nor_read_sr() to the commit which introduces it.
- Convert a comment in Profile 1.0 parsing from multi-line to one line.
Changes in v10:
- Rebase on latest linux-next/master. Drop a couple patches that made it in the previous release.
- Move the code that sets 20 dummy cycles for MT35XU512ABA to its octal enable function. This way, if the controller doesn't support 8D mode 20 dummy cycles won't be used.
Changes in v9:
- Do not use '& 0xff' to get the opcode LSB in spi-mxic and spi-zynq-qspi. The cast to u8 will do that anyway.
- Do not use if (opcode) as a check for whether the command phase exists in spi-zynq-qspi because the opcode 0 can be valid. Use the new cmd.nbytes instead.
Changes in v8:
- Move controller changes in spi-mxic to the commit which introduces 2-byte opcodes to avoid problems when bisecting.
- Replace usage of sizeof(op->cmd.opcode) with op->cmd.nbytes.
- Extract opcode in spi-zynq-qspi instead of using &op->cmd.opcode.
Changes in v7:
- Reject ops with more than 1 command byte in
spi_mem_default_supports_op().
- Reject ops with more than 1 command byte in atmel and mtk controllers.
- Reject ops with 0 command bytes in spi_mem_check_op().
- Set cmd.nbytes to 1 when using SPI_MEM_OP_CMD().
- Avoid endianness problems in spi-mxic.
Changes in v6:
- Instead of hard-coding 8D-8D-8D Fast Read dummy cycles to 20, find them out from the Profile 1.0 table.
Changes in v5:
- Do not enable stateful X-X-X modes if the reset line is broken.
- Instead of setting SNOR_READ_HWCAPS_8_8_8_DTR from Profile 1.0 table parsing, do it in spi_nor_info_init_params() instead based on the SPI_NOR_OCTAL_DTR_READ flag instead.
- Set SNOR_HWCAPS_PP_8_8_8_DTR in s28hs post_sfdp hook since this capability is no longer set in Profile 1.0 parsing.
- Instead of just checking for spi_nor_get_protocol_width() in spi_nor_octal_dtr_enable(), make sure the protocol is SNOR_PROTO_8_8_8_DTR since get_protocol_width() only cares about data width.
- Drop flag SPI_NOR_SOFT_RESET. Instead, discover soft reset capability via BFPT.
- Do not make an invalid Quad Enable BFPT field a fatal error. Silently ignore it by assuming no quad enable bit is present.
- Set dummy cycles for Cypress Semper flash to 24 instead of 20. This allows for 200MHz operation in 8D mode compared to the 166MHz with 20.
- Rename spi_nor_cypress_octal_enable() to
spi_nor_cypress_octal_dtr_enable().
- Update spi-mtk-nor.c to reject DTR ops since it doesn't call spi_mem_default_supports_op().
Changes in v4:
- Refactor the series to use the new spi-nor framework with the manufacturer-specific bits separated from the core.
- Add support for Micron MT35XU512ABA.
- Use cmd.nbytes as the criteria of whether the data phase exists or not instead of cmd.buf.in || cmd.buf.out in spi_nor_spimem_setup_op().
- Update Read FSR to use the same dummy cycles and address width as Read SR.
- Fix BFPT parsing stopping too early for JESD216 rev B flashes.
- Use 2 byte reads for Read SR and FSR commands in DTR mode.
Changes in v3:
- Drop the DT properties "spi-rx-dtr" and "spi-tx-dtr". Instead, if later a need is felt to disable DTR in case someone has a board with Octal DTR capable flash but does not support DTR transactions for some reason, a property like "spi-no-dtr" can be added.
- Remove mode bits SPI_RX_DTR and SPI_TX_DTR.
- Remove the Cadence Quadspi controller patch to un-block this series. I will submit it as a separate patch.
- Rebase on latest 'master' and fix merge conflicts.
- Update read and write dirmap templates to use DTR.
- Rename 'is_dtr' to 'dtr'.
- Make 'dtr' a bitfield.
- Reject DTR ops in spi_mem_default_supports_op().
- Update atmel-quadspi to reject DTR ops. All other controller drivers call spi_mem_default_supports_op() so they will automatically reject DTR ops.
- Add support for both enabling and disabling DTR modes.
- Perform a Software Reset on flashes that support it when shutting down.
- Disable Octal DTR mode on suspend, and re-enable it on resume.
- Drop enum 'spi_mem_cmd_ext' and make command opcode u16 instead. Update spi-nor to use the 2-byte command instead of the command extension. Since we still need a "extension type", mode that enum to spi-nor and name it 'spi_nor_cmd_ext'.
- Default variable address width to 3 to fix SMPT parsing.
- Drop non-volatile change to uniform sector mode and rely on parsing SMPT.
Changes in v2:
- Add DT properties "spi-rx-dtr" and "spi-tx-dtr" to allow expressing DTR capabilities.
- Set the mode bits SPI_RX_DTR and SPI_TX_DTR when we discover the DT properties "spi-rx-dtr" and spi-tx-dtr".
- spi_nor_cypress_octal_enable() was updating nor->params.read[] with the intention of setting the correct number of dummy cycles. But this function is called _after_ selecting the read so setting nor->params.read[] will have no effect. So, update nor->read_dummy directly.
- Fix spi_nor_spimem_check_readop() and spi_nor_spimem_check_pp() passing nor->read_proto and nor->write_proto to spi_nor_spimem_setup_op() instead of read->proto and pp->proto respectively.
- Move the call to cqspi_setup_opcode_ext() inside cqspi_enable_dtr(). This avoids repeating the 'if (f_pdata->is_dtr) cqspi_setup_opcode_ext()...` snippet multiple times.
- Call the default 'supports_op()' from cqspi_supports_mem_op(). This makes sure the buswidth requirements are also enforced along with the DTR requirements.
- Drop the 'is_dtr' argument from spi_check_dtr_req(). We only call it when a phase is DTR so it is redundant.
Pratyush Yadav (15):
mtd: spi-nor: core: use EOPNOTSUPP instead of ENOTSUPP
mtd: spi-nor: core: add spi_nor_{read,write}_reg() helpers
mtd: spi-nor: core: add spi_nor_controller_ops_erase helper
mtd: spi-nor: add support for DTR protocol
mtd: spi-nor: sfdp: get command opcode extension type from BFPT
mtd: spi-nor: sfdp: parse xSPI Profile 1.0 table
mtd: spi-nor: core: use dummy cycle and address width info from SFDP
mtd: spi-nor: core: do 2 byte reads for SR and FSR in DTR mode
mtd: spi-nor: core: enable octal DTR mode when possible
mtd: spi-nor: sfdp: detect Soft Reset sequence support from BFPT
mtd: spi-nor: core: perform a Soft Reset on shutdown
mtd: spi-nor: core: disable Octal DTR mode on suspend.
mtd: spi-nor: core: expose spi_nor_default_setup() in core.h
mtd: spi-nor: spansion: add support for Cypress Semper flash
mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode
drivers/mtd/spi-nor/core.c | 429 ++++++++++++++++++++++++++------ drivers/mtd/spi-nor/core.h | 23 ++ drivers/mtd/spi-nor/micron-st.c | 102 +++++++- drivers/mtd/spi-nor/sfdp.c | 122 ++++++++- drivers/mtd/spi-nor/sfdp.h | 8 + drivers/mtd/spi-nor/spansion.c | 166 ++++++++++++ include/linux/mtd/spi-nor.h | 53 +++- 7 files changed, 805 insertions(+), 98 deletions(-)
--
2.28.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v13 1/15 mtd: spi-nor: core: use EOPNOTSUPP instead of ENOTSUPP
ENOTSUPP is not a SUSV4 error code. Using EOPNOTSUPP is preferred in its stead.
--- drivers/mtd/spi-nor/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mtd/spi-nor/core.c +5 -5
@@ -2297,7 +2297,7 @@ static int spi_nor_hwcaps_pp2cmd(u32 hwcaps)*@nor: pointer to a 'struct spi_nor' *@op: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_op (struct spi_nor *nor,struct spi_mem_op *op)
@@ -2311,12 +2311,12 @@ static int spi_nor_spimem_check_op(struct spi_nor *nor, op->addr.nbytes =4 ;if (!spi_mem_supports_op (nor->spimem, op)) {if (nor->mtd.size >SZ_16M ) -return -ENOTSUPP ; +return -EOPNOTSUPP ;/* If flash size <= 16MB, 3 address bytes are sufficient */ op->addr.nbytes =3 ;if (!spi_mem_supports_op (nor->spimem, op)) -return -ENOTSUPP ; +return -EOPNOTSUPP ; }return 0 ;
@@ -2328,7 +2328,7 @@ static int spi_nor_spimem_check_op(struct spi_nor *nor,*@nor: pointer to a 'struct spi_nor' *@read: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_readop (struct spi_nor *nor,const struct spi_nor_read_command *read)
@@ -2354,7 +2354,7 @@ static int spi_nor_spimem_check_readop(struct spi_nor *nor,*@nor: pointer to a 'struct spi_nor' *@pp: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_pp (struct spi_nor *nor,const struct spi_nor_pp_command *pp)
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 01/15] mtd: spi-nor: core: use EOPNOTSUPP instead of ENOTSUPP
Quoted 6 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
ENOTSUPP is not a SUSV4 error code. Using EOPNOTSUPP is preferred in its stead.
Signed-off-by Pratyush Yadav <[email protected]>
Quoted 51 lines
--- drivers/mtd/spi-nor/core.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/mtd/spi-nor/core.c +5
-6@@ -2297,7 +2297,7 @@ static int spi_nor_hwcaps_pp2cmd(u32 hwcaps)*@nor: pointer to a 'struct spi_nor' *@op: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_op (struct spi_nor *nor,struct spi_mem_op *op)@@ -2311,12 +2311,12 @@ static int spi_nor_spimem_check_op(struct spi_nor *nor, op->addr.nbytes =4 ;if (!spi_mem_supports_op (nor->spimem, op)) {if (nor->mtd.size >SZ_16M ) -return -ENOTSUPP ; +return -EOPNOTSUPP ;/* If flash size <= 16MB, 3 address bytes are sufficient */ op->addr.nbytes =3 ;if (!spi_mem_supports_op (nor->spimem, op)) -return -ENOTSUPP ; +return -EOPNOTSUPP ; }return 0 ;@@ -2328,7 +2328,7 @@ static int spi_nor_spimem_check_op(struct spi_nor *nor,*@nor: pointer to a 'struct spi_nor' *@read: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_readop (struct spi_nor *nor,const struct spi_nor_read_command *read)@@ -2354,7 +2354,7 @@ static int spi_nor_spimem_check_readop(struct spi_nor *nor,*@nor: pointer to a 'struct spi_nor' *@pp: pointer to op template to be checked * -* Returns 0 if operation is supported, -ENOTSUPP otherwise. +* Returns 0 if operation is supported, -EOPNOTSUPP otherwise. */ static int spi_nor_spimem_check_pp (struct spi_nor *nor,const struct spi_nor_pp_command *pp) --
Quoted 2 lines
2.28.0
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v13 2/15 mtd: spi-nor: core: add spi_nor_{read,write}_reg() helpers
In reply to Pratyush YadavThey are thin wrappers around nor->controller_ops->{read,write}_reg(). In a future commit DTR support will be added. These ops can not be supported by the {read,write}_reg() hooks and these helpers will make it easier to reject those calls.
--- drivers/mtd/spi-nor/core.c | 65 +++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 33 deletions(-)
drivers/mtd/spi-nor/core.c +32 -33
@@ -82,6 +82,18 @@ static int spi_nor_spimem_exec_op(struct spi_nor *nor, struct spi_mem_op *op)return spi_mem_exec_op (nor->spimem, op); } +static int spi_nor_read_reg (struct spi_nor *nor,u8 opcode,u8 *buf, +size_t len) +{ +return nor->controller_ops->read_reg (nor, opcode, buf, len); +} + +static int spi_nor_write_reg (struct spi_nor *nor,u8 opcode,const u8 *buf, +size_t len) +{ +return nor->controller_ops->write_reg (nor, opcode, buf, len); +} +/** * spi_nor_spimem_read_data() - read data from flash's memory region via * spi-mem
@@ -229,8 +241,7 @@ int spi_nor_write_enable(struct spi_nor *nor) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_WREN , -NULL ,0 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_WREN ,NULL ,0 ); }if (ret)
@@ -258,8 +269,7 @@ int spi_nor_write_disable(struct spi_nor *nor) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_WRDI , -NULL ,0 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 ); }if (ret)
@@ -289,8 +299,7 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->read_reg (nor,SPINOR_OP_RDSR , - sr,1 ); + ret =spi_nor_read_reg (nor,SPINOR_OP_RDSR , sr,1 ); }if (ret)
@@ -320,8 +329,7 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->read_reg (nor,SPINOR_OP_RDFSR , - fsr,1 ); + ret =spi_nor_read_reg (nor,SPINOR_OP_RDFSR , fsr,1 ); }if (ret)
@@ -352,7 +360,7 @@ static int spi_nor_read_cr(struct spi_nor *nor, u8 *cr) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->read_reg (nor,SPINOR_OP_RDCR , cr,1 ); + ret =spi_nor_read_reg (nor,SPINOR_OP_RDCR , cr,1 ); }if (ret)
@@ -385,10 +393,10 @@ int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor, - enable ?SPINOR_OP_EN4B : -SPINOR_OP_EX4B , -NULL ,0 ); + ret =spi_nor_write_reg (nor, + enable ?SPINOR_OP_EN4B : +SPINOR_OP_EX4B , +NULL ,0 ); }if (ret)
@@ -421,8 +429,7 @@ static int spansion_set_4byte_addr_mode(struct spi_nor *nor, bool enable) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_BRWR , - nor->bouncebuf,1 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_BRWR , nor->bouncebuf,1 ); }if (ret)
@@ -453,8 +460,7 @@ int spi_nor_write_ear(struct spi_nor *nor, u8 ear) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_WREAR , - nor->bouncebuf,1 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_WREAR , nor->bouncebuf,1 ); }if (ret)
@@ -484,8 +490,7 @@ int spi_nor_xread_sr(struct spi_nor *nor, u8 *sr) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->read_reg (nor,SPINOR_OP_XRDSR , - sr,1 ); + ret =spi_nor_read_reg (nor,SPINOR_OP_XRDSR , sr,1 ); }if (ret)
@@ -529,8 +534,7 @@ static void spi_nor_clear_sr(struct spi_nor *nor) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_CLSR , -NULL ,0 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_CLSR ,NULL ,0 ); }if (ret)
@@ -593,8 +597,7 @@ static void spi_nor_clear_fsr(struct spi_nor *nor) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_CLFSR , -NULL ,0 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_CLFSR ,NULL ,0 ); }if (ret)
@@ -737,8 +740,7 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_WRSR , - sr, len); + ret =spi_nor_write_reg (nor,SPINOR_OP_WRSR , sr, len); }if (ret) {
@@ -939,8 +941,7 @@ static int spi_nor_write_sr2(struct spi_nor *nor, const u8 *sr2) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_WRSR2 , - sr2,1 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_WRSR2 , sr2,1 ); }if (ret) {
@@ -973,8 +974,7 @@ static int spi_nor_read_sr2(struct spi_nor *nor, u8 *sr2) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->read_reg (nor,SPINOR_OP_RDSR2 , - sr2,1 ); + ret =spi_nor_read_reg (nor,SPINOR_OP_RDSR2 , sr2,1 ); }if (ret)
@@ -1004,8 +1004,7 @@ static int spi_nor_erase_chip(struct spi_nor *nor) ret =spi_mem_exec_op (nor->spimem, &op); }else { - ret = nor->controller_ops->write_reg (nor,SPINOR_OP_CHIP_ERASE , -NULL ,0 ); + ret =spi_nor_write_reg (nor,SPINOR_OP_CHIP_ERASE ,NULL ,0 ); }if (ret)
@@ -1158,8 +1157,8 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr) addr >>=8 ; } -return nor->controller_ops->write_reg (nor, nor->erase_opcode, - nor->bouncebuf, nor->addr_width); +return spi_nor_write_reg (nor, nor->erase_opcode, nor->bouncebuf, + nor->addr_width); }/**
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 02/15] mtd: spi-nor: core: add spi_nor_{read,write}_reg() helpers
Quoted 4 lines · Pratyush Yadav
They are thin wrappers around nor->controller_ops->{read,write}_reg(). In a future commit DTR support will be added. These ops can not be supported by the {read,write}_reg() hooks and these helpers will make it easier to reject those calls.
2/15 and 3/15 are introducing wrappers for the controller ops. How about squashing the commits and using the same naming scheme?
spi_nor_controller_ops_{read_reg,write_reg,erase}
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 02/15] mtd: spi-nor: core: add spi_nor_{read,write}_reg() helpers
Quoted 10 lines · On 29/09/20 11:38AM, [email protected] wrote:
Quoted 4 lines · Pratyush Yadav
They are thin wrappers around nor->controller_ops->{read,write}_reg(). In a future commit DTR support will be added. These ops can not be supported by the {read,write}_reg() hooks and these helpers will make it easier to reject those calls.
2/15 and 3/15 are introducing wrappers for the controller ops. How about squashing the commits and using the same naming scheme?
spi_nor_controller_ops_{read_reg,write_reg,erase}
Ok. Will do. For my information, the patches will still go in this merge window, right?
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 3/15 mtd: spi-nor: core: add spi_nor_controller_ops_erase helper
In reply to Pratyush YadavIt is a thin wrapper around nor->controller_ops->erase(). In a future commit DTR support will be added. These ops can not be supported by the erase() hook and this helper will make it easier to reject those calls.
--- drivers/mtd/spi-nor/core.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +6 -1
@@ -94,6 +94,11 @@ static int spi_nor_write_reg(struct spi_nor *nor, u8 opcode, const u8 *buf,return nor->controller_ops->write_reg (nor, opcode, buf, len); } +static int spi_nor_controller_ops_erase (struct spi_nor *nor,loff_t offs) +{ +return nor->controller_ops->erase (nor, offs); +} +/** * spi_nor_spimem_read_data() - read data from flash's memory region via * spi-mem
@@ -1145,7 +1150,7 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr)return spi_mem_exec_op (nor->spimem, &op); }else if (nor->controller_ops->erase) { -return nor->controller_ops->erase (nor, addr); +return spi_nor_controller_ops_erase (nor, addr); }/*
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v13 4/15 mtd: spi-nor: add support for DTR protocol
In reply to Pratyush YadavDouble Transfer Rate (DTR) is SPI protocol in which data is transferred on each clock edge as opposed to on each clock cycle. Make framework-level changes to allow supporting flashes in DTR mode.
Right now, mixed DTR modes are not supported. So, for example a mode like 4S-4D-4D will not work. All phases need to be either DTR or STR.
--- drivers/mtd/spi-nor/core.c | 222 +++++++++++++++++++++++++++++------- drivers/mtd/spi-nor/core.h | 7 ++ drivers/mtd/spi-nor/sfdp.c | 9 +- include/linux/mtd/spi-nor.h | 51 ++++++--- 4 files changed, 236 insertions(+), 53 deletions(-)
drivers/mtd/spi-nor/core.c +183 -39
@@ -40,6 +40,78 @@#define SPI_NOR_MAX_ADDR_WIDTH 4 +/** +* spi_nor_get_cmd_ext() - Get the command opcode extension based on the +* extension type. +* @nor: pointer to a 'struct spi_nor' +* @op: pointer to the 'struct spi_mem_op' whose properties +* need to be initialized. +* +* Right now, only "repeat" and "invert" are supported. +* +* Return: The opcode extension. +*/ +static u8 spi_nor_get_cmd_ext (const struct spi_nor *nor, +const struct spi_mem_op *op) +{ +switch (nor->cmd_ext_type) { +case SPI_NOR_EXT_INVERT : +return ~op->cmd.opcode; + +case SPI_NOR_EXT_REPEAT : +return op->cmd.opcode; + +default : +dev_err (nor->dev,"Unknown command extension type\n" ); +return 0 ; + } +} + +/** +* spi_nor_spimem_setup_op() - Set up common properties of a spi-mem op. +* @nor: pointer to a 'struct spi_nor' +* @op: pointer to the 'struct spi_mem_op' whose properties +* need to be initialized. +* @proto: the protocol from which the properties need to be set. +*/ +void spi_nor_spimem_setup_op (const struct spi_nor *nor, +struct spi_mem_op *op, +const enum spi_nor_protocol proto) +{ +u8 ext; + + op->cmd.buswidth =spi_nor_get_protocol_inst_nbits (proto); + +if (op->addr.nbytes) + op->addr.buswidth =spi_nor_get_protocol_addr_nbits (proto); + +if (op->dummy.nbytes) + op->dummy.buswidth =spi_nor_get_protocol_addr_nbits (proto); + +if (op->data.nbytes) + op->data.buswidth =spi_nor_get_protocol_data_nbits (proto); + +if (spi_nor_protocol_is_dtr (proto)) { +/* +* SPIMEM supports mixed DTR modes, but right now we can only +* have all phases either DTR or STR. IOW, SPIMEM can have +* something like 4S-4D-4D, but SPI NOR can't. So, set all 4 +* phases to either DTR or STR. +*/ + op->cmd.dtr = true; + op->addr.dtr = true; + op->dummy.dtr = true; + op->data.dtr = true; + +/* 2 bytes per clock cycle in DTR mode. */ + op->dummy.nbytes *=2 ; + + ext =spi_nor_get_cmd_ext (nor, op); + op->cmd.opcode = (op->cmd.opcode <<8 ) | ext; + op->cmd.nbytes =2 ; + } +} +/** * spi_nor_spimem_bounce() - check if a bounce buffer is needed for the data * transfer
@@ -85,17 +157,26 @@ static int spi_nor_spimem_exec_op(struct spi_nor *nor, struct spi_mem_op *op)static int spi_nor_read_reg (struct spi_nor *nor,u8 opcode,u8 *buf,size_t len) { +if (spi_nor_protocol_is_dtr (nor->reg_proto)) +return -EOPNOTSUPP ; +return nor->controller_ops->read_reg (nor, opcode, buf, len); }static int spi_nor_write_reg (struct spi_nor *nor,u8 opcode,const u8 *buf,size_t len) { +if (spi_nor_protocol_is_dtr (nor->reg_proto)) +return -EOPNOTSUPP ; +return nor->controller_ops->write_reg (nor, opcode, buf, len); }static int spi_nor_controller_ops_erase (struct spi_nor *nor,loff_t offs) { +if (spi_nor_protocol_is_dtr (nor->write_proto)) +return -EOPNOTSUPP ; +return nor->controller_ops->erase (nor, offs); }
@@ -121,14 +202,12 @@ static ssize_t spi_nor_spimem_read_data(struct spi_nor *nor, loff_t from,ssize_t nbytes;int error; -/* get transfer protocols. */ - op.cmd.buswidth =spi_nor_get_protocol_inst_nbits (nor->read_proto); - op.addr.buswidth =spi_nor_get_protocol_addr_nbits (nor->read_proto); - op.dummy.buswidth = op.addr.buswidth; - op.data.buswidth =spi_nor_get_protocol_data_nbits (nor->read_proto); +spi_nor_spimem_setup_op (nor, &op, nor->read_proto);/* convert the dummy cycles to the number of bytes */ op.dummy.nbytes = (nor->read_dummy * op.dummy.buswidth) /8 ; +if (spi_nor_protocol_is_dtr (nor->read_proto)) + op.dummy.nbytes *=2 ; usebouncebuf =spi_nor_spimem_bounce (nor, &op);
@@ -186,13 +265,11 @@ static ssize_t spi_nor_spimem_write_data(struct spi_nor *nor, loff_t to,ssize_t nbytes;int error; - op.cmd.buswidth =spi_nor_get_protocol_inst_nbits (nor->write_proto); - op.addr.buswidth =spi_nor_get_protocol_addr_nbits (nor->write_proto); - op.data.buswidth =spi_nor_get_protocol_data_nbits (nor->write_proto); -if (nor->program_opcode ==SPINOR_OP_AAI_WP && nor->sst_write_second) op.addr.nbytes =0 ; +spi_nor_spimem_setup_op (nor, &op, nor->write_proto); +if (spi_nor_spimem_bounce (nor, &op))memcpy (nor->bouncebuf, buf, op.data.nbytes);
@@ -244,6 +321,8 @@ int spi_nor_write_enable(struct spi_nor *nor)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_WREN ,NULL ,0 );
@@ -272,6 +351,8 @@ int spi_nor_write_disable(struct spi_nor *nor)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_WRDI ,NULL ,0 );
@@ -302,6 +383,8 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, sr, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_read_reg (nor,SPINOR_OP_RDSR , sr,1 );
@@ -332,6 +415,8 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, fsr, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_read_reg (nor,SPINOR_OP_RDFSR , fsr,1 );
@@ -363,6 +448,8 @@ static int spi_nor_read_cr(struct spi_nor *nor, u8 *cr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, cr, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_read_reg (nor,SPINOR_OP_RDCR , cr,1 );
@@ -396,6 +483,8 @@ int spi_nor_set_4byte_addr_mode(struct spi_nor *nor, bool enable)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret = spi_nor_write_reg(nor,
@@ -432,6 +521,8 @@ static int spansion_set_4byte_addr_mode(struct spi_nor *nor, bool enable)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_OUT(1, nor->bouncebuf, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_BRWR , nor->bouncebuf,1 );
@@ -463,6 +554,8 @@ int spi_nor_write_ear(struct spi_nor *nor, u8 ear)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_OUT(1, nor->bouncebuf, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_WREAR , nor->bouncebuf,1 );
@@ -493,6 +586,8 @@ int spi_nor_xread_sr(struct spi_nor *nor, u8 *sr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, sr, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_read_reg (nor,SPINOR_OP_XRDSR , sr,1 );
@@ -537,6 +632,8 @@ static void spi_nor_clear_sr(struct spi_nor *nor)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_CLSR ,NULL ,0 );
@@ -600,6 +697,8 @@ static void spi_nor_clear_fsr(struct spi_nor *nor)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_CLFSR ,NULL ,0 );
@@ -743,6 +842,8 @@ static int spi_nor_write_sr(struct spi_nor *nor, const u8 *sr, size_t len)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_OUT(len, sr, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_WRSR , sr, len);
@@ -944,6 +1045,8 @@ static int spi_nor_write_sr2(struct spi_nor *nor, const u8 *sr2)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_OUT(1, sr2, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_WRSR2 , sr2,1 );
@@ -977,6 +1080,8 @@ static int spi_nor_read_sr2(struct spi_nor *nor, u8 *sr2)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, sr2, 1)); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_read_reg (nor,SPINOR_OP_RDSR2 , sr2,1 );
@@ -1007,6 +1112,8 @@ static int spi_nor_erase_chip(struct spi_nor *nor)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->write_proto); + ret =spi_mem_exec_op (nor->spimem, &op); }else { ret =spi_nor_write_reg (nor,SPINOR_OP_CHIP_ERASE ,NULL ,0 );
@@ -1148,6 +1255,8 @@ static int spi_nor_erase_sector(struct spi_nor *nor, u32 addr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->write_proto); +return spi_mem_exec_op (nor->spimem, &op); }else if (nor->controller_ops->erase) {return spi_nor_controller_ops_erase (nor, addr);
@@ -2273,6 +2382,7 @@ int spi_nor_hwcaps_read2cmd(u32 hwcaps) { SNOR_HWCAPS_READ_1_8_8, SNOR_CMD_READ_1_8_8 }, { SNOR_HWCAPS_READ_8_8_8, SNOR_CMD_READ_8_8_8 }, { SNOR_HWCAPS_READ_1_8_8_DTR, SNOR_CMD_READ_1_8_8_DTR }, + { SNOR_HWCAPS_READ_8_8_8_DTR, SNOR_CMD_READ_8_8_8_DTR }, }; return spi_nor_hwcaps2cmd(hwcaps, hwcaps_read2cmd,
@@ -2289,6 +2399,7 @@ static int spi_nor_hwcaps_pp2cmd(u32 hwcaps) { SNOR_HWCAPS_PP_1_1_8, SNOR_CMD_PP_1_1_8 }, { SNOR_HWCAPS_PP_1_8_8, SNOR_CMD_PP_1_8_8 }, { SNOR_HWCAPS_PP_8_8_8, SNOR_CMD_PP_8_8_8 }, + { SNOR_HWCAPS_PP_8_8_8_DTR, SNOR_CMD_PP_8_8_8_DTR }, }; return spi_nor_hwcaps2cmd(hwcaps, hwcaps_pp2cmd,
@@ -2339,15 +2450,15 @@ static int spi_nor_spimem_check_readop(struct spi_nor *nor, {struct spi_mem_op op =SPI_MEM_OP (SPI_MEM_OP_CMD (read->opcode,1 ),SPI_MEM_OP_ADDR (3 ,0 ,1 ), -SPI_MEM_OP_DUMMY (0 ,1 ), -SPI_MEM_OP_DATA_IN (0 ,NULL ,1 )); +SPI_MEM_OP_DUMMY (1 ,1 ), +SPI_MEM_OP_DATA_IN (1 ,NULL ,1 )); - op.cmd.buswidth =spi_nor_get_protocol_inst_nbits (read->proto); - op.addr.buswidth =spi_nor_get_protocol_addr_nbits (read->proto); - op.data.buswidth =spi_nor_get_protocol_data_nbits (read->proto); - op.dummy.buswidth = op.addr.buswidth; - op.dummy.nbytes = (read->num_mode_clocks + read->num_wait_states) * - op.dummy.buswidth /8 ; +spi_nor_spimem_setup_op (nor, &op, read->proto); + +/* convert the dummy cycles to the number of bytes */ + op.dummy.nbytes = (nor->read_dummy * op.dummy.buswidth) /8 ; +if (spi_nor_protocol_is_dtr (nor->read_proto)) + op.dummy.nbytes *=2 ;return spi_nor_spimem_check_op (nor, &op); }
@@ -2366,11 +2477,9 @@ static int spi_nor_spimem_check_pp(struct spi_nor *nor,struct spi_mem_op op =SPI_MEM_OP (SPI_MEM_OP_CMD (pp->opcode,1 ),SPI_MEM_OP_ADDR (3 ,0 ,1 ),SPI_MEM_OP_NO_DUMMY , -SPI_MEM_OP_DATA_OUT (0 ,NULL ,1 )); +SPI_MEM_OP_DATA_OUT (1 ,NULL ,1 )); - op.cmd.buswidth =spi_nor_get_protocol_inst_nbits (pp->proto); - op.addr.buswidth =spi_nor_get_protocol_addr_nbits (pp->proto); - op.data.buswidth =spi_nor_get_protocol_data_nbits (pp->proto); +spi_nor_spimem_setup_op (nor, &op, pp->proto);return spi_nor_spimem_check_op (nor, &op); }
@@ -2388,12 +2497,16 @@ spi_nor_spimem_adjust_hwcaps(struct spi_nor *nor, u32 *hwcaps)struct spi_nor_flash_parameter *params = nor->params;unsigned int cap; -/* DTR modes are not supported yet, mask them all. */ - *hwcaps &= ~SNOR_HWCAPS_DTR ; -/* X-X-X modes are not supported yet, mask them all. */ *hwcaps &= ~SNOR_HWCAPS_X_X_X ; +/* +* If the reset line is broken, we do not want to enter a stateful +* mode. +*/ +if (nor->flags &SNOR_F_BROKEN_RESET ) + *hwcaps &= ~(SNOR_HWCAPS_X_X_X |SNOR_HWCAPS_X_X_X_DTR ); +for (cap =0 ; cap <sizeof (*hwcaps) *BITS_PER_BYTE ; cap++) {int rdidx, ppidx;
@@ -2648,7 +2761,7 @@ static int spi_nor_default_setup(struct spi_nor *nor,* controller directly implements the spi_nor interface. * Yet another reason to switch to spi-mem. */ - ignored_mask =SNOR_HWCAPS_X_X_X ; + ignored_mask =SNOR_HWCAPS_X_X_X |SNOR_HWCAPS_X_X_X_DTR ;if (shared_mask & ignored_mask) {dev_dbg (nor->dev,"SPI n-n-n protocols are not supported.\n" );
@@ -2794,11 +2907,28 @@ static void spi_nor_info_init_params(struct spi_nor *nor) SNOR_PROTO_1_1_8); } +if (info->flags &SPI_NOR_OCTAL_DTR_READ ) { + params->hwcaps.mask |=SNOR_HWCAPS_READ_8_8_8_DTR ; +spi_nor_set_read_settings (¶ms->reads[SNOR_CMD_READ_8_8_8_DTR ], +0 ,20 ,SPINOR_OP_READ_FAST , +SNOR_PROTO_8_8_8_DTR ); + } +/* Page Program settings. */ params->hwcaps.mask |=SNOR_HWCAPS_PP ;spi_nor_set_pp_settings (¶ms->page_programs[SNOR_CMD_PP ],SPINOR_OP_PP ,SNOR_PROTO_1_1_1 ); +if (info->flags &SPI_NOR_OCTAL_DTR_PP ) { + params->hwcaps.mask |=SNOR_HWCAPS_PP_8_8_8_DTR ; +/* +* Since xSPI Page Program opcode is backward compatible with +* Legacy SPI, use Legacy SPI opcode there as well. +*/ +spi_nor_set_pp_settings (¶ms->page_programs[SNOR_CMD_PP_8_8_8_DTR ], +SPINOR_OP_PP ,SNOR_PROTO_8_8_8_DTR ); + } +/* * Sector Erase settings. Sort Erase Types in ascending order, with the * smallest erase size starting at BIT(0).
@@ -2906,7 +3036,8 @@ static int spi_nor_init_params(struct spi_nor *nor)spi_nor_manufacturer_init_params (nor); -if ((nor->info->flags & (SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ )) && +if ((nor->info->flags & (SPI_NOR_DUAL_READ |SPI_NOR_QUAD_READ | +SPI_NOR_OCTAL_READ |SPI_NOR_OCTAL_DTR_READ )) && !(nor->info->flags &SPI_NOR_SKIP_SFDP ))spi_nor_sfdp_init_params (nor);
@@ -2969,7 +3100,9 @@ static int spi_nor_init(struct spi_nor *nor)return err; } -if (nor->addr_width ==4 && !(nor->flags &SNOR_F_4B_OPCODES )) { +if (nor->addr_width ==4 && + !spi_nor_protocol_is_dtr (nor->read_proto) && + !(nor->flags &SNOR_F_4B_OPCODES )) {/* * If the RESET# pin isn't hooked up properly, or the system * otherwise doesn't perform a reset command in the boot
@@ -3028,7 +3161,10 @@ static const struct flash_info *spi_nor_match_id(struct spi_nor *nor,static int spi_nor_set_addr_width (struct spi_nor *nor) { -if (nor->addr_width) { +if (spi_nor_protocol_is_dtr (nor->read_proto)) { +/* Always use 4-byte addresses in DTR mode. */ + nor->addr_width =4 ; + }else if (nor->addr_width) {/* already configured from SFDP */ }else if (nor->info->addr_width) { nor->addr_width = nor->info->addr_width;
@@ -3267,14 +3403,19 @@ static int spi_nor_create_read_dirmap(struct spi_nor *nor) };struct spi_mem_op *op = &info.op_tmpl; -/* get transfer protocols. */ - op->cmd.buswidth =spi_nor_get_protocol_inst_nbits (nor->read_proto); - op->addr.buswidth =spi_nor_get_protocol_addr_nbits (nor->read_proto); - op->dummy.buswidth = op->addr.buswidth; - op->data.buswidth =spi_nor_get_protocol_data_nbits (nor->read_proto); +spi_nor_spimem_setup_op (nor, op, nor->read_proto);/* convert the dummy cycles to the number of bytes */ op->dummy.nbytes = (nor->read_dummy * op->dummy.buswidth) /8 ; +if (spi_nor_protocol_is_dtr (nor->read_proto)) + op->dummy.nbytes *=2 ; + +/* +* Since spi_nor_spimem_setup_op() only sets buswidth when the number +* of data bytes is non-zero, the data buswidth won't be set here. So, +* do it explicitly. +*/ + op->data.buswidth =spi_nor_get_protocol_data_nbits (nor->read_proto); nor->dirmap.rdesc =devm_spi_mem_dirmap_create (nor->dev, nor->spimem, &info);
@@ -3293,15 +3434,18 @@ static int spi_nor_create_write_dirmap(struct spi_nor *nor) };struct spi_mem_op *op = &info.op_tmpl; -/* get transfer protocols. */ - op->cmd.buswidth =spi_nor_get_protocol_inst_nbits (nor->write_proto); - op->addr.buswidth =spi_nor_get_protocol_addr_nbits (nor->write_proto); - op->dummy.buswidth = op->addr.buswidth; - op->data.buswidth =spi_nor_get_protocol_data_nbits (nor->write_proto); -if (nor->program_opcode ==SPINOR_OP_AAI_WP && nor->sst_write_second) op->addr.nbytes =0 ; +spi_nor_spimem_setup_op (nor, op, nor->write_proto); + +/* +* Since spi_nor_spimem_setup_op() only sets buswidth when the number +* of data bytes is non-zero, the data buswidth won't be set here. So, +* do it explicitly. +*/ + op->data.buswidth =spi_nor_get_protocol_data_nbits (nor->write_proto); + nor->dirmap.wdesc =devm_spi_mem_dirmap_create (nor->dev, nor->spimem, &info);return PTR_ERR_OR_ZERO (nor->dirmap.wdesc);
drivers/mtd/spi-nor/core.h +7 -0
@@ -62,6 +62,7 @@ enum spi_nor_read_command_index {SNOR_CMD_READ_1_8_8 ,SNOR_CMD_READ_8_8_8 ,SNOR_CMD_READ_1_8_8_DTR , +SNOR_CMD_READ_8_8_8_DTR , SNOR_CMD_READ_MAX };
@@ -78,6 +79,7 @@ enum spi_nor_pp_command_index {SNOR_CMD_PP_1_1_8 ,SNOR_CMD_PP_1_8_8 ,SNOR_CMD_PP_8_8_8 , +SNOR_CMD_PP_8_8_8_DTR , SNOR_CMD_PP_MAX };
@@ -311,6 +313,8 @@ struct flash_info {* BP3 is bit 6 of status register. * Must be used with SPI_NOR_4BIT_BP. */ +#define SPI_NOR_OCTAL_DTR_READ BIT(19)/* Flash supports octal DTR Read. */ +#define SPI_NOR_OCTAL_DTR_PP BIT(20)/* Flash supports Octal DTR Page Program */ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups;
@@ -399,6 +403,9 @@ extern const struct spi_nor_manufacturer spi_nor_winbond;extern const struct spi_nor_manufacturer spi_nor_xilinx;extern const struct spi_nor_manufacturer spi_nor_xmc; +void spi_nor_spimem_setup_op (const struct spi_nor *nor, +struct spi_mem_op *op, +const enum spi_nor_protocol proto);int spi_nor_write_enable (struct spi_nor *nor);int spi_nor_write_disable (struct spi_nor *nor);int spi_nor_set_4byte_addr_mode (struct spi_nor *nor,bool enable);
drivers/mtd/spi-nor/sfdp.c +8 -1
@@ -1047,9 +1047,16 @@ static int spi_nor_parse_4bait(struct spi_nor *nor, }/* 4BAIT is the only SFDP table that indicates page program support. */ -if (pp_hwcaps &SNOR_HWCAPS_PP ) +if (pp_hwcaps &SNOR_HWCAPS_PP ) {spi_nor_set_pp_settings (¶ms_pp[SNOR_CMD_PP ],SPINOR_OP_PP_4B ,SNOR_PROTO_1_1_1 ); +/* +* Since xSPI Page Program opcode is backward compatible with +* Legacy SPI, use Legacy SPI opcode there as well. +*/ +spi_nor_set_pp_settings (¶ms_pp[SNOR_CMD_PP_8_8_8_DTR ], +SPINOR_OP_PP_4B ,SNOR_PROTO_8_8_8_DTR ); + }if (pp_hwcaps &SNOR_HWCAPS_PP_1_1_4 ) spi_nor_set_pp_settings(¶ms_pp[SNOR_CMD_PP_1_1_4], SPINOR_OP_PP_1_1_4_4B,
include/linux/mtd/spi-nor.h +38 -13
108 lines not on this page · raw message
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v13 5/15 mtd: spi-nor: sfdp: get command opcode extension type from BFPT
In reply to Pratyush YadavSome devices in DTR mode expect an extra command byte called the extension. The extension can either be same as the opcode, bitwise inverse of the opcode, or another additional byte forming a 16-byte opcode. Get the extension type from the BFPT. For now, only flashes with "repeat" and "inverse" extensions are supported.
--- drivers/mtd/spi-nor/sfdp.c | 18 ++++++++++++++++++ drivers/mtd/spi-nor/sfdp.h | 6 ++++++ 2 files changed, 24 insertions(+)
drivers/mtd/spi-nor/sfdp.c +18 -0
@@ -606,6 +606,24 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,if (bfpt_header->length ==BFPT_DWORD_MAX_JESD216B )return spi_nor_post_bfpt_fixups (nor, bfpt_header, &bfpt, params); +/* 8D-8D-8D command extension. */ +switch (bfpt.dwords[BFPT_DWORD (18 )] &BFPT_DWORD18_CMD_EXT_MASK ) { +case BFPT_DWORD18_CMD_EXT_REP : + nor->cmd_ext_type =SPI_NOR_EXT_REPEAT ; +break ; + +case BFPT_DWORD18_CMD_EXT_INV : + nor->cmd_ext_type =SPI_NOR_EXT_INVERT ; +break ; + +case BFPT_DWORD18_CMD_EXT_RES : +dev_dbg (nor->dev,"Reserved command extension used\n" ); +break ; + +case BFPT_DWORD18_CMD_EXT_16B : +dev_dbg (nor->dev,"16-bit opcodes not supported\n" ); +return -EOPNOTSUPP ; + }return spi_nor_post_bfpt_fixups (nor, bfpt_header, &bfpt, params); }
drivers/mtd/spi-nor/sfdp.h +6 -0
@@ -90,6 +90,12 @@ struct sfdp_bfpt {#define BFPT_DWORD15_QER_SR2_BIT1_NO_RD (0x4UL << 20)#define BFPT_DWORD15_QER_SR2_BIT1 (0x5UL << 20)/* Spansion */ +#define BFPT_DWORD18_CMD_EXT_MASK GENMASK(30, 29) +#define BFPT_DWORD18_CMD_EXT_REP (0x0UL << 29)/* Repeat */ +#define BFPT_DWORD18_CMD_EXT_INV (0x1UL << 29)/* Invert */ +#define BFPT_DWORD18_CMD_EXT_RES (0x2UL << 29)/* Reserved */ +#define BFPT_DWORD18_CMD_EXT_16B (0x3UL << 29)/* 16-bit opcode */ +struct sfdp_parameter_header {u8 id_lsb;u8 minor;
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 05/15] mtd: spi-nor: sfdp: get command opcode extension type from BFPT
Quoted 9 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Some devices in DTR mode expect an extra command byte called the extension. The extension can either be same as the opcode, bitwise inverse of the opcode, or another additional byte forming a 16-byte opcode. Get the extension type from the BFPT. For now, only flashes with "repeat" and "inverse" extensions are supported.
Signed-off-by Pratyush Yadav <[email protected]>
Quoted 54 lines
--- drivers/mtd/spi-nor/sfdp.c | 18 ++++++++++++++++++ drivers/mtd/spi-nor/sfdp.h | 6 ++++++ 2 files changed, 24 insertions(+)drivers/mtd/spi-nor/sfdp.c +18
-0@@ -606,6 +606,24 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,if (bfpt_header->length ==BFPT_DWORD_MAX_JESD216B )return spi_nor_post_bfpt_fixups (nor, bfpt_header, &bfpt, params); +/* 8D-8D-8D command extension. */ +switch (bfpt.dwords[BFPT_DWORD (18 )] &BFPT_DWORD18_CMD_EXT_MASK ) { +case BFPT_DWORD18_CMD_EXT_REP : + nor->cmd_ext_type =SPI_NOR_EXT_REPEAT ; +break ; + +case BFPT_DWORD18_CMD_EXT_INV : + nor->cmd_ext_type =SPI_NOR_EXT_INVERT ; +break ; + +case BFPT_DWORD18_CMD_EXT_RES : +dev_dbg (nor->dev,"Reserved command extension used\n" ); +break ; + +case BFPT_DWORD18_CMD_EXT_16B : +dev_dbg (nor->dev,"16-bit opcodes not supported\n" ); +return -EOPNOTSUPP ; + }return spi_nor_post_bfpt_fixups (nor, bfpt_header, &bfpt, params); }drivers/mtd/spi-nor/sfdp.h +6
-1@@ -90,6 +90,12 @@ struct sfdp_bfpt {#define BFPT_DWORD15_QER_SR2_BIT1_NO_RD (0x4UL << 20)#define BFPT_DWORD15_QER_SR2_BIT1 (0x5UL << 20)/* Spansion */ +#define BFPT_DWORD18_CMD_EXT_MASK GENMASK(30, 29) +#define BFPT_DWORD18_CMD_EXT_REP (0x0UL << 29)/* Repeat */ +#define BFPT_DWORD18_CMD_EXT_INV (0x1UL << 29)/* Invert */ +#define BFPT_DWORD18_CMD_EXT_RES (0x2UL << 29)/* Reserved */ +#define BFPT_DWORD18_CMD_EXT_16B (0x3UL << 29)/* 16-bit opcode */ +struct sfdp_parameter_header {u8 id_lsb;u8 minor; --2.28.0
PATCH v13 6/15 mtd: spi-nor: sfdp: parse xSPI Profile 1.0 table
In reply to Pratyush YadavThis table is indication that the flash is xSPI compliant and hence supports octal DTR mode. Extract information like the fast read opcode, dummy cycles, the number of dummy cycles needed for a Read Status Register command, and the number of address bytes needed for a Read Status Register command.
We don't know what speed the controller is running at. Find the fast read dummy cycles for the fastest frequency the flash can run at to be sure we are never short of dummy cycles. If nothing is available, default to 20. Flashes that use a different value should update it in their fixup hooks.
Since we want to set read settings, expose spi_nor_set_read_settings() in core.h.
--- drivers/mtd/spi-nor/core.c | 2 +- drivers/mtd/spi-nor/core.h | 10 +++++ drivers/mtd/spi-nor/sfdp.c | 91 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +1 -1
@@ -2333,7 +2333,7 @@ static int spi_nor_check(struct spi_nor *nor)return 0 ; } -static void +void spi_nor_set_read_settings(struct spi_nor_read_command *read, u8 num_mode_clocks, u8 num_wait_states,
drivers/mtd/spi-nor/core.h +10 -0
@@ -192,6 +192,9 @@ struct spi_nor_locking_ops {* * @size: the flash memory density in bytes. * @page_size: the page size of the SPI NOR flash memory. +* @rdsr_dummy: dummy cycles needed for Read Status Register command. +* @rdsr_addr_nbytes: dummy address bytes needed for Read Status Register +* command. * @hwcaps: describes the read and page program hardware * capabilities. * @reads: read capabilities ordered by priority: the higher index
@@ -214,6 +217,8 @@ struct spi_nor_locking_ops {struct spi_nor_flash_parameter {u64 size;u32 page_size; +u8 rdsr_dummy; +u8 rdsr_addr_nbytes;struct spi_nor_hwcaps hwcaps;struct spi_nor_read_command reads[SNOR_CMD_READ_MAX ];
@@ -425,6 +430,11 @@ ssize_t spi_nor_write_data(struct spi_nor *nor, loff_t to, size_t len,int spi_nor_hwcaps_read2cmd (u32 hwcaps);u8 spi_nor_convert_3to4_read (u8 opcode); +void spi_nor_set_read_settings (struct spi_nor_read_command *read, +u8 num_mode_clocks, +u8 num_wait_states, +u8 opcode, +enum spi_nor_protocol proto);void spi_nor_set_pp_settings (struct spi_nor_pp_command *pp,u8 opcode,enum spi_nor_protocol proto);
drivers/mtd/spi-nor/sfdp.c +91 -0
115 lines not on this page · raw message
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 06/15] mtd: spi-nor: sfdp: parse xSPI Profile 1.0 table
Quoted 100 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
This table is indication that the flash is xSPI compliant and hence supports octal DTR mode. Extract information like the fast read opcode, dummy cycles, the number of dummy cycles needed for a Read Status Register command, and the number of address bytes needed for a Read Status Register command.
We don't know what speed the controller is running at. Find the fast read dummy cycles for the fastest frequency the flash can run at to be sure we are never short of dummy cycles. If nothing is available, default to 20. Flashes that use a different value should update it in their fixup hooks.
Since we want to set read settings, expose
spi_nor_set_read_settings()incore.h.Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 2 +- drivers/mtd/spi-nor/core.h | 10 +++++ drivers/mtd/spi-nor/sfdp.c | 91 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-)drivers/mtd/spi-nor/core.c +1
-1@@ -2333,7 +2333,7 @@ static int spi_nor_check(struct spi_nor *nor)return 0 ; } -static void +void spi_nor_set_read_settings(struct spi_nor_read_command *read, u8 num_mode_clocks, u8 num_wait_states,drivers/mtd/spi-nor/core.h +10
-0@@ -192,6 +192,9 @@ struct spi_nor_locking_ops {* * @size: the flash memory density in bytes. * @page_size: the page size of the SPI NOR flash memory. +* @rdsr_dummy: dummy cycles needed for Read Status Register command. +* @rdsr_addr_nbytes: dummy address bytes needed for Read Status Register +* command. * @hwcaps: describes the read and page program hardware * capabilities. * @reads: read capabilities ordered by priority: the higher index @@ -214,6 +217,8 @@ struct spi_nor_locking_ops {struct spi_nor_flash_parameter {u64 size;u32 page_size; +u8 rdsr_dummy; +u8 rdsr_addr_nbytes;struct spi_nor_hwcaps hwcaps;struct spi_nor_read_command reads[SNOR_CMD_READ_MAX ];@@ -425,6 +430,11 @@ ssize_t spi_nor_write_data(struct spi_nor *nor, loff_t to, size_t len,int spi_nor_hwcaps_read2cmd (u32 hwcaps);u8 spi_nor_convert_3to4_read (u8 opcode); +void spi_nor_set_read_settings (struct spi_nor_read_command *read, +u8 num_mode_clocks, +u8 num_wait_states, +u8 opcode, +enum spi_nor_protocol proto);void spi_nor_set_pp_settings (struct spi_nor_pp_command *pp,u8 opcode,enum spi_nor_protocol proto);drivers/mtd/spi-nor/sfdp.c +6
-0@@ -4,6 +4,7 @@* Copyright (C) 2014, Freescale Semiconductor, Inc. */ +#include <linux/bitfield.h> #include <linux/slab.h> #include <linux/sort.h> #include <linux/mtd/spi-nor.h> @@ -19,6 +20,7 @@#define SFDP_BFPT_ID 0xff00/* Basic Flash Parameter Table */ #define SFDP_SECTOR_MAP_ID 0xff81/* Sector Map Table */ #define SFDP_4BAIT_ID 0xff84/* 4-byte Address Instruction Table */ +#define SFDP_PROFILE1_ID 0xff05/* xSPI Profile 1.0 table. */ #define SFDP_SIGNATURE 0x50444653U@@ -1108,6 +1110,91 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,return ret; } +#define PROFILE1_DWORD1_RDSR_ADDR_BYTES BIT(29) +#define PROFILE1_DWORD1_RDSR_DUMMY BIT(28) +#define PROFILE1_DWORD1_RD_FAST_CMD GENMASK(15, 8) +#define PROFILE1_DWORD4_DUMMY_200MHZ GENMASK(11, 7)
drivers/mtd/spi-nor/sfdp.c static int spi_nor_parse_4bait(struct spi_nor *nor, · line 1126
Quoted 10 lines
drivers/mtd/spi-nor/sfdp.c +10
-0+#define PROFILE1_DWORD5_DUMMY_166MHZ GENMASK(31, 27) +#define PROFILE1_DWORD5_DUMMY_133MHZ GENMASK(21, 17) +#define PROFILE1_DWORD5_DUMMY_100MHZ GENMASK(11, 7) +#define PROFILE1_DUMMY_DEFAULT 20 + +/** +* spi_nor_parse_profile1() - parse the xSPI Profile 1.0 table +* @nor: pointer to a 'struct spi_nor' +* @profile1_header: pointer to the 'struct sfdp_parameter_header' describing +* the 4-Byte Address Instruction Table length and version.
Profile 1.0 Table
Quoted 47 lines
drivers/mtd/spi-nor/sfdp.c +47
-0+* @params: pointer to the 'struct spi_nor_flash_parameter' to be. +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_parse_profile1 (struct spi_nor *nor, +const struct sfdp_parameter_header *profile1_header, +struct spi_nor_flash_parameter *params) +{ +u32 *dwords, addr; +size_t len; +int ret; +u8 dummy, opcode; + + len = profile1_header->length *sizeof (*dwords); + dwords =kmalloc (len,GFP_KERNEL ); +if (!dwords) +return -ENOMEM ; + + addr =SFDP_PARAM_HEADER_PTP (profile1_header); + ret =spi_nor_read_sfdp (nor, addr, len, dwords); +if (ret) + goto out; + +le32_to_cpu_array (dwords, profile1_header->length); + +/* Get 8D-8D-8D fast read opcode and dummy cycles. */ + opcode =FIELD_GET (PROFILE1_DWORD1_RD_FAST_CMD , dwords[0 ]); + +/* Set the Read Status Register dummy cycles and dummy address bytes. */ +if (dwords[0 ] &PROFILE1_DWORD1_RDSR_DUMMY ) + params->rdsr_dummy =8 ; +else + params->rdsr_dummy =4 ; + +if (dwords[0 ] &PROFILE1_DWORD1_RDSR_ADDR_BYTES ) + params->rdsr_addr_nbytes =4 ; +else + params->rdsr_addr_nbytes =0 ; + +/* +* We don't know what speed the controller is running at. Find the +* dummy cycles for the fastest frequency the flash can run at to be +* sure we are never short of dummy cycles. A value of 0 means the +* frequency is not supported. +* +* Default to PROFILE1_DUMMY_DEFAULT if we don't find anything, and let +* flashes set the correct value if needed in their fixup hooks.
drivers/mtd/spi-nor/sfdp.c static int spi_nor_parse_4bait(struct spi_nor *nor, · line 1183
Quoted 10 lines
drivers/mtd/spi-nor/sfdp.c +10
-0+*/ + dummy =FIELD_GET (PROFILE1_DWORD4_DUMMY_200MHZ , dwords[3 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_166MHZ , dwords[4 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_133MHZ , dwords[4 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_100MHZ , dwords[4 ]); +if (!dummy) + dummy =PROFILE1_DUMMY_DEFAULT ;
just a dev_dbg here, without assuming what default value means
Quoted 31 lines
drivers/mtd/spi-nor/sfdp.c +18
-1+ +/* Round up to an even value to avoid tripping controllers up. */ + dummy =round_up (dummy,2 ); + +/* Update the fast read settings. */ +spi_nor_set_read_settings (¶ms->reads[SNOR_CMD_READ_8_8_8_DTR ], +0 , dummy, opcode, +SNOR_PROTO_8_8_8_DTR ); + +out: +kfree (dwords); +return ret; +} +/** * spi_nor_parse_sfdp() - parse the Serial Flash Discoverable Parameters. * @nor: pointer to a 'struct spi_nor' @@ -1209,6 +1296,10 @@ int spi_nor_parse_sfdp(struct spi_nor *nor, err =spi_nor_parse_4bait (nor, param_header, params);break ; +case SFDP_PROFILE1_ID : + err =spi_nor_parse_profile1 (nor, param_header, params); +break ; +default :break ; } --2.28.0
Re: [PATCH v13 06/15] mtd: spi-nor: sfdp: parse xSPI Profile 1.0 table
Quoted 29 lines · On 30/09/20 06:44AM, [email protected] wrote:
Quoted 28 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
This table is indication that the flash is xSPI compliant and hence supports octal DTR mode. Extract information like the fast read opcode, dummy cycles, the number of dummy cycles needed for a Read Status Register command, and the number of address bytes needed for a Read Status Register command.
We don't know what speed the controller is running at. Find the fast read dummy cycles for the fastest frequency the flash can run at to be sure we are never short of dummy cycles. If nothing is available, default to 20. Flashes that use a different value should update it in their fixup hooks.
Since we want to set read settings, expose
spi_nor_set_read_settings()incore.h.Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 2 +- drivers/mtd/spi-nor/core.h | 10 +++++ drivers/mtd/spi-nor/sfdp.c | 91 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-)drivers/mtd/spi-nor/core.c +0
-0
...
Quoted 5 lines
Quoted 5 lines
drivers/mtd/spi-nor/core.c +0
-0@@ -1108,6 +1110,91 @@ static int spi_nor_parse_4bait(struct spi_nor *nor, return ret; }
Quoted 16 lines
Quoted 4 lines
drivers/mtd/spi-nor/core.c +4
-0+#define PROFILE1_DWORD1_RDSR_ADDR_BYTES BIT(29) +#define PROFILE1_DWORD1_RDSR_DUMMY BIT(28) +#define PROFILE1_DWORD1_RD_FAST_CMD GENMASK(15, 8) +#define PROFILE1_DWORD4_DUMMY_200MHZ GENMASK(11, 7)drivers/mtd/spi-nor/core.c static int spi_nor_parse_4bait(struct spi_nor · line 1127
Quoted 10 lines
drivers/mtd/spi-nor/core.c +10
-0+#define PROFILE1_DWORD5_DUMMY_166MHZ GENMASK(31, 27) +#define PROFILE1_DWORD5_DUMMY_133MHZ GENMASK(21, 17) +#define PROFILE1_DWORD5_DUMMY_100MHZ GENMASK(11, 7) +#define PROFILE1_DUMMY_DEFAULT 20 + +/** +* spi_nor_parse_profile1() - parse the xSPI Profile 1.0 table +* @nor: pointer to a 'struct spi_nor' +* @profile1_header: pointer to the 'struct sfdp_parameter_header' describing +* the 4-Byte Address Instruction Table length and version. Profile 1.0 Table
Oops! Will fix.
Quoted 4 lines
Quoted 4 lines
drivers/mtd/spi-nor/core.c +4
-0+* @params: pointer to the 'struct spi_nor_flash_parameter' to be. +* +* Return: 0 on success, -errno otherwise. +*/
...
Quoted 19 lines
Quoted 8 lines
drivers/mtd/spi-nor/core.c +8
-0+/* +* We don't know what speed the controller is running at. Find the +* dummy cycles for the fastest frequency the flash can run at to be +* sure we are never short of dummy cycles. A value of 0 means the +* frequency is not supported. +* +* Default to PROFILE1_DUMMY_DEFAULT if we don't find anything, and let +* flashes set the correct value if needed in their fixup hooks. drivers/mtd/spi-nor/core.c
Quoted 10 lines
drivers/mtd/spi-nor/core.c +10
-0+*/ + dummy =FIELD_GET (PROFILE1_DWORD4_DUMMY_200MHZ , dwords[3 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_166MHZ , dwords[4 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_133MHZ , dwords[4 ]); +if (!dummy) + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_100MHZ , dwords[4 ]); +if (!dummy) + dummy =PROFILE1_DUMMY_DEFAULT ;
Quoted 1 line
just a
dev_dbghere, without assuming what default value means
And we leave dummy to 0, correct?
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 7/15 mtd: spi-nor: core: use dummy cycle and address width info from SFDP
In reply to Pratyush YadavThe xSPI Profile 1.0 table specifies how many dummy cycles and address bytes are needed for the Read Status Register command in octal DTR mode. Use that information to send the correct Read SR command.
--- drivers/mtd/spi-nor/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/mtd/spi-nor/core.c +10 -0
@@ -383,6 +383,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, sr, 1)); +if (spi_nor_protocol_is_dtr (nor->reg_proto)) { + op.addr.nbytes = nor->params->rdsr_addr_nbytes; + op.dummy.nbytes = nor->params->rdsr_dummy; + } +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); ret =spi_mem_exec_op (nor->spimem, &op);
@@ -415,6 +420,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, fsr, 1)); +if (spi_nor_protocol_is_dtr (nor->reg_proto)) { + op.addr.nbytes = nor->params->rdsr_addr_nbytes; + op.dummy.nbytes = nor->params->rdsr_dummy; + } +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); ret =spi_mem_exec_op (nor->spimem, &op);
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 07/15] mtd: spi-nor: core: use dummy cycle and address width info from SFDP
Quoted 16 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
The xSPI Profile 1.0 table specifies how many dummy cycles and address bytes are needed for the Read Status Register command in octal DTR mode. Use that information to send the correct Read SR command.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+)drivers/mtd/spi-nor/core.c +0
-0
drivers/mtd/spi-nor/core.c static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) · line 386
Quoted 4 lines
drivers/mtd/spi-nor/core.c +1
-0@@ -383,6 +383,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, sr, 1)); +if (spi_nor_protocol_is_dtr (nor->reg_proto)) {
this should be done just for octal dtr
drivers/mtd/spi-nor/core.c static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr) · line 423
Quoted 12 lines
drivers/mtd/spi-nor/core.c +5
-0+ op.addr.nbytes = nor->params->rdsr_addr_nbytes; + op.dummy.nbytes = nor->params->rdsr_dummy; + } +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); ret =spi_mem_exec_op (nor->spimem, &op);@@ -415,6 +420,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)SPI_MEM_OP_NO_DUMMY , SPI_MEM_OP_DATA_IN(1, fsr, 1)); +if (spi_nor_protocol_is_dtr (nor->reg_proto)) {
same here
Quoted 10 lines
drivers/mtd/spi-nor/core.c +4
-1+ op.addr.nbytes = nor->params->rdsr_addr_nbytes; + op.dummy.nbytes = nor->params->rdsr_dummy; + } +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); ret =spi_mem_exec_op (nor->spimem, &op); --2.28.0
PATCH v13 8/15 mtd: spi-nor: core: do 2 byte reads for SR and FSR in DTR mode
In reply to Pratyush YadavSome controllers, like the cadence qspi controller, have trouble reading only 1 byte in DTR mode. So, do 2 byte reads for SR and FSR commands in DTR mode, and then discard the second byte.
--- drivers/mtd/spi-nor/core.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/core.c +13 -2
@@ -368,7 +368,7 @@ int spi_nor_write_disable(struct spi_nor *nor)* spi_nor_read_sr() - Read the Status Register. * @nor: pointer to 'struct spi_nor'. * @sr: pointer to a DMA-able buffer where the value of the -* Status Register will be written. +* Status Register will be written. Should be at least 2 bytes. * * Return: 0 on success, -errno otherwise. */
@@ -386,6 +386,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)if (spi_nor_protocol_is_dtr (nor->reg_proto)) { op.addr.nbytes = nor->params->rdsr_addr_nbytes; op.dummy.nbytes = nor->params->rdsr_dummy; +/* +* We don't want to read only one byte in DTR mode. So, +* read 2 and then discard the second byte. +*/ + op.data.nbytes =2 ; }spi_nor_spimem_setup_op (nor, &op, nor->reg_proto);
@@ -405,7 +410,8 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)* spi_nor_read_fsr() - Read the Flag Status Register. * @nor: pointer to 'struct spi_nor' * @fsr: pointer to a DMA-able buffer where the value of the -* Flag Status Register will be written. +* Flag Status Register will be written. Should be at least 2 +* bytes. * * Return: 0 on success, -errno otherwise. */
@@ -423,6 +429,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)if (spi_nor_protocol_is_dtr (nor->reg_proto)) { op.addr.nbytes = nor->params->rdsr_addr_nbytes; op.dummy.nbytes = nor->params->rdsr_dummy; +/* +* We don't want to read only one byte in DTR mode. So, +* read 2 and then discard the second byte. +*/ + op.data.nbytes =2 ; }spi_nor_spimem_setup_op (nor, &op, nor->reg_proto);
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 08/15] mtd: spi-nor: core: do 2 byte reads for SR and FSR in DTR mode
Quoted 4 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Some controllers, like the cadence qspi controller, have trouble reading only 1 byte in DTR mode. So, do 2 byte reads for SR and FSR commands in
did you get garbage when reading only one byte?
Quoted 21 lines
DTR mode, and then discard the second byte.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)drivers/mtd/spi-nor/core.c +1
-1@@ -368,7 +368,7 @@ int spi_nor_write_disable(struct spi_nor *nor)* spi_nor_read_sr() - Read the Status Register. * @nor: pointer to 'struct spi_nor'. * @sr: pointer to a DMA-able buffer where the value of the -* Status Register will be written. +* Status Register will be written. Should be at least 2 bytes. * * Return: 0 on success, -errno otherwise. */
drivers/mtd/spi-nor/core.c static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) · line 393
Quoted 8 lines
drivers/mtd/spi-nor/core.c +5
-0@@ -386,6 +386,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)if (spi_nor_protocol_is_dtr (nor->reg_proto)) { op.addr.nbytes = nor->params->rdsr_addr_nbytes; op.dummy.nbytes = nor->params->rdsr_dummy; +/* +* We don't want to read only one byte in DTR mode. So, +* read 2 and then discard the second byte. +*/ + op.data.nbytes =2 ;
just for octal dtr, but should be fine if you update the previous patch
Quoted 28 lines
drivers/mtd/spi-nor/core.c +7
-2}spi_nor_spimem_setup_op (nor, &op, nor->reg_proto);@@ -405,7 +410,8 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)* spi_nor_read_fsr() - Read the Flag Status Register. * @nor: pointer to 'struct spi_nor' * @fsr: pointer to a DMA-able buffer where the value of the -* Flag Status Register will be written. +* Flag Status Register will be written. Should be at least 2 +* bytes. * * Return: 0 on success, -errno otherwise. */ @@ -423,6 +429,11 @@ static int spi_nor_read_fsr(struct spi_nor *nor, u8 *fsr)if (spi_nor_protocol_is_dtr (nor->reg_proto)) { op.addr.nbytes = nor->params->rdsr_addr_nbytes; op.dummy.nbytes = nor->params->rdsr_dummy; +/* +* We don't want to read only one byte in DTR mode. So, +* read 2 and then discard the second byte. +*/ + op.data.nbytes =2 ; }spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); --2.28.0
Re: [PATCH v13 08/15] mtd: spi-nor: core: do 2 byte reads for SR and FSR in DTR mode
Quoted 7 lines · On 30/09/20 06:50AM, [email protected] wrote:
Quoted 4 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Some controllers, like the cadence qspi controller, have trouble reading only 1 byte in DTR mode. So, do 2 byte reads for SR and FSR commands in
did you get garbage when reading only one byte?
Yes.
Quoted 23 lines
Quoted 23 lines
DTR mode, and then discard the second byte.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)drivers/mtd/spi-nor/core.c +1
-1@@ -368,7 +368,7 @@ int spi_nor_write_disable(struct spi_nor *nor)* spi_nor_read_sr() - Read the Status Register. * @nor: pointer to 'struct spi_nor'. * @sr: pointer to a DMA-able buffer where the value of the -* Status Register will be written. +* Status Register will be written. Should be at least 2 bytes. * * Return: 0 on success, -errno otherwise. */ @@ -386,6 +386,11 @@ static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr)if (spi_nor_protocol_is_dtr (nor->reg_proto)) { op.addr.nbytes = nor->params->rdsr_addr_nbytes;
Quoted 8 lines
drivers/mtd/spi-nor/core.c static int spi_nor_read_sr(struct spi_nor *nor, u8 *sr) · line 393
Quoted 6 lines
drivers/mtd/spi-nor/core.c +5
-0op.dummy.nbytes = nor->params->rdsr_dummy; +/* +* We don't want to read only one byte in DTR mode. So, +* read 2 and then discard the second byte. +*/ + op.data.nbytes =2 ;just for octal dtr, but should be fine if you update the previous patch
Ok.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 9/15 mtd: spi-nor: core: enable octal DTR mode when possible
In reply to Pratyush YadavAllow flashes to specify a hook to enable octal DTR mode. Use this hook whenever possible to get optimal transfer speeds.
--- drivers/mtd/spi-nor/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ 2 files changed, 37 insertions(+)
drivers/mtd/spi-nor/core.c +35 -0
@@ -3069,6 +3069,35 @@ static int spi_nor_init_params(struct spi_nor *nor)return 0 ; } +/** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +int ret; + +if (!nor->params->octal_dtr_enable) +return 0 ; + +if (!(nor->read_proto ==SNOR_PROTO_8_8_8_DTR && + nor->write_proto ==SNOR_PROTO_8_8_8_DTR )) +return 0 ; + + ret = nor->params->octal_dtr_enable (nor, enable); +if (ret) +return ret; + +if (enable) + nor->reg_proto =SNOR_PROTO_8_8_8_DTR ; +else + nor->reg_proto =SNOR_PROTO_1_1_1 ; + +return 0 ; +} +/** * spi_nor_quad_enable() - enable/disable Quad I/O if needed. * @nor: pointer to a 'struct spi_nor'
@@ -3109,6 +3138,12 @@ static int spi_nor_init(struct spi_nor *nor) {int err; + err =spi_nor_octal_dtr_enable (nor, true); +if (err) { +dev_dbg (nor->dev,"octal mode not supported\n" ); +return err; + } + err =spi_nor_quad_enable (nor, true);if (err) {dev_dbg (nor->dev,"quad mode not supported\n" );
drivers/mtd/spi-nor/core.h +2 -0
@@ -203,6 +203,7 @@ struct spi_nor_locking_ops {* higher index in the array, the higher priority. * @erase_map: the erase map parsed from the SFDP Sector Map Parameter * Table. +* @octal_dtr_enable: enables SPI NOR octal DTR mode. * @quad_enable: enables/disables SPI NOR Quad mode. * @set_4byte_addr_mode: puts the SPI NOR in 4 byte addressing mode. * @convert_addr: converts an absolute address into something the flash
@@ -226,6 +227,7 @@ struct spi_nor_flash_parameter {struct spi_nor_erase_map erase_map; +int (*octal_dtr_enable)(struct spi_nor *nor,bool enable);int (*quad_enable)(struct spi_nor *nor,bool enable);int (*set_4byte_addr_mode)(struct spi_nor *nor,bool enable);u32 (*convert_addr)(struct spi_nor *nor,u32 addr);
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 09/15] mtd: spi-nor: core: enable octal DTR mode when possible
Hi,
Quoted 52 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Allow flashes to specify a hook to enable octal DTR mode. Use this hook whenever possible to get optimal transfer speeds.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ 2 files changed, 37 insertions(+)drivers/mtd/spi-nor/core.c +29
-0@@ -3069,6 +3069,35 @@ static int spi_nor_init_params(struct spi_nor *nor)return 0 ; } +/** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +int ret; + +if (!nor->params->octal_dtr_enable) +return 0 ; + +if (!(nor->read_proto ==SNOR_PROTO_8_8_8_DTR && + nor->write_proto ==SNOR_PROTO_8_8_8_DTR )) +return 0 ; + + ret = nor->params->octal_dtr_enable (nor, enable); +if (ret) +return ret; + +if (enable) + nor->reg_proto =SNOR_PROTO_8_8_8_DTR ; +else + nor->reg_proto =SNOR_PROTO_1_1_1 ; + +return 0 ; +} +/** * spi_nor_quad_enable() - enable/disable Quad I/O if needed. * @nor: pointer to a 'struct spi_nor'
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3147
Quoted 10 lines
drivers/mtd/spi-nor/core.c +6
-0@@ -3109,6 +3138,12 @@ static int spi_nor_init(struct spi_nor *nor) {int err; + err =spi_nor_octal_dtr_enable (nor, true); +if (err) { +dev_dbg (nor->dev,"octal mode not supported\n" ); +return err; + } + err =spi_nor_quad_enable (nor, true);
Is it possible to enable octal dtr and quad at the same time? Maybe an 'if/else if' here depending on the values of nor->read_proto and nor->write_proto
Cheers,
ta
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 09/15] mtd: spi-nor: core: enable octal DTR mode when possible
Quoted 58 lines · On 29/09/20 11:26AM, [email protected] wrote:
Hi,
Quoted 55 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Allow flashes to specify a hook to enable octal DTR mode. Use this hook whenever possible to get optimal transfer speeds.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ 2 files changed, 37 insertions(+)drivers/mtd/spi-nor/core.c +29
-0@@ -3069,6 +3069,35 @@ static int spi_nor_init_params(struct spi_nor *nor)return 0 ; } +/** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +int ret; + +if (!nor->params->octal_dtr_enable) +return 0 ; + +if (!(nor->read_proto ==SNOR_PROTO_8_8_8_DTR && + nor->write_proto ==SNOR_PROTO_8_8_8_DTR )) +return 0 ; + + ret = nor->params->octal_dtr_enable (nor, enable); +if (ret) +return ret; + +if (enable) + nor->reg_proto =SNOR_PROTO_8_8_8_DTR ; +else + nor->reg_proto =SNOR_PROTO_1_1_1 ; + +return 0 ; +} +/** * spi_nor_quad_enable() - enable/disable Quad I/O if needed. * @nor: pointer to a 'struct spi_nor' @@ -3109,6 +3138,12 @@ static int spi_nor_init(struct spi_nor *nor) {int err;
Quoted 11 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3147
Quoted 7 lines
drivers/mtd/spi-nor/core.c +6
-0+ err =spi_nor_octal_dtr_enable (nor, true); +if (err) { +dev_dbg (nor->dev,"octal mode not supported\n" ); +return err; + } + err =spi_nor_quad_enable (nor, true);Is it possible to enable octal dtr and quad at the same time? Maybe an 'if/else if' here depending on the values of
nor->read_protoandnor->write_proto
No it is not. If you look inside spi_nor_octal_dtr_enable() and spi_nor_quad_enable(), they both are a no-op if the protocol does not match. spi_nor_quad_enable() was already doing it this way so I made spi_nor_octal_dtr_enable() follow suit. So this is effectively an if-else on the value of nor->read_proto. I don't think an explicit one is needed.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
Re: [PATCH v13 09/15] mtd: spi-nor: core: enable octal DTR mode when possible
Quoted 73 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 58 lines · On 29/09/20 11:26AM, [email protected] wrote:
Hi,
Quoted 55 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Allow flashes to specify a hook to enable octal DTR mode. Use this hook whenever possible to get optimal transfer speeds.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ 2 files changed, 37 insertions(+)drivers/mtd/spi-nor/core.c +29
-0@@ -3069,6 +3069,35 @@ static int spi_nor_init_params(struct spi_nor *nor)return 0 ; } +/** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +int ret; + +if (!nor->params->octal_dtr_enable) +return 0 ; + +if (!(nor->read_proto ==SNOR_PROTO_8_8_8_DTR && + nor->write_proto ==SNOR_PROTO_8_8_8_DTR )) +return 0 ; + + ret = nor->params->octal_dtr_enable (nor, enable); +if (ret) +return ret; + +if (enable) + nor->reg_proto =SNOR_PROTO_8_8_8_DTR ; +else + nor->reg_proto =SNOR_PROTO_1_1_1 ; + +return 0 ; +} +/** * spi_nor_quad_enable() - enable/disable Quad I/O if needed. * @nor: pointer to a 'struct spi_nor' @@ -3109,6 +3138,12 @@ static int spi_nor_init(struct spi_nor *nor) {int err;Quoted 11 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3147
Quoted 7 lines
drivers/mtd/spi-nor/core.c +6
-0+ err =spi_nor_octal_dtr_enable (nor, true); +if (err) { +dev_dbg (nor->dev,"octal mode not supported\n" ); +return err; + } + err =spi_nor_quad_enable (nor, true);Is it possible to enable octal dtr and quad at the same time? Maybe an 'if/else if' here depending on the values of
nor->read_protoandnor->write_proto
Quoted 6 lines
No it is not. If you look inside
spi_nor_octal_dtr_enable()andspi_nor_quad_enable(), they both are a no-op if the protocol does not match.spi_nor_quad_enable()was already doing it this way so I madespi_nor_octal_dtr_enable()follow suit. So this is effectively an if-else on the value ofnor->read_proto. I don't think an explicit one is needed.
you're right! thanks
______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 09/15] mtd: spi-nor: core: enable octal DTR mode when possible
In reply to Pratyush YadavQuoted 4 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Allow flashes to specify a hook to enable octal DTR mode. Use this hook whenever possible to get optimal transfer speeds.
We need to restrict the access to octal dtr enable for flashes that enter in 8-8-8 dtr mode via non-volatile bits. It's what I tried in RFC 1/3.
Looks good ;)
Quoted 83 lines
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 35 +++++++++++++++++++++++++++++++++++ drivers/mtd/spi-nor/core.h | 2 ++ 2 files changed, 37 insertions(+)drivers/mtd/spi-nor/core.c +35
-0@@ -3069,6 +3069,35 @@ static int spi_nor_init_params(struct spi_nor *nor)return 0 ; } +/** spi_nor_octal_dtr_enable() - enable Octal DTR I/O if needed +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +int ret; + +if (!nor->params->octal_dtr_enable) +return 0 ; + +if (!(nor->read_proto ==SNOR_PROTO_8_8_8_DTR && + nor->write_proto ==SNOR_PROTO_8_8_8_DTR )) +return 0 ; + + ret = nor->params->octal_dtr_enable (nor, enable); +if (ret) +return ret; + +if (enable) + nor->reg_proto =SNOR_PROTO_8_8_8_DTR ; +else + nor->reg_proto =SNOR_PROTO_1_1_1 ; + +return 0 ; +} +/** * spi_nor_quad_enable() - enable/disable Quad I/O if needed. * @nor: pointer to a 'struct spi_nor' @@ -3109,6 +3138,12 @@ static int spi_nor_init(struct spi_nor *nor) {int err; + err =spi_nor_octal_dtr_enable (nor, true); +if (err) { +dev_dbg (nor->dev,"octal mode not supported\n" ); +return err; + } + err =spi_nor_quad_enable (nor, true);if (err) {dev_dbg (nor->dev,"quad mode not supported\n" );drivers/mtd/spi-nor/core.h +2
-1@@ -203,6 +203,7 @@ struct spi_nor_locking_ops {* higher index in the array, the higher priority. * @erase_map: the erase map parsed from the SFDP Sector Map Parameter * Table. +* @octal_dtr_enable: enables SPI NOR octal DTR mode. * @quad_enable: enables/disables SPI NOR Quad mode. * @set_4byte_addr_mode: puts the SPI NOR in 4 byte addressing mode. * @convert_addr: converts an absolute address into something the flash @@ -226,6 +227,7 @@ struct spi_nor_flash_parameter {struct spi_nor_erase_map erase_map; +int (*octal_dtr_enable)(struct spi_nor *nor,bool enable);int (*quad_enable)(struct spi_nor *nor,bool enable);int (*set_4byte_addr_mode)(struct spi_nor *nor,bool enable);u32 (*convert_addr)(struct spi_nor *nor,u32 addr); --2.28.0
PATCH v13 10/15 mtd: spi-nor: sfdp: detect Soft Reset sequence support from BFPT
In reply to Pratyush YadavA Soft Reset sequence will return the flash to Power-on-Reset (POR) state. It consists of two commands: Soft Reset Enable and Soft Reset. Find out if the sequence is supported from BFPT DWORD 16.
--- drivers/mtd/spi-nor/core.h | 1 + drivers/mtd/spi-nor/sfdp.c | 4 ++++ drivers/mtd/spi-nor/sfdp.h | 2 ++ 3 files changed, 7 insertions(+)
drivers/mtd/spi-nor/core.h +1 -0
@@ -26,6 +26,7 @@ enum spi_nor_option_flags {SNOR_F_HAS_SR_TB_BIT6 =BIT (11 ),SNOR_F_HAS_4BIT_BP =BIT (12 ),SNOR_F_HAS_SR_BP3_BIT6 =BIT (13 ), + SNOR_F_SOFT_RESET = BIT(14), }; struct spi_nor_read_command {
drivers/mtd/spi-nor/sfdp.c +4 -0
@@ -604,6 +604,10 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,break ; } +/* Soft Reset support. */ +if (bfpt.dwords[BFPT_DWORD (16 )] &BFPT_DWORD16_SOFT_RST ) + nor->flags |=SNOR_F_SOFT_RESET ; +/* Stop here if not JESD216 rev C or later. */ if (bfpt_header->length ==BFPT_DWORD_MAX_JESD216B ) return spi_nor_post_bfpt_fixups(nor, bfpt_header, &bfpt,
drivers/mtd/spi-nor/sfdp.h +2 -0
@@ -90,6 +90,8 @@ struct sfdp_bfpt {#define BFPT_DWORD15_QER_SR2_BIT1_NO_RD (0x4UL << 20)#define BFPT_DWORD15_QER_SR2_BIT1 (0x5UL << 20)/* Spansion */ +#define BFPT_DWORD16_SOFT_RST BIT(12) +#define BFPT_DWORD18_CMD_EXT_MASK GENMASK(30, 29)#define BFPT_DWORD18_CMD_EXT_REP (0x0UL << 29)/* Repeat */ #define BFPT_DWORD18_CMD_EXT_INV (0x1UL << 29)/* Invert */
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 10/15] mtd: spi-nor: sfdp: detect Soft Reset sequence support from BFPT
Quoted 30 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
A Soft Reset sequence will return the flash to Power-on-Reset (POR) state. It consists of two commands: Soft Reset Enable and Soft Reset. Find out if the sequence is supported from BFPT DWORD 16.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.h | 1 + drivers/mtd/spi-nor/sfdp.c | 4 ++++ drivers/mtd/spi-nor/sfdp.h | 2 ++ 3 files changed, 7 insertions(+)drivers/mtd/spi-nor/core.h +1
-0@@ -26,6 +26,7 @@ enum spi_nor_option_flags {SNOR_F_HAS_SR_TB_BIT6 =BIT (11 ),SNOR_F_HAS_4BIT_BP =BIT (12 ),SNOR_F_HAS_SR_BP3_BIT6 =BIT (13 ), + SNOR_F_SOFT_RESET = BIT(14), }; struct spi_nor_read_command {drivers/mtd/spi-nor/sfdp.c +0
-0
drivers/mtd/spi-nor/sfdp.c static int spi_nor_parse_bfpt(struct spi_nor *nor, · line 609
Quoted 6 lines
drivers/mtd/spi-nor/sfdp.c +3
-0@@ -604,6 +604,10 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,break ; } +/* Soft Reset support. */ +if (bfpt.dwords[BFPT_DWORD (16 )] &BFPT_DWORD16_SOFT_RST ) + nor->flags |=SNOR_F_SOFT_RESET ;
minimal support for SWRST but we can extend it later. Looks good.
drivers/mtd/spi-nor/sfdp.h struct sfdp_bfpt { · line 93
Quoted 13 lines
drivers/mtd/spi-nor/sfdp.c +1
-0+/* Stop here if not JESD216 rev C or later. */ if (bfpt_header->length ==BFPT_DWORD_MAX_JESD216B ) return spi_nor_post_bfpt_fixups(nor, bfpt_header, &bfpt,drivers/mtd/spi-nor/sfdp.h +1
-0@@ -90,6 +90,8 @@ struct sfdp_bfpt {#define BFPT_DWORD15_QER_SR2_BIT1_NO_RD (0x4UL << 20)#define BFPT_DWORD15_QER_SR2_BIT1 (0x5UL << 20)/* Spansion */ +#define BFPT_DWORD16_SOFT_RST BIT(12)
the name is too generic. How about
#define BFPT_DWORD16_SWRST_EN_RST BIT(12)
Quoted 7 lines
drivers/mtd/spi-nor/sfdp.h +1
-1+#define BFPT_DWORD18_CMD_EXT_MASK GENMASK(30, 29)#define BFPT_DWORD18_CMD_EXT_REP (0x0UL << 29)/* Repeat */ #define BFPT_DWORD18_CMD_EXT_INV (0x1UL << 29)/* Invert */ --2.28.0
Re: [PATCH v13 10/15] mtd: spi-nor: sfdp: detect Soft Reset sequence support from BFPT
Quoted 22 lines · On 30/09/20 07:23AM, [email protected] wrote:
Quoted 21 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
A Soft Reset sequence will return the flash to Power-on-Reset (POR) state. It consists of two commands: Soft Reset Enable and Soft Reset. Find out if the sequence is supported from BFPT DWORD 16.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.h | 1 + drivers/mtd/spi-nor/sfdp.c | 4 ++++ drivers/mtd/spi-nor/sfdp.h | 2 ++ 3 files changed, 7 insertions(+)drivers/mtd/spi-nor/sfdp.h +0
-0@@ -90,6 +90,8 @@ struct sfdp_bfpt {#define BFPT_DWORD15_QER_SR2_BIT1_NO_RD (0x4UL << 20)#define BFPT_DWORD15_QER_SR2_BIT1 (0x5UL << 20)/* Spansion */
Quoted 5 lines
drivers/mtd/spi-nor/sfdp.h struct sfdp_bfpt { · line 93
Quoted 1 line
drivers/mtd/spi-nor/sfdp.h +1
-0+#define BFPT_DWORD16_SOFT_RST BIT(12)the name is too generic. How about
#define
BFPT_DWORD16_SWRST_EN_RSTBIT(12)
Ok.
Quoted 5 lines
Quoted 5 lines
drivers/mtd/spi-nor/sfdp.h +1
-0+#define BFPT_DWORD18_CMD_EXT_MASK GENMASK(30, 29)#define BFPT_DWORD18_CMD_EXT_REP (0x0UL << 29)/* Repeat */ #define BFPT_DWORD18_CMD_EXT_INV (0x1UL << 29)/* Invert */
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 11/15 mtd: spi-nor: core: perform a Soft Reset on shutdown
In reply to Pratyush YadavPerform a Soft Reset on shutdown on flashes that support it so that the flash can be reset to its initial state and any configurations made by spi-nor (given that they're only done in volatile registers) will be reset. This will hand back the flash in pristine state for any further operations on it.
--- drivers/mtd/spi-nor/core.c | 41 +++++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 43 insertions(+)
drivers/mtd/spi-nor/core.c +41 -0
@@ -40,6 +40,9 @@#define SPI_NOR_MAX_ADDR_WIDTH 4 +#define SPI_NOR_SRST_SLEEP_MIN 200 +#define SPI_NOR_SRST_SLEEP_MAX 400 +/** * spi_nor_get_cmd_ext() - Get the command opcode extension based on the * extension type.
@@ -3174,6 +3177,41 @@ static int spi_nor_init(struct spi_nor *nor)return 0 ; } +static void spi_nor_soft_reset (struct spi_nor *nor) +{ +struct spi_mem_op op; +int ret; + + op = (struct spi_mem_op )SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_SRSTEN ,8 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , +SPI_MEM_OP_NO_DATA ); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + + op = (struct spi_mem_op )SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_SRST ,8 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , +SPI_MEM_OP_NO_DATA ); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + +/* +* Software Reset is not instant, and the delay varies from flash to +* flash. Looking at a few flashes, most range somewhere below 100 +* microseconds. So, sleep for a range of 200-400 us. +*/ +usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {
@@ -3194,6 +3232,9 @@ void spi_nor_restore(struct spi_nor *nor) nor->flags & SNOR_F_BROKEN_RESET) nor->params->set_4byte_addr_mode (nor, false); +if (nor->flags &SNOR_F_SOFT_RESET ) +spi_nor_soft_reset (nor); +spi_nor_quad_enable (nor, false); }EXPORT_SYMBOL_GPL (spi_nor_restore);
include/linux/mtd/spi-nor.h +2 -0
@@ -51,6 +51,8 @@#define SPINOR_OP_CLFSR 0x50/* Clear flag status register */ #define SPINOR_OP_RDEAR 0xc8/* Read Extended Address Register */ #define SPINOR_OP_WREAR 0xc5/* Write Extended Address Register */ +#define SPINOR_OP_SRSTEN 0x66/* Software Reset Enable */ +#define SPINOR_OP_SRST 0x99/* Software Reset */ /* 4-byte address opcodes - used on Spansion and some Macronix flashes. */ #define SPINOR_OP_READ_4B 0x13/* Read data bytes (low frequency) */
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 11/15] mtd: spi-nor: core: perform a Soft Reset on shutdown
Quoted 27 lines · Pratyush Yadav
Perform a Soft Reset on shutdown on flashes that support it so that the flash can be reset to its initial state and any configurations made by spi-nor (given that they're only done in volatile registers) will be reset. This will hand back the flash in pristine state for any further operations on it.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 41 +++++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 43 insertions(+)drivers/mtd/spi-nor/core.c +3
-0@@ -40,6 +40,9 @@#define SPI_NOR_MAX_ADDR_WIDTH 4 +#define SPI_NOR_SRST_SLEEP_MIN 200 +#define SPI_NOR_SRST_SLEEP_MAX 400 +/** * spi_nor_get_cmd_ext() - Get the command opcode extension based on the * extension type.
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3185
Quoted 9 lines
drivers/mtd/spi-nor/core.c +6
-0@@ -3174,6 +3177,41 @@ static int spi_nor_init(struct spi_nor *nor)return 0 ; } +static void spi_nor_soft_reset (struct spi_nor *nor) +{ +struct spi_mem_op op; +int ret; + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRSTEN, 8),
The buswidth used here should be 1 instead of 8. It makes no difference in practice because the call to spi_nor_spimem_setup_op() immediately after will over-write it to the correct value anyway, but let's follow the style followed throughout the rest of the codebase. Will fix in the next version.
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3196
Quoted 11 lines
drivers/mtd/spi-nor/core.c +11
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRST, 8),
Same here.
Quoted 21 lines
drivers/mtd/spi-nor/core.c +18
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + +/* +* Software Reset is not instant, and the delay varies from flash to +* flash. Looking at a few flashes, most range somewhere below 100 +* microseconds. So, sleep for a range of 200-400 us. +*/ +usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
Re: [PATCH v13 11/15] mtd: spi-nor: core: perform a Soft Reset on shutdown
Quoted 33 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 30 lines · Pratyush Yadav
Perform a Soft Reset on shutdown on flashes that support it so that the flash can be reset to its initial state and any configurations made by spi-nor (given that they're only done in volatile registers) will be reset. This will hand back the flash in pristine state for any further operations on it.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 41 +++++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 43 insertions(+)drivers/mtd/spi-nor/core.c +3
-0@@ -40,6 +40,9 @@#define SPI_NOR_MAX_ADDR_WIDTH 4 +#define SPI_NOR_SRST_SLEEP_MIN 200 +#define SPI_NOR_SRST_SLEEP_MAX 400 +/** * spi_nor_get_cmd_ext() - Get the command opcode extension based on the * extension type. @@ -3174,6 +3177,41 @@ static int spi_nor_init(struct spi_nor *nor)return 0 ; }
Quoted 6 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3185
Quoted 6 lines
drivers/mtd/spi-nor/core.c +6
-0+static void spi_nor_soft_reset (struct spi_nor *nor) +{ +struct spi_mem_op op; +int ret; + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRSTEN, 8),
can we avoid the cast?
Quoted 6 lines
The buswidth used here should be 1 instead of 8. It makes no difference in practice because the call to
spi_nor_spimem_setup_op()immediately after will over-write it to the correct value anyway, but let's follow the style followed throughout the rest of the codebase. Will fix in the next version.
or you can just set the buswidth to 0 so that the reader rises his eyebrow and search for where it is updated. If you like it better you'll have to change throughout the entire code base, maybe in 4/15 where setup_op is introduced.
Quoted 5 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3189
Quoted 5 lines
drivers/mtd/spi-nor/core.c +4
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto);
Still not a big fan of this, but we can update the op init later on. How about some new lines around spi_nor_spimem_setup_op()? First time I read the code I haven't seen it.
Quoted 37 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3196
Quoted 7 lines
drivers/mtd/spi-nor/core.c +7
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRST, 8),Same here.
Quoted 11 lines
drivers/mtd/spi-nor/core.c +11
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + +/* drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3217
Quoted 10 lines
drivers/mtd/spi-nor/core.c +7
-0+* Software Reset is not instant, and the delay varies from flash to +* flash. Looking at a few flashes, most range somewhere below 100 +* microseconds. So, sleep for a range of 200-400 us. +*/ +usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {--
Regards,
Pratyush Yadav
Texas Instruments India
Re: [PATCH v13 11/15] mtd: spi-nor: core: perform a Soft Reset on shutdown
Quoted 34 lines · On 30/09/20 07:32AM, [email protected] wrote:
Quoted 33 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 30 lines · Pratyush Yadav
Perform a Soft Reset on shutdown on flashes that support it so that the flash can be reset to its initial state and any configurations made by spi-nor (given that they're only done in volatile registers) will be reset. This will hand back the flash in pristine state for any further operations on it.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 41 +++++++++++++++++++++++++++++++++++++ include/linux/mtd/spi-nor.h | 2 ++ 2 files changed, 43 insertions(+)drivers/mtd/spi-nor/core.c +3
-0@@ -40,6 +40,9 @@#define SPI_NOR_MAX_ADDR_WIDTH 4 +#define SPI_NOR_SRST_SLEEP_MIN 200 +#define SPI_NOR_SRST_SLEEP_MAX 400 +/** * spi_nor_get_cmd_ext() - Get the command opcode extension based on the * extension type. @@ -3174,6 +3177,41 @@ static int spi_nor_init(struct spi_nor *nor)return 0 ; }
Quoted 8 lines
Quoted 6 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3185
Quoted 6 lines
drivers/mtd/spi-nor/core.c +6
-0+static void spi_nor_soft_reset (struct spi_nor *nor) +{ +struct spi_mem_op op; +int ret; + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRSTEN, 8),can we avoid the cast?
No. The compiler complains about "expected expression before '{' token". We can avoid it if the assignment is with the declaration but then we can't re-use the variable op for the second command.
I like the cast better than using separate variables for the two (or more in other cases) commands we execute.
Quoted 10 lines
Quoted 6 lines
The buswidth used here should be 1 instead of 8. It makes no difference in practice because the call to
spi_nor_spimem_setup_op()immediately after will over-write it to the correct value anyway, but let's follow the style followed throughout the rest of the codebase. Will fix in the next version.or you can just set the buswidth to 0 so that the reader rises his eyebrow and search for where it is updated. If you like it better you'll have to change throughout the entire code base, maybe in 4/15 where
setup_opis introduced.
Ok. Will change it.
Quoted 9 lines
Quoted 5 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3189
Quoted 5 lines
drivers/mtd/spi-nor/core.c +4
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto);Still not a big fan of this, but we can update the op init later on. How about some new lines around
spi_nor_spimem_setup_op()? First time I read the code I haven't seen it.
Ok.
Quoted 31 lines
Quoted 31 lines
drivers/mtd/spi-nor/core.c static int spi_nor_init(struct spi_nor *nor) · line 3196
Quoted 7 lines
drivers/mtd/spi-nor/core.c +7
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + + op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_SRST, 8),Same here.
Quoted 21 lines
drivers/mtd/spi-nor/core.c +18
-0+SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_NO_ADDR , + SPI_MEM_OP_NO_DATA); +spi_nor_spimem_setup_op (nor, &op, nor->reg_proto); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Software reset failed: %d\n" , ret); +return ; + } + +/* +* Software Reset is not instant, and the delay varies from flash to +* flash. Looking at a few flashes, most range somewhere below 100 +* microseconds. So, sleep for a range of 200-400 us. +*/ +usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 12/15 mtd: spi-nor: core: disable Octal DTR mode on suspend.
In reply to Pratyush YadavOn resume, the init procedure will be run that will re-enable it.
--- drivers/mtd/spi-nor/core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
drivers/mtd/spi-nor/core.c +18 -0
@@ -3212,6 +3212,23 @@ static void spi_nor_soft_reset(struct spi_nor *nor)usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); } +/* mtd suspend handler */ +static int spi_nor_suspend (struct mtd_info *mtd) +{ +struct spi_nor *nor =mtd_to_spi_nor (mtd); +struct device *dev = nor->dev; +int ret; + +/* Disable octal DTR mode if we enabled it. */ + ret =spi_nor_octal_dtr_enable (nor, false); +if (ret) { +dev_err (dev,"suspend() failed\n" ); +return ret; + } + +return 0 ; +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {
@@ -3406,6 +3423,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, mtd->size = nor->params->size; mtd->_erase = spi_nor_erase; mtd->_read = spi_nor_read; + mtd->_suspend = spi_nor_suspend; mtd->_resume = spi_nor_resume;if (nor->params->locking_ops) {
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 12/15] mtd: spi-nor: core: disable Octal DTR mode on suspend.
Quoted 19 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
On resume, the init procedure will be run that will re-enable it.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/mtd/spi-nor/core.c +1
-0@@ -3212,6 +3212,23 @@ static void spi_nor_soft_reset(struct spi_nor *nor)usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); } +/* mtd suspend handler */
drivers/mtd/spi-nor/core.c static void spi_nor_soft_reset(struct spi_nor *nor) · line 3225
Quoted 10 lines
drivers/mtd/spi-nor/core.c +10
-0+static int spi_nor_suspend (struct mtd_info *mtd) +{ +struct spi_nor *nor =mtd_to_spi_nor (mtd); +struct device *dev = nor->dev; +int ret; + +/* Disable octal DTR mode if we enabled it. */ + ret =spi_nor_octal_dtr_enable (nor, false); +if (ret) { +dev_err (dev,"suspend() failed\n" );
we can get rid of dev local variable as it is used only once. you can use nor->dev directly
drivers/mtd/spi-nor/core.c static void spi_nor_soft_reset(struct spi_nor *nor) · line 3227
Quoted 2 lines
drivers/mtd/spi-nor/core.c +2
-0+return ret; + }
and maybe just return ret; directly. spi_nor_octal_dtr_enable() returns 0 on success.
Looks good.
Quoted 18 lines
drivers/mtd/spi-nor/core.c +5
-1+ +return 0 ; +} +/* mtd resume handler */ static void spi_nor_resume (struct mtd_info *mtd) {@@ -3406,6 +3423,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, mtd->size = nor->params->size; mtd->_erase = spi_nor_erase; mtd->_read = spi_nor_read; + mtd->_suspend = spi_nor_suspend; mtd->_resume = spi_nor_resume;if (nor->params->locking_ops) { --2.28.0
Re: [PATCH v13 12/15] mtd: spi-nor: core: disable Octal DTR mode on suspend.
Quoted 19 lines · On 30/09/20 07:40AM, [email protected] wrote:
Quoted 18 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
On resume, the init procedure will be run that will re-enable it.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)drivers/mtd/spi-nor/core.c +0
-0@@ -3212,6 +3212,23 @@ static void spi_nor_soft_reset(struct spi_nor *nor)usleep_range (SPI_NOR_SRST_SLEEP_MIN ,SPI_NOR_SRST_SLEEP_MAX ); }
Quoted 14 lines
drivers/mtd/spi-nor/core.c static void spi_nor_soft_reset(struct spi_nor *nor) · line 3225
Quoted 11 lines
drivers/mtd/spi-nor/core.c +11
-0+/* mtd suspend handler */ +static int spi_nor_suspend (struct mtd_info *mtd) +{ +struct spi_nor *nor =mtd_to_spi_nor (mtd); +struct device *dev = nor->dev; +int ret; + +/* Disable octal DTR mode if we enabled it. */ + ret =spi_nor_octal_dtr_enable (nor, false); +if (ret) { +dev_err (dev,"suspend() failed\n" );we can get rid of dev local variable as it is used only once. you can use
nor->devdirectly
Ok.
Quoted 5 lines
drivers/mtd/spi-nor/core.c static void spi_nor_soft_reset(struct spi_nor *nor) · line 3227
Quoted 2 lines
drivers/mtd/spi-nor/core.c +2
-0+return ret; + }and maybe just return ret; directly.
spi_nor_octal_dtr_enable()returns 0 on success.
Ok.
Quoted 2 lines
Looks good.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 13/15 mtd: spi-nor: core: expose spi_nor_default_setup() in core.h
In reply to Pratyush YadavFlashes might want to add a custom setup hook to configure the flash in the proper mode for operation. But after that, they would still want to run the default setup hook because it selects the read, program, and erase operations. Since there is little point in repeating all that code, expose the spi_nor_default_setup() in core.h to manufacturer-specific files.
--- drivers/mtd/spi-nor/core.c | 4 ++-- drivers/mtd/spi-nor/core.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)
drivers/mtd/spi-nor/core.c +2 -2
@@ -2759,8 +2759,8 @@ static int spi_nor_select_erase(struct spi_nor *nor)return 0 ; } -static int spi_nor_default_setup (struct spi_nor *nor, -const struct spi_nor_hwcaps *hwcaps) +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps) {struct spi_nor_flash_parameter *params = nor->params;u32 ignored_mask, shared_mask;
drivers/mtd/spi-nor/core.h +3 -0
@@ -453,6 +453,9 @@ int spi_nor_post_bfpt_fixups(struct spi_nor *nor,const struct sfdp_bfpt *bfpt, struct spi_nor_flash_parameter *params); +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps); +static struct spi_nor __maybe_unused *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv;
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 13/15] mtd: spi-nor: core: expose spi_nor_default_setup() in core.h
Quoted 8 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Flashes might want to add a custom setup hook to configure the flash in the proper mode for operation. But after that, they would still want to run the default setup hook because it selects the read, program, and erase operations. Since there is little point in repeating all that code, expose the
spi_nor_default_setup()incore.hto manufacturer-specific files.
But you don't use it in the following patches. Can we drop this one for now?
Quoted 39 lines
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 4 ++-- drivers/mtd/spi-nor/core.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)drivers/mtd/spi-nor/core.c +2
-2@@ -2759,8 +2759,8 @@ static int spi_nor_select_erase(struct spi_nor *nor)return 0 ; } -static int spi_nor_default_setup (struct spi_nor *nor, -const struct spi_nor_hwcaps *hwcaps) +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps) {struct spi_nor_flash_parameter *params = nor->params;u32 ignored_mask, shared_mask;drivers/mtd/spi-nor/core.h +3
-1@@ -453,6 +453,9 @@ int spi_nor_post_bfpt_fixups(struct spi_nor *nor,const struct sfdp_bfpt *bfpt, struct spi_nor_flash_parameter *params); +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps); +static struct spi_nor __maybe_unused *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv; --2.28.0
Re: [PATCH v13 13/15] mtd: spi-nor: core: expose spi_nor_default_setup() in core.h
Quoted 11 lines · On 30/09/20 07:51AM, [email protected] wrote:
Quoted 8 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Flashes might want to add a custom setup hook to configure the flash in the proper mode for operation. But after that, they would still want to run the default setup hook because it selects the read, program, and erase operations. Since there is little point in repeating all that code, expose the
spi_nor_default_setup()incore.hto manufacturer-specific files.But you don't use it in the following patches. Can we drop this one for now?
I used it for earlier versions but not for the latest ones. This can be dropped for now.
Quoted 40 lines
Quoted 39 lines
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/core.c | 4 ++-- drivers/mtd/spi-nor/core.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-)drivers/mtd/spi-nor/core.c +2
-2@@ -2759,8 +2759,8 @@ static int spi_nor_select_erase(struct spi_nor *nor)return 0 ; } -static int spi_nor_default_setup (struct spi_nor *nor, -const struct spi_nor_hwcaps *hwcaps) +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps) {struct spi_nor_flash_parameter *params = nor->params;u32 ignored_mask, shared_mask;drivers/mtd/spi-nor/core.h +3
-1@@ -453,6 +453,9 @@ int spi_nor_post_bfpt_fixups(struct spi_nor *nor,const struct sfdp_bfpt *bfpt, struct spi_nor_flash_parameter *params); +int spi_nor_default_setup (struct spi_nor *nor, +const struct spi_nor_hwcaps *hwcaps); +static struct spi_nor __maybe_unused *mtd_to_spi_nor (struct mtd_info *mtd) {return mtd->priv; --2.28.0
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 14/15 mtd: spi-nor: spansion: add support for Cypress Semper flash
In reply to Pratyush YadavThe Cypress Semper flash is an xSPI compliant octal DTR flash. Add support for using it in octal DTR mode.
The flash by default boots in a hybrid sector mode. But the sector map table on the part I had was programmed incorrectly and the SMPT values on the flash don't match the public datasheet. Specifically, in some places erase type 3 was used instead of 4. In addition, the region sizes were incorrect in some places. So, for testing I set CFR3N[3] to enable uniform sector sizes. Since the uniform sector mode bit is a non-volatile bit, this series does not change it to avoid making any permanent changes to the flash configuration. The correct data to implement a fixup is not available right now and will be done in a follow-up patch if needed.
--- drivers/mtd/spi-nor/spansion.c | 166 +++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+)
drivers/mtd/spi-nor/spansion.c +166 -0
@@ -8,6 +8,167 @@#include "core.h" +#define SPINOR_OP_RD_ANY_REG 0x65/* Read any register */ +#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ +#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 +#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 +#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR5V 0x00800006 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS 0 +#define SPINOR_OP_CYPRESS_RD_FAST 0xee + +/** +* spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes. +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* This also sets the memory access latency cycles to 24 to allow the flash to +* run at up to 200MHz. +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_cypress_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +struct spi_mem_op op; +u8 *buf = nor->bouncebuf; +u8 addr_width; +int ret; + +if (enable) + addr_width =3 ; +else + addr_width =4 ; + +if (enable) { +/* Use 24 dummy cycles for memory array reads. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + + *buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ; + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_CYPRESS_CFR2V , +1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 )); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev, +"failed to set default memory latency value: %d\n" , + ret); +return ret; + } + ret =spi_nor_wait_till_ready (nor); +if (ret) +return ret; + + nor->read_dummy =24 ; + } + +/* Set/unset the octal and DTR enable bits. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + +if (enable) + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; +else + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS ; + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_CYPRESS_CFR5V , +1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 )); + +if (!enable) +spi_nor_spimem_setup_op (nor, &op,SNOR_PROTO_8_8_8_DTR ); + + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Failed to enable octal DTR mode\n" ); +return ret; + } + +return 0 ; +} + +static void s28hs512t_default_init (struct spi_nor *nor) +{ + nor->params->octal_dtr_enable = spi_nor_cypress_octal_dtr_enable; +} + +static void s28hs512t_post_sfdp_fixup (struct spi_nor *nor) +{ +/* +* On older versions of the flash the xSPI Profile 1.0 table has the +* 8D-8D-8D Fast Read opcode as 0x00. But it actually should be 0xEE. +*/ +if (nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode ==0 ) + nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode = +SPINOR_OP_CYPRESS_RD_FAST ; + +/* This flash is also missing the 4-byte Page Program opcode bit. */ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP ], +SPINOR_OP_PP_4B ,SNOR_PROTO_1_1_1 ); +/* +* Since xSPI Page Program opcode is backward compatible with +* Legacy SPI, use Legacy SPI opcode there as well. +*/ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP_8_8_8_DTR ], +SPINOR_OP_PP_4B ,SNOR_PROTO_8_8_8_DTR ); + +/* +* The xSPI Profile 1.0 table advertises the number of additional +* address bytes needed for Read Status Register command as 0 but the +* actual value for that is 4. +*/ + nor->params->rdsr_addr_nbytes =4 ; +} + +static int s28hs512t_post_bfpt_fixup (struct spi_nor *nor, +const struct sfdp_parameter_header *bfpt_header, +const struct sfdp_bfpt *bfpt, +struct spi_nor_flash_parameter *params) +{ +struct spi_mem_op op; +u8 *buf = nor->bouncebuf; +u8 addr_width =3 ; +int ret; + +/* +* The BFPT table advertises a 512B page size but the page size is +* actually configurable (with the default being 256B). Read from +* CFR3V[4] and set the correct size. +*/ + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_RD_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width,SPINOR_REG_CYPRESS_CFR3V ,1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_IN (1 , buf,1 )); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) +return ret; + +if (*buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) + params->page_size =512 ; +else + params->page_size =256 ; + +return 0 ; +} + +static struct spi_nor_fixups s28hs512t_fixups = { + .default_init = s28hs512t_default_init, + .post_sfdp = s28hs512t_post_sfdp_fixup, + .post_bfpt = s28hs512t_post_bfpt_fixup, +}; + static int s25fs_s_post_bfpt_fixups(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header,
@@ -104,6 +265,11 @@ static const struct flash_info spansion_parts[] = { SPI_NOR_4B_OPCODES) }, {"cy15x104q" ,INFO6 (0x042cc2 ,0x7f7f7f ,512 *1024 ,1 , SPI_NOR_NO_ERASE) }, + { "s28hs512t", INFO(0x345b1a, 0, 256 * 1024, 256, +SECT_4K |SPI_NOR_OCTAL_DTR_READ | +SPI_NOR_OCTAL_DTR_PP ) + .fixups = &s28hs512t_fixups, + }, };static void spansion_post_sfdp_fixups (struct spi_nor *nor)
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 14/15] mtd: spi-nor: spansion: add support for Cypress Semper flash
Quoted 51 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
The Cypress Semper flash is an xSPI compliant octal DTR flash. Add support for using it in octal DTR mode.
The flash by default boots in a hybrid sector mode. But the sector map table on the part I had was programmed incorrectly and the SMPT values on the flash don't match the public datasheet. Specifically, in some places erase type 3 was used instead of 4. In addition, the region sizes were incorrect in some places. So, for testing I set CFR3N[3] to enable uniform sector sizes. Since the uniform sector mode bit is a non-volatile bit, this series does not change it to avoid making any permanent changes to the flash configuration. The correct data to implement a fixup is not available right now and will be done in a follow-up patch if needed.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/spansion.c | 166 +++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+)drivers/mtd/spi-nor/spansion.c +22
-0@@ -8,6 +8,167 @@#include "core.h" +#define SPINOR_OP_RD_ANY_REG 0x65/* Read any register */ +#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ +#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 +#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 +#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR5V 0x00800006 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS 0 +#define SPINOR_OP_CYPRESS_RD_FAST 0xee + +/** +* spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes. +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* This also sets the memory access latency cycles to 24 to allow the flash to +* run at up to 200MHz. +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_cypress_octal_dtr_enable (struct spi_nor *nor,bool enable)
drivers/mtd/spi-nor/spansion.c line 42
Quoted 10 lines
drivers/mtd/spi-nor/spansion.c +10
-0+{ +struct spi_mem_op op; +u8 *buf = nor->bouncebuf; +u8 addr_width; +int ret; + +if (enable) + addr_width =3 ; +else + addr_width =4 ;
you can get rid of the addr_width variable and set the addr nbytes at op init directly.
drivers/mtd/spi-nor/spansion.c line 50
Quoted 8 lines
drivers/mtd/spi-nor/spansion.c +8
-0+ +if (enable) { +/* Use 24 dummy cycles for memory array reads. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + + *buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ;
using nor->bouncebuf[0] makes the code easier to read (for me). No big deal anyway.
drivers/mtd/spi-nor/spansion.c line 57
Quoted 7 lines
drivers/mtd/spi-nor/spansion.c +7
-0+ op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_CYPRESS_CFR2V , +1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 ));
new line please
drivers/mtd/spi-nor/spansion.c line 62
Quoted 5 lines
drivers/mtd/spi-nor/spansion.c +5
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev, +"failed to set default memory latency value: %d\n" , + ret);
do we really care for a message here? you'll get a dbg message from spi_nor_octal_dtr_enable() too.
if you still want it, use dev_dbg please.
drivers/mtd/spi-nor/spansion.c line 64
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+return ret; + }
new line please
Quoted 20 lines
drivers/mtd/spi-nor/spansion.c +20
-0+ ret =spi_nor_wait_till_ready (nor); +if (ret) +return ret; + + nor->read_dummy =24 ; + } + +/* Set/unset the octal and DTR enable bits. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + +if (enable) + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; +else + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS ; + op = (struct spi_mem_op ) + SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), + SPI_MEM_OP_ADDR(addr_width, + SPINOR_REG_CYPRESS_CFR5V,
drivers/mtd/spi-nor/spansion.c line 94
Quoted 10 lines
drivers/mtd/spi-nor/spansion.c +10
-0+ 1), +SPI_MEM_OP_NO_DUMMY , + SPI_MEM_OP_DATA_OUT(1, buf, 1)); + +if (!enable) +spi_nor_spimem_setup_op (nor, &op,SNOR_PROTO_8_8_8_DTR ); + + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Failed to enable octal DTR mode\n" );
wrong error message for disable. Maybe get rid of it entirely and return exec_op directly.
drivers/mtd/spi-nor/spansion.c line 68
Quoted 3 lines
drivers/mtd/spi-nor/spansion.c +3
-0+return ret; + } +
No need to wait here? you waited after SPINOR_REG_CYPRESS_CFR2V
Quoted 42 lines
drivers/mtd/spi-nor/spansion.c +42
-0+return 0 ; +} + +static void s28hs512t_default_init (struct spi_nor *nor) +{ + nor->params->octal_dtr_enable = spi_nor_cypress_octal_dtr_enable; +} + +static void s28hs512t_post_sfdp_fixup (struct spi_nor *nor) +{ +/* +* On older versions of the flash the xSPI Profile 1.0 table has the +* 8D-8D-8D Fast Read opcode as 0x00. But it actually should be 0xEE. +*/ +if (nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode ==0 ) + nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode = +SPINOR_OP_CYPRESS_RD_FAST ; + +/* This flash is also missing the 4-byte Page Program opcode bit. */ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP ], +SPINOR_OP_PP_4B ,SNOR_PROTO_1_1_1 ); +/* +* Since xSPI Page Program opcode is backward compatible with +* Legacy SPI, use Legacy SPI opcode there as well. +*/ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP_8_8_8_DTR ], +SPINOR_OP_PP_4B ,SNOR_PROTO_8_8_8_DTR ); + +/* +* The xSPI Profile 1.0 table advertises the number of additional +* address bytes needed for Read Status Register command as 0 but the +* actual value for that is 4. +*/ + nor->params->rdsr_addr_nbytes =4 ; +} + +static int s28hs512t_post_bfpt_fixup (struct spi_nor *nor, +const struct sfdp_parameter_header *bfpt_header, +const struct sfdp_bfpt *bfpt, +struct spi_nor_flash_parameter *params) +{ +struct spi_mem_op op;
drivers/mtd/spi-nor/spansion.c line 149
Quoted 10 lines
drivers/mtd/spi-nor/spansion.c +10
-0+u8 *buf = nor->bouncebuf; +u8 addr_width =3 ; +int ret; + +/* +* The BFPT table advertises a 512B page size but the page size is +* actually configurable (with the default being 256B). Read from +* CFR3V[4] and set the correct size. +*/ + op = (struct spi_mem_op)
here you can get rid of the cast, as you have just one op.
drivers/mtd/spi-nor/spansion.c line 151
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+ SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RD_ANY_REG, 1), + SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR3V, 1),
set addr nbits to 3 directly
drivers/mtd/spi-nor/spansion.c line 153
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+SPI_MEM_OP_NO_DUMMY , + SPI_MEM_OP_DATA_IN(1, buf, 1));
I would use nor->bouncebuf directly
new line please
Quoted 22 lines
drivers/mtd/spi-nor/spansion.c +18
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) +return ret; + +if (*buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) + params->page_size =512 ; +else + params->page_size =256 ; + +return 0 ; +} + +static struct spi_nor_fixups s28hs512t_fixups = { + .default_init = s28hs512t_default_init, + .post_sfdp = s28hs512t_post_sfdp_fixup, + .post_bfpt = s28hs512t_post_bfpt_fixup, +}; + static int s25fs_s_post_bfpt_fixups(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header,
drivers/mtd/spi-nor/spansion.c static const struct flash_info spansion_parts[] = { · line 271
Quoted 7 lines
drivers/mtd/spi-nor/spansion.c +4
-0@@ -104,6 +265,11 @@ static const struct flash_info spansion_parts[] = { SPI_NOR_4B_OPCODES) }, {"cy15x104q" ,INFO6 (0x042cc2 ,0x7f7f7f ,512 *1024 ,1 , SPI_NOR_NO_ERASE) }, + { "s28hs512t", INFO(0x345b1a, 0, 256 * 1024, 256, +SECT_4K |SPI_NOR_OCTAL_DTR_READ | +SPI_NOR_OCTAL_DTR_PP ) + .fixups = &s28hs512t_fixups,
the .fixups init is not aligned with the other .fixups in the file. Is the alignment wrong?
looks good.
Quoted 7 lines
drivers/mtd/spi-nor/spansion.c +1
-1+ }, };static void spansion_post_sfdp_fixups (struct spi_nor *nor) --2.28.0
Re: [PATCH v13 14/15] mtd: spi-nor: spansion: add support for Cypress Semper flash
Quoted 57 lines · On 30/09/20 08:36AM, [email protected] wrote:
Quoted 56 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
The Cypress Semper flash is an xSPI compliant octal DTR flash. Add support for using it in octal DTR mode.
The flash by default boots in a hybrid sector mode. But the sector map table on the part I had was programmed incorrectly and the SMPT values on the flash don't match the public datasheet. Specifically, in some places erase type 3 was used instead of 4. In addition, the region sizes were incorrect in some places. So, for testing I set CFR3N[3] to enable uniform sector sizes. Since the uniform sector mode bit is a non-volatile bit, this series does not change it to avoid making any permanent changes to the flash configuration. The correct data to implement a fixup is not available right now and will be done in a follow-up patch if needed.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/spansion.c | 166 +++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+)drivers/mtd/spi-nor/spansion.c +27
-0@@ -8,6 +8,167 @@#include "core.h" +#define SPINOR_OP_RD_ANY_REG 0x65/* Read any register */ +#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ +#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 +#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 +#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR5V 0x00800006 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS 0 +#define SPINOR_OP_CYPRESS_RD_FAST 0xee + +/** +* spi_nor_cypress_octal_dtr_enable() - Enable octal DTR on Cypress flashes. +* @nor: pointer to a 'struct spi_nor' +* @enable: whether to enable or disable Octal DTR +* +* This also sets the memory access latency cycles to 24 to allow the flash to +* run at up to 200MHz. +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_cypress_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +struct spi_mem_op op; +u8 *buf = nor->bouncebuf; +u8 addr_width; +int ret;
Quoted 8 lines
drivers/mtd/spi-nor/spansion.c line 42
Quoted 5 lines
drivers/mtd/spi-nor/spansion.c +5
-0+ +if (enable) + addr_width =3 ; +else + addr_width =4 ;you can get rid of the
addr_widthvariable and set the addr nbytes at op init directly.
Ok.
Quoted 19 lines
drivers/mtd/spi-nor/spansion.c line 50
Quoted 8 lines
drivers/mtd/spi-nor/spansion.c +8
-0+ +if (enable) { +/* Use 24 dummy cycles for memory array reads. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + + *buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ;using nor->bouncebuf[0] makes the code easier to read (for me). No big deal anyway.
drivers/mtd/spi-nor/spansion.c line 57
Quoted 7 lines
drivers/mtd/spi-nor/spansion.c +7
-0+ op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_CYPRESS_CFR2V , +1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 ));
Quoted 1 line
new line please
Ok.
Quoted 10 lines
drivers/mtd/spi-nor/spansion.c line 62
Quoted 5 lines
drivers/mtd/spi-nor/spansion.c +5
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev, +"failed to set default memory latency value: %d\n" , + ret);do we really care for a message here? you'll get a dbg message from
spi_nor_octal_dtr_enable()too.if you still want it, use
dev_dbgplease.
Ok. I'll use dev_dbg().
Quoted 4 lines
drivers/mtd/spi-nor/spansion.c line 64
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+return ret; + }new line please
Ok.
Quoted 25 lines
Quoted 25 lines
drivers/mtd/spi-nor/spansion.c +25
-0+ ret =spi_nor_wait_till_ready (nor); +if (ret) +return ret; + + nor->read_dummy =24 ; + } + +/* Set/unset the octal and DTR enable bits. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + +if (enable) + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; +else + *buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS ; + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_CYPRESS_CFR5V , +1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 )); + +if (!enable)
Quoted 8 lines
drivers/mtd/spi-nor/spansion.c line 94
Quoted 5 lines
drivers/mtd/spi-nor/spansion.c +5
-0+spi_nor_spimem_setup_op (nor, &op,SNOR_PROTO_8_8_8_DTR ); + + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_warn (nor->dev,"Failed to enable octal DTR mode\n" );wrong error message for disable. Maybe get rid of it entirely and return
exec_opdirectly.
Ok.
Quoted 5 lines
drivers/mtd/spi-nor/spansion.c line 68
Quoted 3 lines
drivers/mtd/spi-nor/spansion.c +3
-0+return ret; + } +No need to wait here? you waited after
SPINOR_REG_CYPRESS_CFR2V
Yes, we need to wait but which mode do we poll the status register in? If we poll it in 8D mode and the flash isn't done switching to it yet, we will get garbage data which might falsely be interpreted as "done".
Maybe a simple udelay() will do the trick but the delay will have to be a guess. I have no data on how long it takes to switch to 8D mode and I have no way of measuring it either. I feel 500us should be enough, but again I have no data to say for sure. Dunno...
Quoted 59 lines
Quoted 42 lines
drivers/mtd/spi-nor/spansion.c +42
-0+return 0 ; +} + +static void s28hs512t_default_init (struct spi_nor *nor) +{ + nor->params->octal_dtr_enable = spi_nor_cypress_octal_dtr_enable; +} + +static void s28hs512t_post_sfdp_fixup (struct spi_nor *nor) +{ +/* +* On older versions of the flash the xSPI Profile 1.0 table has the +* 8D-8D-8D Fast Read opcode as 0x00. But it actually should be 0xEE. +*/ +if (nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode ==0 ) + nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ].opcode = +SPINOR_OP_CYPRESS_RD_FAST ; + +/* This flash is also missing the 4-byte Page Program opcode bit. */ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP ], +SPINOR_OP_PP_4B ,SNOR_PROTO_1_1_1 ); +/* +* Since xSPI Page Program opcode is backward compatible with +* Legacy SPI, use Legacy SPI opcode there as well. +*/ +spi_nor_set_pp_settings (&nor->params->page_programs[SNOR_CMD_PP_8_8_8_DTR ], +SPINOR_OP_PP_4B ,SNOR_PROTO_8_8_8_DTR ); + +/* +* The xSPI Profile 1.0 table advertises the number of additional +* address bytes needed for Read Status Register command as 0 but the +* actual value for that is 4. +*/ + nor->params->rdsr_addr_nbytes =4 ; +} + +static int s28hs512t_post_bfpt_fixup (struct spi_nor *nor, +const struct sfdp_parameter_header *bfpt_header, +const struct sfdp_bfpt *bfpt, +struct spi_nor_flash_parameter *params) +{ +struct spi_mem_op op;drivers/mtd/spi-nor/spansion.c line 149
Quoted 10 lines
drivers/mtd/spi-nor/spansion.c +10
-0+u8 *buf = nor->bouncebuf; +u8 addr_width =3 ; +int ret; + +/* +* The BFPT table advertises a 512B page size but the page size is +* actually configurable (with the default being 256B). Read from +* CFR3V[4] and set the correct size. +*/ + op = (struct spi_mem_op)here you can get rid of the cast, as you have just one op.
drivers/mtd/spi-nor/spansion.c line 151
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+ SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RD_ANY_REG, 1), + SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR3V, 1),
Quoted 8 lines
set addr nbits to 3 directly
drivers/mtd/spi-nor/spansion.c line 153
Quoted 2 lines
drivers/mtd/spi-nor/spansion.c +2
-0+SPI_MEM_OP_NO_DUMMY , + SPI_MEM_OP_DATA_IN(1, buf, 1));I would use
nor->bouncebufdirectlynew line please
Ok.
Quoted 23 lines
Quoted 23 lines
drivers/mtd/spi-nor/spansion.c +18
-0+ ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) +return ret; + +if (*buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) + params->page_size =512 ; +else + params->page_size =256 ; + +return 0 ; +} + +static struct spi_nor_fixups s28hs512t_fixups = { + .default_init = s28hs512t_default_init, + .post_sfdp = s28hs512t_post_sfdp_fixup, + .post_bfpt = s28hs512t_post_bfpt_fixup, +}; + static int s25fs_s_post_bfpt_fixups(struct spi_nor *nor, const struct sfdp_parameter_header *bfpt_header,@@ -104,6 +265,11 @@ static const struct flash_info spansion_parts[] = { SPI_NOR_4B_OPCODES) },
Quoted 8 lines
drivers/mtd/spi-nor/spansion.c static const struct flash_info spansion_parts[] = { · line 271
Quoted 6 lines
drivers/mtd/spi-nor/spansion.c +4
-0{"cy15x104q" ,INFO6 (0x042cc2 ,0x7f7f7f ,512 *1024 ,1 , SPI_NOR_NO_ERASE) }, + { "s28hs512t", INFO(0x345b1a, 0, 256 * 1024, 256, +SECT_4K |SPI_NOR_OCTAL_DTR_READ | +SPI_NOR_OCTAL_DTR_PP ) + .fixups = &s28hs512t_fixups,the .fixups init is not aligned with the other .fixups in the file. Is the alignment wrong?
Ok. I'll fix the alignment.
Quoted 10 lines
looks good.
Quoted 7 lines
drivers/mtd/spi-nor/spansion.c +1
-1+ }, };static void spansion_post_sfdp_fixups (struct spi_nor *nor) --2.28.0
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India
PATCH v13 15/15 mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode
In reply to Pratyush YadavSince this flash doesn't have a Profile 1.0 table, the Octal DTR capabilities are enabled in the post SFDP fixup, along with the 8D-8D-8D fast read settings.
Enable Octal DTR mode with 20 dummy cycles to allow running at the maximum supported frequency of 200Mhz.
The flash supports the soft reset sequence. So, add the flag in the flash's info.
--- drivers/mtd/spi-nor/micron-st.c | 102 +++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/micron-st.c +101 -1
@@ -8,10 +8,110 @@#include "core.h" +#define SPINOR_OP_MT_DTR_RD 0xfd/* Fast Read opcode in DTR mode */ +#define SPINOR_OP_MT_RD_ANY_REG 0x85/* Read volatile register */ +#define SPINOR_OP_MT_WR_ANY_REG 0x81/* Write volatile register */ +#define SPINOR_REG_MT_CFR0V 0x00/* For setting octal DTR mode */ +#define SPINOR_REG_MT_CFR1V 0x01/* For setting dummy cycles */ +#define SPINOR_MT_OCT_DTR 0xe7/* Enable Octal DTR. */ +#define SPINOR_MT_EXSPI 0xff/* Enable Extended SPI (default) */ + +static int spi_nor_micron_octal_dtr_enable (struct spi_nor *nor,bool enable) +{ +struct spi_mem_op op; +u8 *buf = nor->bouncebuf; +u8 addr_width; +int ret; + +if (enable) + addr_width =3 ; +else + addr_width =4 ; + +if (enable) { +/* Use 20 dummy cycles for memory array reads. */ + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + + *buf =20 ; + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_MT_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width, +SPINOR_REG_MT_CFR1V ,1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 )); + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) +return ret; + + ret =spi_nor_wait_till_ready (nor); +if (ret) +return ret; + } + + ret =spi_nor_write_enable (nor); +if (ret) +return ret; + +if (enable) + *buf =SPINOR_MT_OCT_DTR ; +else + *buf =SPINOR_MT_EXSPI ; + op = (struct spi_mem_op ) +SPI_MEM_OP (SPI_MEM_OP_CMD (SPINOR_OP_MT_WR_ANY_REG ,1 ), +SPI_MEM_OP_ADDR (addr_width,SPINOR_REG_MT_CFR0V ,1 ), +SPI_MEM_OP_NO_DUMMY , +SPI_MEM_OP_DATA_OUT (1 , buf,1 )); + +if (!enable) +spi_nor_spimem_setup_op (nor, &op,SNOR_PROTO_8_8_8_DTR ); + + ret =spi_mem_exec_op (nor->spimem, &op); +if (ret) { +dev_err (nor->dev,"Failed to enable octal DTR mode\n" ); +return ret; + } + +return 0 ; +} + +static void mt35xu512aba_default_init (struct spi_nor *nor) +{ + nor->params->octal_dtr_enable = spi_nor_micron_octal_dtr_enable; +} + +static void mt35xu512aba_post_sfdp_fixup (struct spi_nor *nor) +{ +/* Set the Fast Read settings. */ + nor->params->hwcaps.mask |=SNOR_HWCAPS_READ_8_8_8_DTR ; +spi_nor_set_read_settings (&nor->params->reads[SNOR_CMD_READ_8_8_8_DTR ], +0 ,20 ,SPINOR_OP_MT_DTR_RD , +SNOR_PROTO_8_8_8_DTR ); + + nor->cmd_ext_type =SPI_NOR_EXT_REPEAT ; + nor->params->rdsr_dummy =8 ; + nor->params->rdsr_addr_nbytes =0 ; + +/* +* The BFPT quad enable field is set to a reserved value so the quad +* enable function is ignored by spi_nor_parse_bfpt(). Make sure we +* disable it. +*/ + nor->params->quad_enable =NULL ; +} + +static struct spi_nor_fixups mt35xu512aba_fixups = { + .default_init = mt35xu512aba_default_init, + .post_sfdp = mt35xu512aba_post_sfdp_fixup, +}; +static const struct flash_info micron_parts[] = { {"mt35xu512aba" ,INFO (0x2c5b1a ,0 ,128 *1024 ,512 ,SECT_4K |USE_FSR |SPI_NOR_OCTAL_READ | -SPI_NOR_4B_OPCODES ) }, +SPI_NOR_4B_OPCODES |SPI_NOR_OCTAL_DTR_READ | +SPI_NOR_OCTAL_DTR_PP ) + .fixups = &mt35xu512aba_fixups}, {"mt35xu02g" ,INFO (0x2c5b1c ,0 ,128 *1024 ,2048 ,SECT_4K |USE_FSR |SPI_NOR_OCTAL_READ |SPI_NOR_4B_OPCODES ) },
Signature · 6 lines
2.28.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v13 15/15] mtd: spi-nor: micron-st: allow using MT35XU512ABA in Octal DTR mode
drivers/mtd/spi-nor/micron-st.c
Quoted 22 lines · Pratyush Yadav
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Since this flash doesn't have a Profile 1.0 table, the Octal DTR capabilities are enabled in the post SFDP fixup, along with the 8D-8D-8D fast read settings.
Enable Octal DTR mode with 20 dummy cycles to allow running at the maximum supported frequency of 200Mhz.
The flash supports the soft reset sequence. So, add the flag in the flash's info.
Signed-off-by Pratyush Yadav <[email protected]>--- drivers/mtd/spi-nor/micron-st.c | 102 +++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-)drivers/mtd/spi-nor/micron-st.c +0
-0@@ -8,10 +8,110 @@
similar comments to those in 14/15 apply here as well. Looks good. I couldn't find datasheets for neither of flashes though.
Cheers,
ta
cover mtd: spi-nor: Tackle stateful modes
In reply to Pratyush YadavMy biggest concern with Pratyush's patches is that the stateful modes case (X-X-X modes that are entered via a non-volatile bit) is not handled. This is an attempt to tackle this problem. Reasons and explanations in the commit messages.
Tudor Ambarus (3):
mtd: spi-nor: Introduce SNOR_F_IO_MODE_EN_VOLATILE
mtd: spi-nor: Introduce MTD_SPI_NOR_ALLOW_STATEFUL_MODES
mtd: spi-nor: Parse SFDP SCCR Map
drivers/mtd/spi-nor/Kconfig | 10 +++++++ drivers/mtd/spi-nor/core.c | 8 ++++++ drivers/mtd/spi-nor/core.h | 6 +++++ drivers/mtd/spi-nor/sfdp.c | 52 +++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+)
Signature · 1 line
2.25.1
RFC PATCH 1/3 mtd: spi-nor: Introduce SNOR_F_IO_MODE_EN_VOLATILE
We don't want to enter a stateful mode, where a X-X-X I/O mode is entered by setting a non-volatile bit, because in case of a reset or a crash, once in the non-volatile mode, we may not be able to recover in bootloaders and we may break the SPI NOR boot.
Forbid by default the I/O modes that are set via a non-volatile bit.
SPI_NOR_IO_MODE_EN_VOLATILE should be set just for the flashes that don't define the optional SFDP SCCR Map, so that we don't pollute the flash info flags.
--- drivers/mtd/spi-nor/core.c | 6 ++++++ drivers/mtd/spi-nor/core.h | 6 ++++++ 2 files changed, 12 insertions(+)
drivers/mtd/spi-nor/core.c +6 -0
@@ -3089,6 +3089,9 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *nor, bool enable) nor->write_proto == SNOR_PROTO_8_8_8_DTR))return 0 ; +if (!(nor->flags &SNOR_F_IO_MODE_EN_VOLATILE )) +return 0 ; + ret = nor->params->octal_dtr_enable (nor, enable);if (ret)return ret;
@@ -3474,6 +3477,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,if (info->flags &SPI_NOR_4B_OPCODES ) nor->flags |=SNOR_F_4B_OPCODES ; +if (info->flags &SPI_NOR_IO_MODE_EN_VOLATILE ) + nor->flags |=SNOR_F_IO_MODE_EN_VOLATILE ; + ret =spi_nor_set_addr_width (nor);if (ret)return ret;
drivers/mtd/spi-nor/core.h +6 -0
@@ -27,6 +27,7 @@ enum spi_nor_option_flags {SNOR_F_HAS_4BIT_BP =BIT (12 ),SNOR_F_HAS_SR_BP3_BIT6 =BIT (13 ),SNOR_F_SOFT_RESET =BIT (14 ), + SNOR_F_IO_MODE_EN_VOLATILE = BIT(15), }; struct spi_nor_read_command {
@@ -323,6 +324,11 @@ struct flash_info {*/ #define SPI_NOR_OCTAL_DTR_READ BIT(19)/* Flash supports octal DTR Read. */ #define SPI_NOR_OCTAL_DTR_PP BIT(20)/* Flash supports Octal DTR Page Program */ +#define SPI_NOR_IO_MODE_EN_VOLATILE BIT(21)/* +* Flash enables the best +* available I/O mode via a +* volatile bit. +*/ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups;
Signature · 1 line
2.25.1
Vignesh Raghavendra
maintainerRe: [RFC PATCH 1/3] mtd: spi-nor: Introduce SNOR_F_IO_MODE_EN_VOLATILE
Quoted 11 lines · Tudor Ambarus
We don't want to enter a stateful mode, where a X-X-X I/O mode is entered by setting a non-volatile bit, because in case of a reset or a crash, once in the non-volatile mode, we may not be able to recover in bootloaders and we may break the SPI NOR boot.
Forbid by default the I/O modes that are set via a non-volatile bit.
SPI_NOR_IO_MODE_EN_VOLATILEshould be set just for the flashes that don't define the optional SFDP SCCR Map, so that we don't pollute the flash info flags.
I would make this SPI_NOR_IO_MODE_EN_NON_VOLATILE. Because flashes with volatile bits to change IO modes are more common than non volatile ones and above change makes its easier to spot such quirky flashes.
Quoted 55 lines
Signed-off-by Tudor Ambarus <[email protected]>--- drivers/mtd/spi-nor/core.c | 6 ++++++ drivers/mtd/spi-nor/core.h | 6 ++++++ 2 files changed, 12 insertions(+)drivers/mtd/spi-nor/core.c +6
-0@@ -3089,6 +3089,9 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *nor, bool enable) nor->write_proto == SNOR_PROTO_8_8_8_DTR))return 0 ; +if (!(nor->flags &SNOR_F_IO_MODE_EN_VOLATILE )) +return 0 ; + ret = nor->params->octal_dtr_enable (nor, enable);if (ret)return ret;@@ -3474,6 +3477,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,if (info->flags &SPI_NOR_4B_OPCODES ) nor->flags |=SNOR_F_4B_OPCODES ; +if (info->flags &SPI_NOR_IO_MODE_EN_VOLATILE ) + nor->flags |=SNOR_F_IO_MODE_EN_VOLATILE ; + ret =spi_nor_set_addr_width (nor);if (ret)return ret;drivers/mtd/spi-nor/core.h +6
-0@@ -27,6 +27,7 @@ enum spi_nor_option_flags {SNOR_F_HAS_4BIT_BP =BIT (12 ),SNOR_F_HAS_SR_BP3_BIT6 =BIT (13 ),SNOR_F_SOFT_RESET =BIT (14 ), + SNOR_F_IO_MODE_EN_VOLATILE = BIT(15), }; struct spi_nor_read_command {@@ -323,6 +324,11 @@ struct flash_info {*/ #define SPI_NOR_OCTAL_DTR_READ BIT(19)/* Flash supports octal DTR Read. */ #define SPI_NOR_OCTAL_DTR_PP BIT(20)/* Flash supports Octal DTR Page Program */ +#define SPI_NOR_IO_MODE_EN_VOLATILE BIT(21)/* +* Flash enables the best +* available I/O mode via a +* volatile bit. +*/ /* Part specific fixup hooks. */ const struct spi_nor_fixups *fixups;
RFC PATCH 2/3 mtd: spi-nor: Introduce MTD_SPI_NOR_ALLOW_STATEFUL_MODES
In reply to Tudor AmbarusSome users may teach their bootloaders to discover and recover a flash even when left in a statefull mode (a X-X-X I/O mode that is configured via a non-volatile bit).
Provide a way for those users to enter in stateful modes. A reset or a crash will leave the flash in full I/O mode and if the bootloader does not know how to recover, the SPI NOR boot will be broken.
Flashes that will enable stateful modes will be accepted only if a hook to recover from the stateful mode is provided in the kernel. With this, even if a user will break its SPI NOR boot, it'll be able to recover the flash at the kernel level (on those systems that have at least another boot media). Both the Kconfig and the acceptance restriction are needed, so that we don't end up completely hopeless and look at a flash for which there is no software to discover and recover the flash. Even if we can recover the flash from a stateful mode in kernel, entering the stateful mode is still dangerous if one's bootloader can't handle it. We need a way to pass the responsibility to the user and let him decide conciously about the risks of allowing stateful modes.
--- drivers/mtd/spi-nor/Kconfig | 10 ++++++++++ drivers/mtd/spi-nor/core.c | 2 ++ 2 files changed, 12 insertions(+)
drivers/mtd/spi-nor/Kconfig +10 -0
@@ -24,6 +24,16 @@ config MTD_SPI_NOR_USE_4K_SECTORS Please note that some tools/drivers/filesystems may not work with 4096 B erase size (e.g. UBIFS requires 15 KiB as a minimum). +config MTD_SPI_NOR_ALLOW_STATEFUL_MODES + bool "Allow stateful modes (DANGEROUS)" + help + Allow the flash to enter in full I/O mode via a non-volatile bit. + A reset or a crash will leave the flash in the full I/O mode and if + the bootloader does not know how to recover, the SPI NOR boot will be + broken. + + Say N, unless you absolutely know what you are doing. + source "drivers/mtd/spi-nor/controllers/Kconfig" endif # MTD_SPI_NOR
drivers/mtd/spi-nor/core.c +2 -0
@@ -3089,8 +3089,10 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *nor, bool enable) nor->write_proto == SNOR_PROTO_8_8_8_DTR))return 0 ; +#ifndef CONFIG_MTD_SPI_NOR_ALLOW_STATEFUL_MODES if (!(nor->flags &SNOR_F_IO_MODE_EN_VOLATILE ))return 0 ; +#endif ret = nor->params->octal_dtr_enable (nor, enable);if (ret)
Signature · 1 line
2.25.1
Vignesh Raghavendra
maintainerRe: [RFC PATCH 2/3] mtd: spi-nor: Introduce MTD_SPI_NOR_ALLOW_STATEFUL_MODES
Quoted 8 lines · Tudor Ambarus
Some users may teach their bootloaders to discover and recover a flash even when left in a statefull mode (a X-X-X I/O mode that is configured via a non-volatile bit).
Provide a way for those users to enter in stateful modes. A reset or a crash will leave the flash in full I/O mode and if the bootloader does not know how to recover, the SPI NOR boot will be broken.
Quoted 13 lines
Flashes that will enable stateful modes will be accepted only if a hook to recover from the stateful mode is provided in the kernel. With this, even if a user will break its SPI NOR boot, it'll be able to recover the flash at the kernel level (on those systems that have at least another boot media). Both the
Kconfigand the acceptance restriction are needed, so that we don't end up completely hopeless and look at a flash for which there is no software to discover and recover the flash. Even if we can recover the flash from a stateful mode in kernel, entering the stateful mode is still dangerous if one's bootloader can't handle it. We need a way to pass the responsibility to the user and let him decide conciously about the risks of allowing stateful modes.
Recovering from non-volatile (NV) stateful mode would mean unsetting some NV bit. Doing this for every boot would mean NV bit will wear out quite quickly which is a concern. And sometimes NV Octal Enable bits are OTP only (Some Macronix flashes).
NV bits are not to be fiddled with too often. One would set stateful mode in NV way only if entire system is capable of handling this somehow. But, IMHO, since SPI NOR core currently does not support flashes that boot in Quad or Octal mode at the moment, SPI NOR core should not bother providing a hook for manipulating NV IO mode settings.
So my recommendation is to not support writing to non volatile IO modes bits unless absolutely necessary.
Regards
Vignesh
Quoted 43 lines
Signed-off-by Tudor Ambarus <[email protected]>--- drivers/mtd/spi-nor/Kconfig | 10 ++++++++++ drivers/mtd/spi-nor/core.c | 2 ++ 2 files changed, 12 insertions(+)drivers/mtd/spi-nor/Kconfig +10
-0@@ -24,6 +24,16 @@ config MTD_SPI_NOR_USE_4K_SECTORS Please note that some tools/drivers/filesystems may not work with 4096 B erase size (e.g. UBIFS requires 15 KiB as a minimum). +config MTD_SPI_NOR_ALLOW_STATEFUL_MODES + bool "Allow stateful modes (DANGEROUS)" + help + Allow the flash to enter in full I/O mode via a non-volatile bit. + A reset or a crash will leave the flash in the full I/O mode and if + the bootloader does not know how to recover, the SPI NOR boot will be + broken. + + Say N, unless you absolutely know what you are doing. + source "drivers/mtd/spi-nor/controllers/Kconfig" endif # MTD_SPI_NORdrivers/mtd/spi-nor/core.c +2
-0@@ -3089,8 +3089,10 @@ static int spi_nor_octal_dtr_enable(struct spi_nor *nor, bool enable) nor->write_proto == SNOR_PROTO_8_8_8_DTR))return 0 ; +#ifndef CONFIG_MTD_SPI_NOR_ALLOW_STATEFUL_MODES if (!(nor->flags &SNOR_F_IO_MODE_EN_VOLATILE ))return 0 ; +#endif ret = nor->params->octal_dtr_enable (nor, enable);if (ret)
RFC PATCH 3/3 mtd: spi-nor: Parse SFDP SCCR Map
In reply to Tudor AmbarusParse just the 22nd dword and look for the 'DTR Octal Mode Enable Volatile bit'.
SPI_NOR_IO_MODE_EN_VOLATILE should be set just for the flashes that don't define the optional SFDP SCCR Map. For the others, let the SFDP do its job and fill the SNOR_F_IO_MODE_EN_VOLATILE flag. We avoid this way polluting the flash flags when declaring one.
--- drivers/mtd/spi-nor/sfdp.c | 52 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+)
drivers/mtd/spi-nor/sfdp.c +52 -0
@@ -21,6 +21,10 @@#define SFDP_SECTOR_MAP_ID 0xff81/* Sector Map Table */ #define SFDP_4BAIT_ID 0xff84/* 4-byte Address Instruction Table */ #define SFDP_PROFILE1_ID 0xff05/* xSPI Profile 1.0 table. */ +#define SFDP_SCCR_MAP_ID 0xff87/* +* Status, Control and Configuration +* Register Map. +*/ #define SFDP_SIGNATURE 0x50444653U
@@ -1199,6 +1203,50 @@ static int spi_nor_parse_profile1(struct spi_nor *nor,return ret; } +#define SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE BIT(31) + +/** +* spi_nor_parse_sccr() - Parse the Status, Control and Configuration Register +* Map. +* @nor: pointer to a 'struct spi_nor' +* @sccr_header: pointer to the 'struct sfdp_parameter_header' describing +* the SCCR Map table length and version. +* @params: pointer to the 'struct spi_nor_flash_parameter' to be. +* +* Return: 0 on success, -errno otherwise. +*/ +static int spi_nor_parse_sccr (struct spi_nor *nor, +const struct sfdp_parameter_header *sccr_header, +struct spi_nor_flash_parameter *params) +{ +u32 *dwords, addr; +size_t len; +int ret; +u8 io_mode_en_volatile; + + len = sccr_header->length *sizeof (*dwords); + dwords =kmalloc (len,GFP_KERNEL ); +if (!dwords) +return -ENOMEM ; + + addr =SFDP_PARAM_HEADER_PTP (sccr_header); + ret =spi_nor_read_sfdp (nor, addr, len, dwords); +if (ret) + goto out; + +le32_to_cpu_array (dwords, sccr_header->length); + + io_mode_en_volatile =FIELD_GET (SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE , + dwords[22 ]); + +if (io_mode_en_volatile) + nor->flags |=SNOR_F_IO_MODE_EN_VOLATILE ; + +out: +kfree (dwords); +return ret; +} +/** * spi_nor_parse_sfdp() - parse the Serial Flash Discoverable Parameters. * @nor: pointer to a 'struct spi_nor'
@@ -1304,6 +1352,10 @@ int spi_nor_parse_sfdp(struct spi_nor *nor, err =spi_nor_parse_profile1 (nor, param_header, params);break ; +case SFDP_SCCR_MAP_ID : + err =spi_nor_parse_sccr (nor, param_header, params); +break ; +default :break ; }
Signature · 1 line
2.25.1
Quoted 1 line · Pratyush Yadav
Hi,
Hello,
Quoted 6 lines
This series adds support for Octal DTR flashes in the SPI NOR framework, and then adds hooks for the Cypress Semper and Micron Xcella flashes to allow running them in Octal DTR mode. This series assumes that the flash is handed to the kernel in Legacy SPI mode.
I like this series. There are some comments that can be addressed, no big deal though.
I think that we shouldn't let the door open for users with flashes that enter in a X-X-X mode in a non-volatile way. Think of two flashes that have the same X-X-X mode enable sequence, but in which only the EN bit differs:
for one the EN bit is volatile and for the other it is non-volatile. Users of the later flash that try to enable the X-X-X mode (using our code) will end up with the flash in a mode from which they can't recover. Thus my advice is to consider by default all the flashes, as X-X-X mode non-volatile flashes, and to not let them use the X-X-X mode enable methods. Flashes that can enter X-X-X modes in a volatile way, should discover this capability by parsing the optional SFDP SCCR Map. Those that don't define this table, should pass this capability as a flash_info flag when declaring the flash. With these, users should be conscious about the V or NV modes, and the risk to end up with flashes for which there is no software to recover is diminished. This is what I tried in RFC 1/3 and RFC 3/3. I think those 2 patches should be part of this series. 14/15 and 15/15 should be updated accordingly. RFC 2/3 has room for discussions because it provides access system-wise, while ideally would be to do it at flash granularity. I'll wait for your feedback on those.
Quoted 1 line
Tested on TI J721E EVM with 1-bit ECC on the Cypress flash.
As a tip, when introducing some big changes to the core, would be nice to be assured that things that worked previously are still working now. An erase-write-read-back test in Quad SPI would suffice. Probably you have already did that, but I haven't seen it mentioned.
Cheers,
ta
Quoted 24 lines · On 30/09/20 09:57AM, [email protected] wrote:
Quoted 1 line · Pratyush Yadav
Hi,
Hello,
Quoted 6 lines
This series adds support for Octal DTR flashes in the SPI NOR framework, and then adds hooks for the Cypress Semper and Micron Xcella flashes to allow running them in Octal DTR mode. This series assumes that the flash is handed to the kernel in Legacy SPI mode.
I like this series. There are some comments that can be addressed, no big deal though.
I think that we shouldn't let the door open for users with flashes that enter in a X-X-X mode in a non-volatile way. Think of two flashes that have the same X-X-X mode enable sequence, but in which only the EN bit differs:
for one the EN bit is volatile and for the other it is non-volatile. Users of the later flash that try to enable the X-X-X mode (using our code) will end up with the flash in a mode from which they can't recover. Thus my advice is to consider by default all the flashes, as X-X-X mode non-volatile flashes, and to not let them use the X-X-X mode enable methods. Flashes that can enter X-X-X modes in a volatile way, should discover this capability by parsing the
Quoted 8 lines
optional SFDP SCCR Map. Those that don't define this table, should pass this capability as a
flash_infoflag when declaring the flash. With these, users should be conscious about the V or NV modes, and the risk to end up with flashes for which there is no software to recover is diminished. This is what I tried in RFC 1/3 and RFC 3/3. I think those 2 patches should be part of this series. 14/15 and 15/15 should be updated accordingly. RFC 2/3 has room for discussions because it provides access system-wise, while ideally would be to do it at flash granularity. I'll wait for your feedback on those.
FWIW, I took a quick look at the RFC patches and I agree that patches 1/3 and 3/3 are good and I'll add them to my series. I don't like 2/3 mainly because of the same concerns that Vignesh has: wearing down the NV bits. Also IMO we should avoid touching NV bits as much as we can because I had used some on the Cypress flash during development, and I ended up "bricking" the flash a few times (for example when I used the wrong dummy cycles by mistake or the controller driver did something wrong). Since I knew exactly which registers I was touching I could recover it but the process is quite painful.
Quoted 7 lines
Quoted 2 lines
Tested on TI J721E EVM with 1-bit ECC on the Cypress flash.
As a tip, when introducing some big changes to the core, would be nice to be assured that things that worked previously are still working now. An erase-write-read-back test in Quad SPI would suffice. Probably you have already did that, but I haven't seen it mentioned.
Ok, I'll include them next time. I tested this series on the CQSPI and TI QSPI controllers on MT25Q, S25FL for regressions, and on MT35 and S28 for Octal DTR.
Signature · 3 lines
Regards, Pratyush Yadav Texas Instruments India