aboutsummaryrefslogtreecommitdiffstats
path: root/spi25_statusreg.c
diff options
context:
space:
mode:
Diffstat (limited to 'spi25_statusreg.c')
-rw-r--r--spi25_statusreg.c145
1 files changed, 110 insertions, 35 deletions
diff --git a/spi25_statusreg.c b/spi25_statusreg.c
index 249ab9a3..6b168398 100644
--- a/spi25_statusreg.c
+++ b/spi25_statusreg.c
@@ -123,7 +123,11 @@ int spi_write_register(const struct flashctx *flash, enum flash_reg reg, uint8_t
}
for (; delay_ms > 0; delay_ms -= 10) {
- if ((spi_read_status_register(flash) & SPI_SR_WIP) == 0)
+ uint8_t status;
+ result = spi_read_register(flash, STATUS1, &status);
+ if (result)
+ return result;
+ if ((status & SPI_SR_WIP) == 0)
return 0;
programmer_delay(10 * 1000);
}
@@ -168,14 +172,6 @@ int spi_read_register(const struct flashctx *flash, enum flash_reg reg, uint8_t
return 0;
}
-uint8_t spi_read_status_register(const struct flashctx *flash)
-{
- uint8_t status = 0;
- /* FIXME: We should propagate the error. */
- spi_read_register(flash, STATUS1, &status);
- return status;
-}
-
static int spi_restore_status(struct flashctx *flash, uint8_t status)
{
msg_cdbg("restoring chip status (0x%02x)\n", status);
@@ -207,7 +203,10 @@ static int spi_disable_blockprotect_generic(struct flashctx *flash, uint8_t bp_m
uint8_t status;
int result;
- status = spi_read_status_register(flash);
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
+
if ((status & bp_mask) == 0) {
msg_cdbg2("Block protection is disabled.\n");
return 0;
@@ -229,7 +228,11 @@ static int spi_disable_blockprotect_generic(struct flashctx *flash, uint8_t bp_m
msg_cerr("Could not write status register 1.\n");
return result;
}
- status = spi_read_status_register(flash);
+
+ ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
+
if ((status & lock_mask) != 0) {
msg_cerr("Unsetting lock bit(s) failed.\n");
return 1;
@@ -242,7 +245,11 @@ static int spi_disable_blockprotect_generic(struct flashctx *flash, uint8_t bp_m
msg_cerr("Could not write status register 1.\n");
return result;
}
- status = spi_read_status_register(flash);
+
+ ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
+
if ((status & bp_mask) != 0) {
msg_cerr("Block protection could not be disabled!\n");
if (flash->chip->printlock)
@@ -363,7 +370,10 @@ void spi_prettyprint_status_register_bit(uint8_t status, int bit)
int spi_prettyprint_status_register_plain(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
return 0;
}
@@ -371,7 +381,10 @@ int spi_prettyprint_status_register_plain(struct flashctx *flash)
/* Print the plain hex value and the welwip bits only. */
int spi_prettyprint_status_register_default_welwip(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_welwip(status);
@@ -384,7 +397,10 @@ int spi_prettyprint_status_register_default_welwip(struct flashctx *flash)
*/
int spi_prettyprint_status_register_bp1_srwd(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -402,7 +418,10 @@ int spi_prettyprint_status_register_bp1_srwd(struct flashctx *flash)
*/
int spi_prettyprint_status_register_bp2_srwd(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -419,7 +438,10 @@ int spi_prettyprint_status_register_bp2_srwd(struct flashctx *flash)
*/
int spi_prettyprint_status_register_bp3_srwd(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -431,7 +453,10 @@ int spi_prettyprint_status_register_bp3_srwd(struct flashctx *flash)
int spi_prettyprint_status_register_bp4_srwd(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -442,7 +467,10 @@ int spi_prettyprint_status_register_bp4_srwd(struct flashctx *flash)
int spi_prettyprint_status_register_bp2_bpl(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_bpl(status);
@@ -455,7 +483,10 @@ int spi_prettyprint_status_register_bp2_bpl(struct flashctx *flash)
int spi_prettyprint_status_register_bp2_tb_bpl(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_bpl(status);
@@ -477,7 +508,10 @@ int spi_prettyprint_status_register_bp2_tb_bpl(struct flashctx *flash)
int spi_prettyprint_status_register_amic_a25l032(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -533,7 +567,11 @@ static void spi_prettyprint_status_register_atmel_at25_swp(uint8_t status)
int spi_prettyprint_status_register_at25df(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
+
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_srpl(status);
@@ -556,8 +594,10 @@ int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash)
int spi_prettyprint_status_register_at25f(struct flashctx *flash)
{
uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
- status = spi_read_status_register(flash);
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_wpen(status);
@@ -572,8 +612,10 @@ int spi_prettyprint_status_register_at25f(struct flashctx *flash)
int spi_prettyprint_status_register_at25f512a(struct flashctx *flash)
{
uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
- status = spi_read_status_register(flash);
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_wpen(status);
@@ -588,7 +630,10 @@ int spi_prettyprint_status_register_at25f512a(struct flashctx *flash)
int spi_prettyprint_status_register_at25f512b(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_srpl(status);
@@ -604,7 +649,10 @@ int spi_prettyprint_status_register_at25f4096(struct flashctx *flash)
{
uint8_t status;
- status = spi_read_status_register(flash);
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
+
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_wpen(status);
@@ -617,7 +665,10 @@ int spi_prettyprint_status_register_at25f4096(struct flashctx *flash)
int spi_prettyprint_status_register_at25fs010(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_wpen(status);
@@ -637,7 +688,10 @@ int spi_prettyprint_status_register_at25fs010(struct flashctx *flash)
int spi_prettyprint_status_register_at25fs040(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_wpen(status);
@@ -649,7 +703,10 @@ int spi_prettyprint_status_register_at25fs040(struct flashctx *flash)
int spi_prettyprint_status_register_at26df081a(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_atmel_at25_srpl(status);
@@ -707,7 +764,10 @@ int spi_disable_blockprotect_at25fs040(struct flashctx *flash)
int spi_prettyprint_status_register_en25s_wp(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -726,7 +786,10 @@ int spi_disable_blockprotect_n25q(struct flashctx *flash)
int spi_prettyprint_status_register_n25q(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -751,7 +814,10 @@ int spi_disable_blockprotect_bp2_ep_srwd(struct flashctx *flash)
/* Used by Intel/Numonyx S33 and Spansion S25FL-S chips */
int spi_prettyprint_status_register_bp2_ep_srwd(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_hex(status);
spi_prettyprint_status_register_srwd(status);
@@ -779,7 +845,10 @@ static void spi_prettyprint_status_register_sst25_common(uint8_t status)
int spi_prettyprint_status_register_sst25(struct flashctx *flash)
{
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_sst25_common(status);
return 0;
}
@@ -795,7 +864,10 @@ int spi_prettyprint_status_register_sst25vf016(struct flashctx *flash)
"100000H-1FFFFFH",
"all", "all"
};
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_sst25_common(status);
msg_cdbg("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]);
return 0;
@@ -810,7 +882,10 @@ int spi_prettyprint_status_register_sst25vf040b(struct flashctx *flash)
"0x40000-0x7ffff",
"all blocks", "all blocks", "all blocks", "all blocks"
};
- uint8_t status = spi_read_status_register(flash);
+ uint8_t status;
+ int ret = spi_read_register(flash, STATUS1, &status);
+ if (ret)
+ return ret;
spi_prettyprint_status_register_sst25_common(status);
msg_cdbg("Resulting block protection : %s\n", bpt[(status & 0x1c) >> 2]);
return 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-11 04:01:04 +0000