Skip to content
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

SFDP: Move Sector Map Parameter Table parsing under SFDP module #12318

Merged
merged 12 commits into from
Feb 19, 2020
Merged

SFDP: Move Sector Map Parameter Table parsing under SFDP module #12318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6a69040
QSPIFBlockDevice: drops unnecessary wrapper function
Jan 21, 2020
4e1fb07
SFDP: reorganizes internal info structure
Jan 21, 2020
cba5bfc
QSPIFBlockDevice: Reads Sector Map Table by using a SFDP Reader cb
Jan 21, 2020
6108f38
QSPIFBlockDevice: Consolidates SFDP info data
Jan 22, 2020
7518a35
SFDP: data structures got refactored
Jan 22, 2020
83c0fdf
QSPIFBlockDevice: Sector Map Table parsing moved under SFDP
Jan 22, 2020
5772266
SPIFBlockDevice: Consolidates SFDP info data
Jan 22, 2020
f51600c
SPIFBlockDevice: drops unnecessary wrapper function
Jan 27, 2020
4f4ef60
SFDP: Sector Map Parameter Table naming improvements
Jan 27, 2020
3ee153a
test config: SPIF - overwrite QSPIF with all devices
Jan 28, 2020
ba71b09
astyle fixes
Jan 28, 2020
e784c15
SFDP: doxygen improvements
Jan 29, 2020
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
181 changes: 64 additions & 117 deletions components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.cpp
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 11 additions & 22 deletions components/storage/blockdevice/COMPONENT_QSPIF/QSPIFBlockDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ enum qspif_polarity_mode {
QSPIF_POLARITY_MODE_1 /* CPOL=1, CPHA=1 */
};

#define QSPIF_MAX_REGIONS 10
#define MAX_NUM_OF_ERASE_TYPES 4
#define QSPIF_MAX_ACTIVE_FLASH_DEVICES 10

/** BlockDevice for SFDP based flash devices over QSPI bus
Expand Down Expand Up @@ -318,15 +316,9 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
/****************************************/
/* SFDP Detection and Parsing Functions */
/****************************************/
// Parse SFDP Headers and retrieve Basic Param and Sector Map Tables (if exist)
int _sfdp_parse_sfdp_headers(mbed::sfdp_hdr_info &hdr_info);

// Parse and Detect required Basic Parameters from Table
int _sfdp_parse_basic_param_table(uint32_t basic_table_addr, size_t basic_table_size);

// Parse and read information required by Regions Sector Map
int _sfdp_parse_sector_map_table(uint32_t sector_map_table_addr, size_t sector_map_table_size);

// Detect the soft reset protocol and reset - returns error if soft reset is not supported
int _sfdp_detect_reset_protocol_and_reset(uint8_t *basic_param_table_ptr);

Expand All @@ -344,7 +336,9 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
int _sfdp_detect_page_size(uint8_t *basic_param_table_ptr, int basic_param_table_size);

// Detect all supported erase types
int _sfdp_detect_erase_types_inst_and_size(uint8_t *basic_param_table_ptr, int basic_param_table_size);
int _sfdp_detect_erase_types_inst_and_size(uint8_t *basic_param_table_ptr,
int basic_param_table_size,
mbed::sfdp_smptbl_info &smptbl);

// Detect 4-byte addressing mode and enable it if supported
int _sfdp_detect_and_enable_4byte_addressing(uint8_t *basic_param_table_ptr, int basic_param_table_size);
Expand All @@ -356,11 +350,15 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
/* Utilities Functions */
/***********************/
// Find the region to which the given offset belong to
int _utils_find_addr_region(mbed::bd_size_t offset);
int _utils_find_addr_region(mbed::bd_size_t offset, mbed::sfdp_smptbl_info &smptbl);

// Iterate on all supported Erase Types of the Region to which the offset belong to.
// Iterates from highest type to lowest
int _utils_iterate_next_largest_erase_type(uint8_t &bitfield, int size, int offset, int boundry);
int _utils_iterate_next_largest_erase_type(uint8_t &bitfield,
int size,
int offset,
int region,
mbed::sfdp_smptbl_info &smptbl);

private:
enum qspif_clear_protection_method_t {
Expand Down Expand Up @@ -399,10 +397,6 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
// 4-byte addressing extension register write instruction
mbed::qspi_inst_t _4byte_msb_reg_write_inst;

// Up To 4 Erase Types are supported by SFDP (each with its own command Instruction and Size)
mbed::qspi_inst_t _erase_type_inst_arr[MAX_NUM_OF_ERASE_TYPES];
unsigned int _erase_type_size_arr[MAX_NUM_OF_ERASE_TYPES];

// Quad mode enable status register and bit
int _quad_enable_register_idx;
int _quad_enable_bit;
Expand All @@ -412,13 +406,8 @@ class QSPIFBlockDevice : public mbed::BlockDevice {
// Clear block protection
qspif_clear_protection_method_t _clear_protection_method;

// Sector Regions Map
int _regions_count; //number of regions
int _region_size_bytes[QSPIF_MAX_REGIONS]; //regions size in bytes
bd_size_t _region_high_boundary[QSPIF_MAX_REGIONS]; //region high address offset boundary
//Each Region can support a bit combination of any of the 4 Erase Types
uint8_t _region_erase_types_bitfield[QSPIF_MAX_REGIONS];
unsigned int _min_common_erase_size; // minimal common erase size for all regions (0 if none exists)
// Data extracted from the devices SFDP structure
mbed::sfdp_hdr_info _sfdp_info;

unsigned int _page_size_bytes; // Page size - 256 Bytes default
int _freq;
Expand Down
Loading