Messages in this thread Patch in this message | | | From | Nathan Barrett-Morrison <> | Subject | [PATCH 1/2] mtd: spi-nore: core: Add in framework for 8S-8S-8S Octal STR mode | Date | Wed, 23 Nov 2022 16:13:34 -0500 |
| |
While trying to bring up an Octal SPI device in STR mode, I found that there is currently no support for 8S-8S-8S. This patch adds the necessary, additional logic for doing so.
Signed-off-by: Nathan Barrett-Morrison <nathan.morrison@timesys.com> --- drivers/mtd/spi-nor/core.c | 57 ++++++++++++++++++++++++++++++++++++-- drivers/mtd/spi-nor/core.h | 5 +++- 2 files changed, 59 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index bee8fc4c9f07..66665c1bebd7 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2253,7 +2253,8 @@ static int spi_nor_set_addr_nbytes(struct spi_nor *nor) { if (nor->params->addr_nbytes) { nor->addr_nbytes = nor->params->addr_nbytes; - } else if (nor->read_proto == SNOR_PROTO_8_8_8_DTR) { + } else if (nor->read_proto == SNOR_PROTO_8_8_8_DTR || + nor->read_proto == SNOR_PROTO_8_8_8) { /* * In 8D-8D-8D mode, one byte takes half a cycle to transfer. So * in this protocol an odd addr_nbytes cannot be used because @@ -2335,7 +2336,7 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) { struct spi_nor_flash_parameter *params = nor->params; struct spi_nor_erase_map *map = ¶ms->erase_map; - const u8 no_sfdp_flags = nor->info->no_sfdp_flags; + const u16 no_sfdp_flags = nor->info->no_sfdp_flags; u8 i, erase_mask; if (no_sfdp_flags & SPI_NOR_DUAL_READ) { @@ -2359,6 +2360,13 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) SNOR_PROTO_1_1_8); } + if (no_sfdp_flags & SPI_NOR_OCTAL_STR_READ) { + params->hwcaps.mask |= SNOR_HWCAPS_READ_8_8_8; + spi_nor_set_read_settings(¶ms->reads[SNOR_HWCAPS_READ_8_8_8], + 0, 20, SPINOR_OP_READ_FAST, + SNOR_PROTO_8_8_8); + } + if (no_sfdp_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], @@ -2366,6 +2374,12 @@ static void spi_nor_no_sfdp_init_params(struct spi_nor *nor) SNOR_PROTO_8_8_8_DTR); } + if (no_sfdp_flags & SPI_NOR_OCTAL_STR_PP) { + params->hwcaps.mask |= SNOR_HWCAPS_PP_8_8_8; + spi_nor_set_pp_settings(¶ms->page_programs[SNOR_CMD_PP_8_8_8], + SPINOR_OP_PP, SNOR_PROTO_8_8_8); + } + if (no_sfdp_flags & SPI_NOR_OCTAL_DTR_PP) { params->hwcaps.mask |= SNOR_HWCAPS_PP_8_8_8_DTR; /* @@ -2631,6 +2645,38 @@ static int spi_nor_init_params(struct spi_nor *nor) return 0; } +/** spi_nor_octal_str_enable() - enable Octal STR I/O if needed + * @nor: pointer to a 'struct spi_nor' + * @enable: whether to enable or disable Octal STR + * + * Return: 0 on success, -errno otherwise. + */ +static int spi_nor_octal_str_enable(struct spi_nor *nor, bool enable) +{ + int ret; + + if (!nor->params->octal_str_enable) + return 0; + + if (!(nor->read_proto == SNOR_PROTO_8_8_8 && + nor->write_proto == SNOR_PROTO_8_8_8)) + return 0; + + if (!(nor->flags & SNOR_F_IO_MODE_EN_VOLATILE)) + return 0; + + ret = nor->params->octal_str_enable(nor, enable); + if (ret) + return ret; + + if (enable) + nor->reg_proto = SNOR_PROTO_8_8_8; + else + nor->reg_proto = SNOR_PROTO_1_1_1; + + 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 @@ -2691,6 +2737,12 @@ static int spi_nor_init(struct spi_nor *nor) return err; } + err = spi_nor_octal_str_enable(nor, true); + if (err) { + dev_dbg(nor->dev, "octal STR mode not supported\n"); + return err; + } + err = spi_nor_quad_enable(nor); if (err) { dev_dbg(nor->dev, "quad mode not supported\n"); @@ -2714,6 +2766,7 @@ static int spi_nor_init(struct spi_nor *nor) if (nor->addr_nbytes == 4 && nor->read_proto != SNOR_PROTO_8_8_8_DTR && + nor->read_proto != SNOR_PROTO_8_8_8 && !(nor->flags & SNOR_F_4B_OPCODES)) { /* * If the RESET# pin isn't hooked up properly, or the system diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h index 85b0cf254e97..56795db872c2 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -359,6 +359,7 @@ struct spi_nor_otp { * Table. * @otp: SPI NOR OTP info. * @octal_dtr_enable: enables SPI NOR octal DTR mode. + * @octal_str_enable: enables SPI NOR octal STR mode. * @quad_enable: enables 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 @@ -508,7 +509,7 @@ struct flash_info { #define NO_CHIP_ERASE BIT(7) #define SPI_NOR_NO_FR BIT(8) - u8 no_sfdp_flags; + u16 no_sfdp_flags; #define SPI_NOR_SKIP_SFDP BIT(0) #define SECT_4K BIT(1) #define SPI_NOR_DUAL_READ BIT(3) @@ -516,6 +517,8 @@ struct flash_info { #define SPI_NOR_OCTAL_READ BIT(5) #define SPI_NOR_OCTAL_DTR_READ BIT(6) #define SPI_NOR_OCTAL_DTR_PP BIT(7) +#define SPI_NOR_OCTAL_STR_READ BIT(8) +#define SPI_NOR_OCTAL_STR_PP BIT(9) u8 fixup_flags; #define SPI_NOR_4B_OPCODES BIT(0) -- 2.30.2
| |