sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xtensa/esp32: Enable the allocation of multiple SPI Flash partitions

Browse Source 
Currently the "esp32_spiflash_alloc_mtdpart" allocates a
statically-defined partition from "offset" and "size" set via
Kconfig.
This commit changes the function interface to receive those information
as arguments, enabling the creation of multiple MTD partitions with
different offsets and sizes.

Signed-off-by: Gustavo Henrique Nihei <gustavo.nihei@espressif.com>
This commit is contained in:
Gustavo Henrique Nihei 2021-07-28 18:34:09 -03:00 committed by Abdelatif Guettouche
parent 9b4e44842e
commit a7a922611b
6 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/xtensa/src/esp32/esp32_spiflash.c
View File

@ -71,9 +71,6 @@
#define SPI_FLASH_ENCRYPT_WORDS (32 / 4)
#define SPI_FLASH_ERASED_STATE (0xff)
#define ESP32_MTD_OFFSET CONFIG_ESP32_MTD_OFFSET
#define ESP32_MTD_SIZE CONFIG_ESP32_MTD_SIZE
#define MTD2PRIV(_dev) ((FAR struct esp32_spiflash_s *)_dev)
#define MTD_SIZE(_priv) ((_priv)->chip->chip_size)
#define MTD_BLKSIZE(_priv) ((_priv)->chip->page_size)
@ -1960,17 +1957,19 @@ static int esp32_ioctl(FAR struct mtd_dev_s *dev, int cmd,
* Name: esp32_spiflash_alloc_mtdpart
*
* Description:
* Alloc ESP32 SPI Flash MTD
* Allocate an MTD partition from the ESP32 SPI Flash.
*
* Input Parameters:
* None
* mtd_offset - MTD Partition offset from the base address in SPI Flash.
* mtd_size - Size for the MTD partition.
*
* Returned Value:
* ESP32 SPI Flash MTD data pointer if success or NULL if fail
*
****************************************************************************/
FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(void)
FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(uint32_t mtd_offset,
uint32_t mtd_size)
{
struct esp32_spiflash_s *priv = &g_esp32_spiflash1;
esp32_spiflash_chip_t *chip = priv->chip;
@ -1979,9 +1978,9 @@ FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(void)
uint32_t startblock;
uint32_t size;
ASSERT((ESP32_MTD_OFFSET + ESP32_MTD_SIZE) <= chip->chip_size);
ASSERT((ESP32_MTD_OFFSET % chip->sector_size) == 0);
ASSERT((ESP32_MTD_SIZE % chip->sector_size) == 0);
ASSERT((mtd_offset + mtd_size) <= chip->chip_size);
ASSERT((mtd_offset % chip->sector_size) == 0);
ASSERT((mtd_size % chip->sector_size) == 0);
finfo("ESP32 SPI Flash information:\n");
finfo("\tID = 0x%x\n", chip->device_id);
@ -1991,16 +1990,19 @@ FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(void)
finfo("\tSector size = %d KB\n", chip->sector_size / 1024);
finfo("\tBlock size = %d KB\n", chip->block_size / 1024);
#if ESP32_MTD_SIZE == 0
size = chip->chip_size - ESP32_MTD_OFFSET;
#else
size = ESP32_MTD_SIZE;
#endif
if (mtd_size == 0)
{
size = chip->chip_size - mtd_offset;
}
else
{
size = mtd_size;
}
finfo("\tMTD offset = 0x%x\n", ESP32_MTD_OFFSET);
finfo("\tMTD offset = 0x%x\n", mtd_offset);
finfo("\tMTD size = 0x%x\n", size);
startblock = MTD_SIZE2BLK(priv, ESP32_MTD_OFFSET);
startblock = MTD_SIZE2BLK(priv, mtd_offset);
blocks = MTD_SIZE2BLK(priv, size);
mtd_part = mtd_partition(&priv->mtd, startblock, blocks);

12
arch/xtensa/src/esp32/esp32_spiflash.h
View File

@ -49,20 +49,22 @@ extern "C"
****************************************************************************/
/****************************************************************************
* Name: esp32_spiflash_init
* Name: esp32_spiflash_alloc_mtdpart
*
* Description:
* Alloc ESP32 SPI Flash MTD.
* Allocate an MTD partition from the ESP32 SPI Flash.
*
* Input Parameters:
* None
* mtd_offset - MTD Partition offset from the base address in SPI Flash.
* mtd_size - Size for the MTD partition.
*
* Returned Value:
* ESP32 SPI Flash MTD data pointer if success or NULL if fail.
*
****************************************************************************/
FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(void);
FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(uint32_t mtd_offset,
uint32_t mtd_size);
/****************************************************************************
* Name: esp32_spiflash_get_mtd
@ -81,7 +83,7 @@ FAR struct mtd_dev_s *esp32_spiflash_alloc_mtdpart(void);
FAR struct mtd_dev_s *esp32_spiflash_get_mtd(void);
/****************************************************************************
* Name: esp32_spiflash_get_mtd
* Name: esp32_spiflash_encrypt_get_mtd
*
* Description:
* Get ESP32 SPI Flash encryption raw MTD.

9
boards/xtensa/esp32/common/src/esp32_board_wlan.c
View File

@ -36,6 +36,13 @@
#include "esp32_spiflash.h"
#include "esp32_wlan.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ESP32_MTD_OFFSET CONFIG_ESP32_MTD_OFFSET
#define ESP32_MTD_SIZE CONFIG_ESP32_MTD_SIZE
/****************************************************************************
* Private Functions
****************************************************************************/
@ -47,7 +54,7 @@ static int esp32_init_wifi_storage(void)
const char *path = "/dev/mtdblock1";
FAR struct mtd_dev_s *mtd_part;
mtd_part = esp32_spiflash_alloc_mtdpart();
mtd_part = esp32_spiflash_alloc_mtdpart(ESP32_MTD_OFFSET, ESP32_MTD_SIZE);
if (!mtd_part)
{
syslog(LOG_ERR, "ERROR: Failed to alloc MTD partition of SPI Flash\n");

9
boards/xtensa/esp32/esp32-devkitc/src/esp32_spiflash.c
View File

@ -39,6 +39,13 @@
#include "esp32_spiflash.h"
#include "esp32-devkitc.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ESP32_MTD_OFFSET CONFIG_ESP32_MTD_OFFSET
#define ESP32_MTD_SIZE CONFIG_ESP32_MTD_SIZE
/****************************************************************************
* Public Functions
****************************************************************************/
@ -55,7 +62,7 @@ int esp32_spiflash_init(void)
FAR struct mtd_dev_s *mtd;
int ret = ERROR;
mtd = esp32_spiflash_alloc_mtdpart();
mtd = esp32_spiflash_alloc_mtdpart(ESP32_MTD_OFFSET, ESP32_MTD_SIZE);
#if defined (CONFIG_ESP32_SPIFLASH_SMARTFS)
ret = smart_initialize(0, mtd, NULL);

9
boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_spiflash.c
View File

@ -39,6 +39,13 @@
#include "esp32_spiflash.h"
#include "esp32-ethernet-kit.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ESP32_MTD_OFFSET CONFIG_ESP32_MTD_OFFSET
#define ESP32_MTD_SIZE CONFIG_ESP32_MTD_SIZE
/****************************************************************************
* Public Functions
****************************************************************************/
@ -55,7 +62,7 @@ int esp32_spiflash_init(void)
FAR struct mtd_dev_s *mtd;
int ret = ERROR;
mtd = esp32_spiflash_alloc_mtdpart();
mtd = esp32_spiflash_alloc_mtdpart(ESP32_MTD_OFFSET, ESP32_MTD_SIZE);
#if defined (CONFIG_ESP32_SPIFLASH_SMARTFS)
ret = smart_initialize(0, mtd, NULL);

9
boards/xtensa/esp32/esp32-wrover-kit/src/esp32_spiflash.c
View File

@ -39,6 +39,13 @@
#include "esp32_spiflash.h"
#include "esp32-wrover-kit.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
#define ESP32_MTD_OFFSET CONFIG_ESP32_MTD_OFFSET
#define ESP32_MTD_SIZE CONFIG_ESP32_MTD_SIZE
/****************************************************************************
* Public Functions
****************************************************************************/
@ -55,7 +62,7 @@ int esp32_spiflash_init(void)
FAR struct mtd_dev_s *mtd;
int ret = ERROR;
mtd = esp32_spiflash_alloc_mtdpart();
mtd = esp32_spiflash_alloc_mtdpart(ESP32_MTD_OFFSET, ESP32_MTD_SIZE);
#if defined (CONFIG_ESP32_SPIFLASH_SMARTFS)
ret = smart_initialize(0, mtd, NULL);