Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-15 20:08:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

bsps/xilinx-zynq: Added CFI support to QSPI driver

Browse Source
This commit is contained in:
Aaron Nyholm
2025-11-03 15:19:35 +11:00
committed by Kinsey Moore
parent fabfef6c24
commit 71f4ff6316
1 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
bsps/arm/xilinx-zynq/dev/spi/zynq-qspi-flash.c
View File

@@ -31,6 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <dev/nor/config-parser.h>
#include <dev/spi/zynq-qspi-flash.h> #include <dev/spi/zynq-qspi-flash.h>
#include <dev/spi/zynq-qspi-flash-defs.h> #include <dev/spi/zynq-qspi-flash-defs.h>
#include <dev/spi/jedec_flash.h> #include <dev/spi/jedec_flash.h>
@@ -750,6 +751,8 @@ zqspi_error zqspi_readid(zqspiflash *driver, uint32_t *jedec_id)
zqspi_error fe; zqspi_error fe;
uint8_t value = 0; uint8_t value = 0;
int index = 0; int index = 0;
bool use_cfi = true;
size_t cfi_raw_len = 0;
if (driver->jedec_id != 0) { if (driver->jedec_id != 0) {
if (jedec_id != NULL) { if (jedec_id != NULL) {
@@ -759,9 +762,9 @@ zqspi_error zqspi_readid(zqspiflash *driver, uint32_t *jedec_id)
} }
zqspi_transfer_buffer_clear(&driver->buf); zqspi_transfer_buffer_clear(&driver->buf);
zqspi_transfer_buffer_set_length(&driver->buf, 1 + 3); zqspi_transfer_buffer_set_length(&driver->buf, 1 + 4);
zqspi_transfer_buffer_set8(&driver->buf, ZQSPI_FLASH_READ_ID); zqspi_transfer_buffer_set8(&driver->buf, ZQSPI_FLASH_READ_ID);
zqspi_transfer_buffer_fill(&driver->buf, 0x00, 3); zqspi_transfer_buffer_fill(&driver->buf, 0x00, 4);
zqspi_transfer_buffer_set_dir(&driver->buf, ZQSPI_FLASH_RX_TRANS); zqspi_transfer_buffer_set_dir(&driver->buf, ZQSPI_FLASH_RX_TRANS);
zqspi_transfer_buffer_set_command_len(&driver->buf, ZQSPI_FLASH_COMMAND_SIZE); zqspi_transfer_buffer_set_command_len(&driver->buf, ZQSPI_FLASH_COMMAND_SIZE);
@@ -776,19 +779,58 @@ zqspi_error zqspi_readid(zqspiflash *driver, uint32_t *jedec_id)
zqspi_transfer_buffer_get8(&driver->buf, &value); zqspi_transfer_buffer_get8(&driver->buf, &value);
driver->jedec_id |= value; driver->jedec_id |= value;
zqspi_transfer_buffer_get8(&driver->buf, &value);
cfi_raw_len = value + 4;
if (jedec_id != NULL) { if (jedec_id != NULL) {
*jedec_id = driver->jedec_id; *jedec_id = driver->jedec_id;
} }
while (flash_dev_table[index].jedec_id != driver->jedec_id) { while (flash_dev_table[index].jedec_id != 0) {
if (flash_dev_table[index].jedec_id == 0) { if (flash_dev_table[index].jedec_id == driver->jedec_id) {
return ZQSPI_FLASH_INVALID_DEVICE; use_cfi = false;
driver->flash_size = flash_dev_table[index].flash_size;
driver->flash_erase_sector_size = flash_dev_table[index].sec_size;
driver->flash_page_size = flash_dev_table[index].page_size;
break;
} }
index++; index++;
} }
driver->flash_size = flash_dev_table[index].flash_size;
driver->flash_erase_sector_size = flash_dev_table[index].sec_size; if (use_cfi) {
driver->flash_page_size = flash_dev_table[index].page_size; rtems_status_code sc;
NOR_Config_Data nor_config;
uint8_t cfi_data[256];
if (cfi_raw_len > sizeof(cfi_data)) {
return ZQSPI_FLASH_INVALID_DEVICE;
}
zqspi_transfer_buffer_clear(&driver->buf);
zqspi_transfer_buffer_set_length(&driver->buf, 1 + cfi_raw_len);
zqspi_transfer_buffer_set8(&driver->buf, ZQSPI_FLASH_READ_ID);
zqspi_transfer_buffer_fill(&driver->buf, 0x00, cfi_raw_len);
zqspi_transfer_buffer_set_dir(&driver->buf, ZQSPI_FLASH_RX_TRANS);
zqspi_transfer_buffer_set_command_len(&driver->buf, ZQSPI_FLASH_COMMAND_SIZE);
fe = zqspi_transfer(&driver->buf, &driver->initialised);
if (fe != ZQSPI_FLASH_NO_ERROR)
return fe;
fe = zqspi_transfer_buffer_copy_out(&driver->buf, cfi_data, cfi_raw_len);
if (fe != ZQSPI_FLASH_NO_ERROR)
return fe;
sc = CFI_parse_from_buffer(cfi_data, cfi_raw_len, &nor_config);
if (sc != RTEMS_SUCCESSFUL) {
return ZQSPI_FLASH_INVALID_DEVICE;
}
driver->flash_size = nor_config.DeviceSize;
driver->flash_erase_sector_size = nor_config.SectorSize;
driver->flash_page_size = nor_config.PageSize;
}
#if ZQSPI_FLASH_FAST_READ #if ZQSPI_FLASH_FAST_READ
driver->flash_read_dummies = 1; driver->flash_read_dummies = 1;
#endif #endif