Commit 5e24a2ef8bf4f09b18cf4e943c73bfdd169a7581
1 parent
42116f644b
Exists in
smarc_8mq_lf_v2020.04
and in
12 other branches
dm: spi: Add logging of some return values
When SPI flash operations fail it is helpful to be able to see the error codes and where they are generated. Add logging to capture this information for read operations. Signed-off-by: Simon Glass <sjg@chromium.org>
Showing 4 changed files with 11 additions and 11 deletions Side-by-side Diff
drivers/mtd/spi/sf-uclass.c
| ... | ... | @@ -14,18 +14,18 @@ |
| 14 | 14 | |
| 15 | 15 | int spi_flash_read_dm(struct udevice *dev, u32 offset, size_t len, void *buf) |
| 16 | 16 | { |
| 17 | - return sf_get_ops(dev)->read(dev, offset, len, buf); | |
| 17 | + return log_ret(sf_get_ops(dev)->read(dev, offset, len, buf)); | |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | int spi_flash_write_dm(struct udevice *dev, u32 offset, size_t len, |
| 21 | 21 | const void *buf) |
| 22 | 22 | { |
| 23 | - return sf_get_ops(dev)->write(dev, offset, len, buf); | |
| 23 | + return log_ret(sf_get_ops(dev)->write(dev, offset, len, buf)); | |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len) |
| 27 | 27 | { |
| 28 | - return sf_get_ops(dev)->erase(dev, offset, len); | |
| 28 | + return log_ret(sf_get_ops(dev)->erase(dev, offset, len)); | |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /* |
drivers/mtd/spi/sf_probe.c
| ... | ... | @@ -97,7 +97,7 @@ |
| 97 | 97 | { |
| 98 | 98 | struct spi_flash *flash = dev_get_uclass_priv(dev); |
| 99 | 99 | |
| 100 | - return spi_flash_cmd_read_ops(flash, offset, len, buf); | |
| 100 | + return log_ret(spi_flash_cmd_read_ops(flash, offset, len, buf)); | |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | static int spi_flash_std_write(struct udevice *dev, u32 offset, size_t len, |
drivers/mtd/spi/spi_flash.c
| ... | ... | @@ -471,14 +471,14 @@ |
| 471 | 471 | u8 cmdsz; |
| 472 | 472 | u32 remain_len, read_len, read_addr; |
| 473 | 473 | int bank_sel = 0; |
| 474 | - int ret = -1; | |
| 474 | + int ret = 0; | |
| 475 | 475 | |
| 476 | 476 | /* Handle memory-mapped SPI */ |
| 477 | 477 | if (flash->memory_map) { |
| 478 | 478 | ret = spi_claim_bus(spi); |
| 479 | 479 | if (ret) { |
| 480 | 480 | debug("SF: unable to claim SPI bus\n"); |
| 481 | - return ret; | |
| 481 | + return log_ret(ret); | |
| 482 | 482 | } |
| 483 | 483 | spi_xfer(spi, 0, NULL, NULL, SPI_XFER_MMAP); |
| 484 | 484 | spi_flash_copy_mmap(data, flash->memory_map + offset, len); |
| ... | ... | @@ -501,7 +501,7 @@ |
| 501 | 501 | #ifdef CONFIG_SPI_FLASH_BAR |
| 502 | 502 | ret = write_bar(flash, read_addr); |
| 503 | 503 | if (ret < 0) |
| 504 | - return ret; | |
| 504 | + return log_ret(ret); | |
| 505 | 505 | bank_sel = flash->bank_curr; |
| 506 | 506 | #endif |
| 507 | 507 | remain_len = ((SPI_FLASH_16MB_BOUN << flash->shift) * |
| ... | ... | @@ -531,7 +531,7 @@ |
| 531 | 531 | ret = clean_bar(flash); |
| 532 | 532 | #endif |
| 533 | 533 | |
| 534 | - return ret; | |
| 534 | + return log_ret(ret); | |
| 535 | 535 | } |
| 536 | 536 | |
| 537 | 537 | #ifdef CONFIG_SPI_FLASH_SST |
drivers/spi/spi-uclass.c
| ... | ... | @@ -63,11 +63,11 @@ |
| 63 | 63 | int ret = spi_set_speed_mode(bus, speed, slave->mode); |
| 64 | 64 | |
| 65 | 65 | if (ret) |
| 66 | - return ret; | |
| 66 | + return log_ret(ret); | |
| 67 | 67 | slave->speed = speed; |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - return ops->claim_bus ? ops->claim_bus(dev) : 0; | |
| 70 | + return log_ret(ops->claim_bus ? ops->claim_bus(dev) : 0); | |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | void dm_spi_release_bus(struct udevice *dev) |
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | |
| 93 | 93 | int spi_claim_bus(struct spi_slave *slave) |
| 94 | 94 | { |
| 95 | - return dm_spi_claim_bus(slave->dev); | |
| 95 | + return log_ret(dm_spi_claim_bus(slave->dev)); | |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | void spi_release_bus(struct spi_slave *slave) |