From: Takahiro Kuwano <[email protected]> Remove check of CONFIG_SPI_STACKED_PARALLEL, SNOR_F_HAS_PARALLEL, and SNOR_F_HAS_STACKED as stacked module is only available when the config is enabled and dedicated for stacked mode.
Keep SPI_XFER_U_PAGE as it tells controllers whether upper or lower chip to be accessed. Also keep nor->upage_prev as it tracks previous chip that write_bar is issued. Signed-off-by: Takahiro Kuwano <[email protected]> --- drivers/mtd/spi/stacked.c | 124 +++++++++++----------------------------------- 1 file changed, 30 insertions(+), 94 deletions(-) diff --git a/drivers/mtd/spi/stacked.c b/drivers/mtd/spi/stacked.c index e005aea1053..49f664bc313 100644 --- a/drivers/mtd/spi/stacked.c +++ b/drivers/mtd/spi/stacked.c @@ -25,11 +25,7 @@ static int write_bar(struct spi_nor *nor, u32 offset) if (spi_nor_wait_till_ready(nor)) return 1; - if (nor->flags & (SNOR_F_HAS_PARALLEL | SNOR_F_HAS_STACKED) && - mtd->size <= SZ_32M) - return 0; - - if (mtd->size <= SZ_16M) + if (mtd->size <= SZ_32M) return 0; offset = offset % (u32)mtd->size; @@ -37,9 +33,7 @@ static int write_bar(struct spi_nor *nor, u32 offset) upage_curr = nor->spi->flags & SPI_XFER_U_PAGE; - if (!(nor->flags & SNOR_F_HAS_STACKED) && bank_sel == nor->bank_curr) - return 0; - else if (upage_curr == nor->upage_prev && bank_sel == nor->bank_curr) + if (upage_curr == nor->upage_prev && bank_sel == nor->bank_curr) return 0; nor->upage_prev = upage_curr; @@ -89,17 +83,10 @@ static int spi_nor_erase(struct mtd_info *mtd, struct erase_info *instr) goto erase_err; } offset = addr; - if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { - if (nor->flags & SNOR_F_HAS_PARALLEL) - offset /= 2; - - if (nor->flags & SNOR_F_HAS_STACKED) { - if (offset >= (mtd->size / 2)) - nor->spi->flags |= SPI_XFER_U_PAGE; - else - nor->spi->flags &= ~SPI_XFER_U_PAGE; - } - } + if (offset >= (mtd->size / 2)) + nor->spi->flags |= SPI_XFER_U_PAGE; + else + nor->spi->flags &= ~SPI_XFER_U_PAGE; #if CONFIG_IS_ENABLED(SPI_FLASH_BAR) ret = write_bar(nor, offset); if (ret < 0) @@ -168,46 +155,22 @@ static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, dev_dbg(nor->dev, "from 0x%08x, len %zd\n", (u32)from, len); - if ((nor->flags & SNOR_F_HAS_PARALLEL) && (offset & 1)) { - /* We can hit this case when we use file system like ubifs */ - from--; - len++; - is_ofst_odd = true; - } - while (len) { read_len = len; offset = from; if (CONFIG_IS_ENABLED(SPI_FLASH_BAR)) { bank = (u32)from / SZ_16M; - if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { - if (nor->flags & SNOR_F_HAS_PARALLEL) - bank /= 2; - } rem_bank_len = SZ_16M * (bank + 1); - if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { - if (nor->flags & SNOR_F_HAS_PARALLEL) - rem_bank_len *= 2; - } rem_bank_len -= from; } - if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { - if (nor->flags & SNOR_F_HAS_STACKED) { - stack_shift = 1; - if (offset >= (mtd->size / 2)) { - offset = offset - (mtd->size / 2); - nor->spi->flags |= SPI_XFER_U_PAGE; - } else { - nor->spi->flags &= ~SPI_XFER_U_PAGE; - } - } - } - - if (CONFIG_IS_ENABLED(SPI_STACKED_PARALLEL)) { - if (nor->flags & SNOR_F_HAS_PARALLEL) - offset /= 2; + stack_shift = 1; + if (offset >= (mtd->size / 2)) { + offset = offset - (mtd->size / 2); + nor->spi->flags |= SPI_XFER_U_PAGE; + } else { + nor->spi->flags &= ~SPI_XFER_U_PAGE; } #if CONFIG_IS_ENABLED(SPI_FLASH_BAR) @@ -272,24 +235,6 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, if (!len) return 0; - /* - * Cannot write to odd offset in parallel mode, - * so write 2 bytes first - */ - if ((nor->flags & SNOR_F_HAS_PARALLEL) && (to & 1)) { - u8 two[2] = {0xff, buf[0]}; - size_t local_retlen; - - ret = spi_nor_write(mtd, to & ~1, 2, &local_retlen, two); - if (ret < 0) - return ret; - - *retlen += 1; /* We've written only one actual byte */ - buf++; - len--; - to++; - } - for (i = 0; i < len; ) { ssize_t written; loff_t addr = to + i; @@ -308,16 +253,11 @@ static int spi_nor_write(struct mtd_info *mtd, loff_t to, size_t len, page_offset = do_div(aux, nor->page_size); } offset = to + i; - if (nor->flags & SNOR_F_HAS_PARALLEL) - offset /= 2; - - if (nor->flags & SNOR_F_HAS_STACKED) { - if (offset >= (mtd->size / 2)) { - offset = offset - (mtd->size / 2); - nor->spi->flags |= SPI_XFER_U_PAGE; - } else { - nor->spi->flags &= ~SPI_XFER_U_PAGE; - } + if (offset >= (mtd->size / 2)) { + offset = offset - (mtd->size / 2); + nor->spi->flags |= SPI_XFER_U_PAGE; + } else { + nor->spi->flags &= ~SPI_XFER_U_PAGE; } #if CONFIG_IS_ENABLED(SPI_FLASH_BAR) @@ -408,6 +348,7 @@ int spi_nor_stacked_post_init_fixups(struct spi_nor *nor) #if CONFIG_IS_ENABLED(DM_SPI) u64 flash_size[SNOR_FLASH_CNT_MAX] = { 0 }; struct udevice *dev = nor->spi->dev; + bool is_stacked = false; u32 idx = 0, i = 0; int rc; @@ -421,33 +362,28 @@ int spi_nor_stacked_post_init_fixups(struct spi_nor *nor) } else { idx++; i++; - if (!(nor->flags & SNOR_F_HAS_STACKED)) - nor->flags |= SNOR_F_HAS_STACKED; - if (!(nor->spi->flags & SPI_XFER_STACKED)) - nor->spi->flags |= SPI_XFER_STACKED; + is_stacked = true; } } - if (nor->flags & (SNOR_F_HAS_STACKED | SNOR_F_HAS_PARALLEL)) { + if (is_stacked) { mtd->size = 0; for (idx = 0; idx < SNOR_FLASH_CNT_MAX; idx++) mtd->size += flash_size[idx]; } #endif + if (!is_stacked) + return 0; - if (nor->flags & SNOR_F_HAS_STACKED) { - nor->spi->flags |= SPI_XFER_U_PAGE; - ret = spi_nor_init(nor); - if (ret) - return ret; - nor->spi->flags &= ~SPI_XFER_U_PAGE; - } + nor->spi->flags |= SPI_XFER_U_PAGE; + ret = spi_nor_init(nor); + if (ret) + return ret; + nor->spi->flags &= ~SPI_XFER_U_PAGE; - if (nor->flags & SNOR_F_HAS_STACKED) { - mtd->_erase = spi_nor_erase; - mtd->_read = spi_nor_read; - mtd->_write = spi_nor_write; - } + mtd->_erase = spi_nor_erase; + mtd->_read = spi_nor_read; + mtd->_write = spi_nor_write; return 0; } -- 2.34.1
