Skip to content

fix(spi_flash): Resolve protocol errors and write verification bug #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

fix(spi_flash): Resolve protocol errors and write verification bug #627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/spi_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,6 @@ static int RAMFUNCTION spi_flash_write_page(uint32_t address, const void *data,
while (len > 0) {
wait_busy();
flash_write_enable();
wait_busy();

spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(BYTE_WRITE);
spi_read();
Expand Down Expand Up @@ -160,14 +158,21 @@ static int RAMFUNCTION spi_flash_write_sb(uint32_t address, const void *data, in
spi_cs_off(SPI_CS_PIO_BASE, SPI_CS_FLASH);
wait_busy();
spi_flash_read(address, &verify, 1);
if ((verify & ~(buf[j])) == 0) {
if (verify != buf[j])
return -1;
/* Check if the read value matches the written value */
if (verify == buf[j]) {
j++;
len--;
address++;
}
wait_busy();
else {
/* Verification failed, return error */
wolfBoot_printf(
"SPI SB write verification failed at addr 0x%x. Wrote 0x%x, Read 0x%x\n",
address,
buf[j],
verify);
return -1;
}
}
return 0;
}
Expand Down Expand Up @@ -195,12 +200,16 @@ uint16_t spi_flash_probe(void)
chip_write_mode = WB_WRITEPAGE;

#ifndef READONLY
wait_busy();
flash_write_enable();
spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(WRSR);
spi_read();
spi_write(0x00);
spi_read();
spi_cs_off(SPI_CS_PIO_BASE, SPI_CS_FLASH);
wait_busy();
flash_write_disable();
#endif

wolfBoot_printf("SPI Probe: Manuf 0x%x, Product 0x%x\n", manuf, product);
Expand All @@ -224,6 +233,7 @@ int RAMFUNCTION spi_flash_sector_erase(uint32_t address)

wait_busy();
flash_write_enable();
wait_busy();
spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(SECTOR_ERASE);
spi_read();
Expand All @@ -237,6 +247,7 @@ int RAMFUNCTION spi_flash_chip_erase(void)
{
wait_busy();
flash_write_enable();
wait_busy();
spi_cs_on(SPI_CS_PIO_BASE, SPI_CS_FLASH);
spi_write(CHIP_ERASE);
spi_read();
Expand Down