diff --git a/host/libraries/libbladeRF/include/libbladeRF.h b/host/libraries/libbladeRF/include/libbladeRF.h index fc2808c5..265e809a 100644 --- a/host/libraries/libbladeRF/include/libbladeRF.h +++ b/host/libraries/libbladeRF/include/libbladeRF.h @@ -890,6 +890,51 @@ API_EXPORT int bladerf_stats(struct bladerf *dev, struct bladerf_stats *stats); API_EXPORT int bladerf_flash_firmware(struct bladerf *dev, const char *firmware); +/** + * Erase pages from FX3 flash device + * + * @note Only entire pages are erased + * + * @param dev Device handle + * @param page_offset Page offset to begin erasing + * @param n_bytes Number of bytes to erase + * + * @return Number of pages erased on success, value from \ref RETCODES list on + * failure + */ +API_EXPORT int bladerf_erase_flash(struct bladerf *dev, int page_offset, + int n_bytes); + +/** + * Read bytes from FX3 flash device + * + * @param dev Device handle + * @param page_offset Page offset to begin reading + * @param ptr Buffer to read into, must be n_bytes long + * @param n_bytes Number of bytes to read + * + * @return Number of bytes read on success, value from \ref RETCODES list on + * failure + */ +API_EXPORT int bladerf_read_flash(struct bladerf *dev, int page_offset, + uint8_t *ptr, size_t n_bytes); + +/** + * Write bytes to FX3 flash device + * + * @note Only write erased pages + * + * @param dev Device handle + * @param page_offset Page offset to begin writing + * @param data Data to write to flash + * @param data_size Number of bytes to write + * + * @return Number of bytes written on success, value from \ref RETCODES list + * on failure + */ +API_EXPORT int bladerf_write_flash(struct bladerf *dev, int page_offset, + uint8_t *data, size_t data_size); + /** * Reset the device * diff --git a/host/libraries/libbladeRF/src/backend/libusb.c b/host/libraries/libbladeRF/src/backend/libusb.c index 064128d3..2526b033 100644 --- a/host/libraries/libbladeRF/src/backend/libusb.c +++ b/host/libraries/libbladeRF/src/backend/libusb.c @@ -499,7 +499,7 @@ static int lusb_load_fpga(struct bladerf *dev, uint8_t *image, size_t image_size } /* Note: n_bytes is rounded up to a multiple of the sector size here */ -static int erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) +static int lusb_erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) { int status = 0; int sector_to_erase; @@ -510,6 +510,13 @@ static int erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) assert(sector_offset < FLASH_NUM_SECTORS); assert((sector_offset + n_sectors) < FLASH_NUM_SECTORS); + status = change_setting(dev, USB_IF_SPI_FLASH); + + if (status) { + log_error("Failed to set interface: %s\n", libusb_error_name(status)); + status = BLADERF_ERR_IO; + } + log_info("Erasing %d sectors starting @ sector %d\n", n_sectors, sector_offset); @@ -542,20 +549,35 @@ static int erase_flash(struct bladerf *dev, int sector_offset, int n_bytes) } } - return status; + if (status == 0) { + return n_sectors; + } else { + return status; + } } -static int read_flash(struct bladerf *dev, int page_offset, +static int lusb_read_flash(struct bladerf *dev, int page_offset, uint8_t *ptr, size_t n_bytes) { int status = 0; - int page_i, n_read; + int page_i, n_read, total_read; int read_size = dev->speed ? FLASH_PAGE_SIZE: 64; int pages_to_read = FLASH_BYTES_TO_PAGES(n_bytes); struct bladerf_lusb *lusb = dev->backend; assert(page_offset < FLASH_NUM_PAGES); assert((page_offset + n_bytes) < FLASH_NUM_PAGES); + /* FIXME: support data_size that are not multiple of pages */ + assert(n_bytes % FLASH_PAGE_SIZE == 0); + + status = change_setting(dev, USB_IF_SPI_FLASH); + + if (status) { + log_error("Failed to set interface: %s\n", libusb_error_name(status)); + status = BLADERF_ERR_IO; + } + + total_read = 0; for (page_i = page_offset; page_i < (page_offset + pages_to_read) && !status; @@ -588,12 +610,18 @@ static int read_flash(struct bladerf *dev, int page_offset, status = BLADERF_ERR_IO; } else { n_read += read_size; + total_read += read_size; ptr += read_size; status = 0; } } while (n_read < FLASH_PAGE_SIZE && !status); } - return status; + + if (status == 0) { + return total_read; + } else { + return status; + } } static int verify_flash(struct bladerf *dev, int page_offset, @@ -667,21 +695,33 @@ static int verify_flash(struct bladerf *dev, int page_offset, return status; } -static int write_flash(struct bladerf *dev, int page_offset, +static int lusb_write_flash(struct bladerf *dev, int page_offset, uint8_t *data, size_t data_size) { int status = 0; int i; - int n_write; + int n_write, total_written; int write_size = dev->speed ? FLASH_PAGE_SIZE : 64; int pages_to_write = FLASH_BYTES_TO_PAGES(data_size); struct bladerf_lusb *lusb = dev->backend; uint8_t *data_page; + log_info("Flashing with write size = %d\n", write_size); + status = change_setting(dev, USB_IF_SPI_FLASH); + + if (status) { + log_error("Failed to set interface: %s\n", libusb_error_name(status)); + status = BLADERF_ERR_IO; + } + log_info("Flashing with write size = %d\n", write_size); assert(page_offset < FLASH_NUM_PAGES); assert((page_offset + pages_to_write) < FLASH_NUM_PAGES); + /* FIXME: support data_size that are not multiple of pages */ + assert(data_size % FLASH_PAGE_SIZE == 0); + + total_written = 0; for (i = page_offset; i < (page_offset + pages_to_write) && !status; i++) { n_write = 0; @@ -709,12 +749,17 @@ static int write_flash(struct bladerf *dev, int page_offset, status = BLADERF_ERR_IO; } else { n_write += write_size; + total_written += write_size; status = 0; } } while (n_write < FLASH_PAGE_SIZE && !status); } - return status; + if (status == 0) { + return total_written; + } else { + return status; + } } static int lusb_flash_firmware(struct bladerf *dev, @@ -730,14 +775,14 @@ static int lusb_flash_firmware(struct bladerf *dev, } if (status == 0) { - status = erase_flash(dev, 0, image_size); + status = lusb_erase_flash(dev, 0, image_size); } - if (status == 0) { - status = write_flash(dev, 0, image, image_size); + if (status >= 0) { + status = lusb_write_flash(dev, 0, image, image_size); } - if (status == 0) { + if (status >= 0) { status = verify_flash(dev, 0, image, image_size); } @@ -794,8 +839,18 @@ static int lusb_get_otp(struct bladerf *dev, char *otp) return 0; } +#define CAL_SIZE 256 + static int lusb_get_cal(struct bladerf *dev, char *cal) { - return read_flash(dev, 768, (uint8_t *)cal, 256); + int status = lusb_read_flash(dev, 768, (uint8_t *)cal, CAL_SIZE); + + if (status < 0) { + return status; + } else if (status == CAL_SIZE) { + return 0; + } else { + return BLADERF_ERR_IO; + } } static int lusb_get_fw_version(struct bladerf *dev, @@ -1492,6 +1547,9 @@ const struct bladerf_fn bladerf_lusb_fn = { FIELD_INIT(.is_fpga_configured, lusb_is_fpga_configured), FIELD_INIT(.flash_firmware, lusb_flash_firmware), + FIELD_INIT(.erase_flash, lusb_erase_flash), + FIELD_INIT(.read_flash, lusb_read_flash), + FIELD_INIT(.write_flash, lusb_write_flash), FIELD_INIT(.device_reset, lusb_device_reset), FIELD_INIT(.get_cal, lusb_get_cal), diff --git a/host/libraries/libbladeRF/src/backend/linux.c b/host/libraries/libbladeRF/src/backend/linux.c index 12119c26..da4c8736 100644 --- a/host/libraries/libbladeRF/src/backend/linux.c +++ b/host/libraries/libbladeRF/src/backend/linux.c @@ -734,6 +734,9 @@ const struct bladerf_fn bladerf_linux_fn = { FIELD_INIT(.is_fpga_configured, linux_is_fpga_configured), FIELD_INIT(.flash_firmware, linux_flash_firmware), + FIELD_INIT(.erase_flash, NULL), + FIELD_INIT(.read_flash, NULL), + FIELD_INIT(.write_flash, NULL), FIELD_INIT(.device_reset, linux_device_reset), FIELD_INIT(.get_cal, linux_get_cal), diff --git a/host/libraries/libbladeRF/src/bladerf.c b/host/libraries/libbladeRF/src/bladerf.c index 6311667c..56939630 100644 --- a/host/libraries/libbladeRF/src/bladerf.c +++ b/host/libraries/libbladeRF/src/bladerf.c @@ -711,6 +711,36 @@ int bladerf_flash_firmware(struct bladerf *dev, const char *firmware_file) return status; } +int bladerf_erase_flash(struct bladerf *dev, int page_offset, + int n_bytes) +{ + if (!dev->fn->erase_flash) { + return BLADERF_ERR_UNSUPPORTED; + } + + return dev->fn->erase_flash(dev, page_offset, n_bytes); +} + +int bladerf_read_flash(struct bladerf *dev, int page_offset, + uint8_t *ptr, size_t n_bytes) +{ + if (!dev->fn->read_flash) { + return BLADERF_ERR_UNSUPPORTED; + } + + return dev->fn->read_flash(dev, page_offset, ptr, n_bytes); +} + +int bladerf_write_flash(struct bladerf *dev, int page_offset, + uint8_t *data, size_t data_size) +{ + if (!dev->fn->write_flash) { + return BLADERF_ERR_UNSUPPORTED; + } + + return dev->fn->write_flash(dev, page_offset, data, data_size); +} + int bladerf_device_reset(struct bladerf *dev) { return dev->fn->device_reset(dev); diff --git a/host/libraries/libbladeRF/src/bladerf_priv.h b/host/libraries/libbladeRF/src/bladerf_priv.h index cc95af16..cfbb86ed 100644 --- a/host/libraries/libbladeRF/src/bladerf_priv.h +++ b/host/libraries/libbladeRF/src/bladerf_priv.h @@ -98,6 +98,12 @@ struct bladerf_fn { /* Flash FX3 firmware */ int (*flash_firmware)(struct bladerf *dev, uint8_t *image, size_t image_size); + int (*erase_flash)(struct bladerf *dev, int page_offset, + int n_bytes); + int (*read_flash)(struct bladerf *dev, int page_offset, + uint8_t *ptr, size_t n_bytes); + int (*write_flash)(struct bladerf *dev, int page_offset, + uint8_t *data, size_t data_size); int (*device_reset)(struct bladerf *dev); /* Platform information */