Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 06:24:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: spi-nor: Add parallel and stacked memories support in read_bar and write_bar

Browse source 
Add support for parallel memories and stacked memories configuration
in read_bar and write_bar functions.

Signed-off-by: Ashok Reddy Soma <ashok.reddy.soma@amd.com>
Signed-off-by: Venkatesh Yadav Abbarapu <venkatesh.abbarapu@amd.com>
This commit is contained in:
Ashok Reddy Soma 2024-09-26 10:25:04 +05:30 • committed by Tom Rini
parent 92e0ae42b4
commit c480ec2c45
1 changed files with 47 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
drivers/mtd/spi/spi-nor-core.c
View file

@ -928,12 +928,32 @@ static int clean_bar(struct spi_nor *nor)
static int write_bar(struct spi_nor *nor, u32 offset) static int write_bar(struct spi_nor *nor, u32 offset)
{ {
u8 cmd, bank_sel; u8 cmd, bank_sel, upage_curr;
int ret; int ret;
struct mtd_info *mtd = &nor->mtd;
bank_sel = offset / SZ_16M; /* Wait until previous write command is finished */
if (bank_sel == nor->bank_curr) if (spi_nor_wait_till_ready(nor))
goto bar_end; return 1;
if (nor->flags & (SNOR_F_HAS_PARALLEL | SNOR_F_HAS_STACKED) &&
mtd->size <= SZ_32M)
return 0;
if (mtd->size <= SZ_16M)
return 0;
offset = offset % (u32)mtd->size;
bank_sel = offset >> 24;
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)
return 0;
nor->upage_prev = upage_curr;
cmd = nor->bank_write_cmd; cmd = nor->bank_write_cmd;
write_enable(nor); write_enable(nor);
@ -943,15 +963,19 @@ static int write_bar(struct spi_nor *nor, u32 offset)
return ret; return ret;
} }
bar_end:
nor->bank_curr = bank_sel; nor->bank_curr = bank_sel;
return nor->bank_curr;
return write_disable(nor);
} }
static int read_bar(struct spi_nor *nor, const struct flash_info *info) static int read_bar(struct spi_nor *nor, const struct flash_info *info)
{ {
u8 curr_bank = 0; u8 curr_bank = 0;
int ret; int ret;
struct mtd_info *mtd = &nor->mtd;
if (mtd->size <= SZ_16M)
return 0;
switch (JEDEC_MFR(info)) { switch (JEDEC_MFR(info)) {
case SNOR_MFR_SPANSION: case SNOR_MFR_SPANSION:
@ -963,15 +987,30 @@ static int read_bar(struct spi_nor *nor, const struct flash_info *info)
nor->bank_write_cmd = SPINOR_OP_WREAR; nor->bank_write_cmd = SPINOR_OP_WREAR;
} }
if (nor->flags & SNOR_F_HAS_PARALLEL)
nor->spi->flags |= SPI_XFER_LOWER;
ret = nor->read_reg(nor, nor->bank_read_cmd, ret = nor->read_reg(nor, nor->bank_read_cmd,
&curr_bank, 1); &curr_bank, 1);
if (ret) { if (ret) {
debug("SF: fail to read bank addr register\n"); debug("SF: fail to read bank addr register\n");
return ret; return ret;
} }
nor->bank_curr = curr_bank; nor->bank_curr = curr_bank;
return 0; // Make sure both chips use the same BAR
if (nor->flags & SNOR_F_HAS_PARALLEL) {
write_enable(nor);
ret = nor->write_reg(nor, nor->bank_write_cmd, &curr_bank, 1);
if (ret)
return ret;
ret = write_disable(nor);
if (ret)
return ret;
}
return ret;
} }
#endif #endif