ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix functionality for FlashIAPBD & SlicingBD 

Due to discovery of inconsistent sector sizes in devices storage the is_valid_erase function was adjusted,
For FlashIAPBD the 'code size' was included to the calculation, preventing faulty "virtual" addresses calculation.
For SlicingBD the same error was fixed and in all 3 validation functions that sent addresses for validation and program/read/erase
different addresses.
pull/10108/head
Amir Cohen 2019-03-14 17:46:10 +02:00
parent b80c961dae
commit 7fac0722a4
5 changed files with 74 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.cpp
View File

@ -256,4 +256,13 @@ const char *FlashIAPBlockDevice::get_type() const
return "FLASHIAP";
}
bool FlashIAPBlockDevice::is_valid_erase(bd_addr_t addr, bd_size_t size) const
{
bd_addr_t base_addr = addr + (_base - _flash.get_flash_start());
return (
addr + size <= this->size() &&
base_addr % get_erase_size(addr) == 0 &&
(base_addr + size) % get_erase_size(addr + size - 1) == 0);
}
#endif /* DEVICE_FLASH */

9
components/storage/blockdevice/COMPONENT_FLASHIAP/FlashIAPBlockDevice.h
View File

@ -127,6 +127,15 @@ public:
*/
virtual const char *get_type() const;
/** Convenience function for checking block erase validity
*
* @param addr Address of block to begin erasing
* @param size Size to erase in bytes
* @return True if erase is valid for underlying block device
*/
virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const;
private:
// Device configuration
mbed::FlashIAP _flash;

6
features/storage/blockdevice/BlockDevice.h
View File

@ -198,7 +198,7 @@ public:
* @param size Size to read in bytes
* @return True if read is valid for underlying block device
*/
bool is_valid_read(bd_addr_t addr, bd_size_t size) const
virtual bool is_valid_read(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_read_size() == 0 &&
@ -212,7 +212,7 @@ public:
* @param size Size to write in bytes
* @return True if program is valid for underlying block device
*/
bool is_valid_program(bd_addr_t addr, bd_size_t size) const
virtual bool is_valid_program(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_program_size() == 0 &&
@ -226,7 +226,7 @@ public:
* @param size Size to erase in bytes
* @return True if erase is valid for underlying block device
*/
bool is_valid_erase(bd_addr_t addr, bd_size_t size) const
virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_erase_size(addr) == 0 &&

32
features/storage/blockdevice/SlicingBlockDevice.cpp
View File

@ -58,7 +58,7 @@ int SlicingBlockDevice::init()
}
// Check that block addresses are valid
MBED_ASSERT(_bd->is_valid_erase(_start, _stop - _start));
MBED_ASSERT(is_valid_erase(_start, _stop - _start));
return 0;
}
@ -75,22 +75,46 @@ int SlicingBlockDevice::sync()
int SlicingBlockDevice::read(void *b, bd_addr_t addr, bd_size_t size)
{
MBED_ASSERT(is_valid_read(addr, size));
MBED_ASSERT(is_valid_read(addr + _start, size));
return _bd->read(b, addr + _start, size);
}
int SlicingBlockDevice::program(const void *b, bd_addr_t addr, bd_size_t size)
{
MBED_ASSERT(is_valid_program(addr, size));
MBED_ASSERT(is_valid_program(addr + _start, size));
return _bd->program(b, addr + _start, size);
}
int SlicingBlockDevice::erase(bd_addr_t addr, bd_size_t size)
{
MBED_ASSERT(is_valid_erase(addr, size));
MBED_ASSERT(is_valid_erase(addr + _start, size));
return _bd->erase(addr + _start, size);
}
bool SlicingBlockDevice::is_valid_read(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_read_size() == 0 &&
size % get_read_size() == 0 &&
addr + size <= (this->size() + _start));
}
bool SlicingBlockDevice::is_valid_program(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_program_size() == 0 &&
size % get_program_size() == 0 &&
addr + size <= (this->size() + _start));
}
bool SlicingBlockDevice::is_valid_erase(bd_addr_t addr, bd_size_t size) const
{
return (
addr % get_erase_size(addr) == 0 &&
(addr + size) % get_erase_size(addr + size - 1) == 0 &&
addr + size <= (this->size() + _start));
}
bd_size_t SlicingBlockDevice::get_read_size() const
{
return _bd->get_read_size();

25
features/storage/blockdevice/SlicingBlockDevice.h
View File

@ -151,6 +151,31 @@ public:
*/
virtual const char *get_type() const;
/** Convenience function for checking block program validity
*
* @param addr Address of block to begin writing to
* @param size Size to write in bytes
* @return True if program is valid for underlying block device
*/
virtual bool is_valid_program(bd_addr_t addr, bd_size_t size) const;
/** Convenience function for checking block read validity
*
* @param addr Address of block to begin reading from
* @param size Size to read in bytes
* @return True if read is valid for underlying block device
*/
virtual bool is_valid_read(bd_addr_t addr, bd_size_t size) const;
/** Convenience function for checking block erase validity
*
* @param addr Address of block to begin erasing
* @param size Size to erase in bytes
* @return True if erase is valid for underlying block device
*/
virtual bool is_valid_erase(bd_addr_t addr, bd_size_t size) const;
protected:
BlockDevice *_bd;
bool _start_from_end;