You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/07/17 16:00:51 UTC
[incubator-nuttx] branch master updated (b109050 -> c05feda)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from b109050 net/rpmsg: add multi-iov support
new 30cb497 mtd: Add MTDIOC_ERASESTATE command for retrieving erase state value
new df2e890 xtensa/esp32: Implement MTDIOC_ERASESTATE for SPI Flash driver
new 50ea223 arm/lpc43xx: Implement MTDIOC_ERASESTATE for SPIFI Flash driver
new 882a096 drivers/mtd: Implement MTDIOC_ERASESTATE for MTD drivers
new c05feda risc-v/esp32c3: Implement MTDIOC_ERASESTATE for SPI Flash driver
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/lpc43xx/lpc43_spifi.c | 9 +++++++++
arch/risc-v/src/esp32c3/esp32c3_spiflash.c | 10 ++++++++++
arch/xtensa/src/esp32/esp32_spiflash.c | 10 ++++++++++
drivers/mtd/filemtd.c | 9 +++++++++
drivers/mtd/gd25.c | 9 +++++++++
drivers/mtd/mx25lx.c | 9 +++++++++
drivers/mtd/mx25rxx.c | 9 +++++++++
drivers/mtd/n25qxxx.c | 9 +++++++++
drivers/mtd/rammtd.c | 9 +++++++++
drivers/mtd/s25fl1.c | 9 +++++++++
drivers/mtd/sector512.c | 9 +++++++++
drivers/mtd/sst25.c | 9 +++++++++
drivers/mtd/w25.c | 9 +++++++++
drivers/mtd/w25qxxxjv.c | 9 +++++++++
include/nuttx/mtd/mtd.h | 3 +++
15 files changed, 131 insertions(+)
[incubator-nuttx] 02/05: xtensa/esp32: Implement MTDIOC_ERASESTATE
for SPI Flash driver
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit df2e890cfcd3bd326e268396b42c4b4f827db72a
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Jul 13 19:33:56 2021 -0300
xtensa/esp32: Implement MTDIOC_ERASESTATE for SPI Flash driver
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/xtensa/src/esp32/esp32_spiflash.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/xtensa/src/esp32/esp32_spiflash.c b/arch/xtensa/src/esp32/esp32_spiflash.c
index 571e067..5da7893 100644
--- a/arch/xtensa/src/esp32/esp32_spiflash.c
+++ b/arch/xtensa/src/esp32/esp32_spiflash.c
@@ -69,6 +69,7 @@
#define SPI_FLASH_ENCRYPT_UNIT_SIZE (32)
#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
@@ -1933,6 +1934,15 @@ static int esp32_ioctl(FAR struct mtd_dev_s *dev, int cmd,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = SPI_FLASH_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY;
break;
[incubator-nuttx] 04/05: drivers/mtd: Implement MTDIOC_ERASESTATE
for MTD drivers
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 882a0964b32610cf73a40ac71af7e82944b4449f
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Jul 16 14:16:41 2021 -0300
drivers/mtd: Implement MTDIOC_ERASESTATE for MTD drivers
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
drivers/mtd/filemtd.c | 9 +++++++++
drivers/mtd/gd25.c | 9 +++++++++
drivers/mtd/mx25lx.c | 9 +++++++++
drivers/mtd/mx25rxx.c | 9 +++++++++
drivers/mtd/n25qxxx.c | 9 +++++++++
drivers/mtd/rammtd.c | 9 +++++++++
drivers/mtd/s25fl1.c | 9 +++++++++
drivers/mtd/sector512.c | 9 +++++++++
drivers/mtd/sst25.c | 9 +++++++++
drivers/mtd/w25.c | 9 +++++++++
drivers/mtd/w25qxxxjv.c | 9 +++++++++
11 files changed, 99 insertions(+)
diff --git a/drivers/mtd/filemtd.c b/drivers/mtd/filemtd.c
index 752c356..a25ba1a 100644
--- a/drivers/mtd/filemtd.c
+++ b/drivers/mtd/filemtd.c
@@ -449,6 +449,15 @@ static int filemtd_ioctl(FAR struct mtd_dev_s *dev, int cmd,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = CONFIG_FILEMTD_ERASESTATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad command */
break;
diff --git a/drivers/mtd/gd25.c b/drivers/mtd/gd25.c
index 9c0b5b2..59289fa 100644
--- a/drivers/mtd/gd25.c
+++ b/drivers/mtd/gd25.c
@@ -957,6 +957,15 @@ static int gd25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = GD25_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY;
diff --git a/drivers/mtd/mx25lx.c b/drivers/mtd/mx25lx.c
index 5c5fd63..7ecca96 100644
--- a/drivers/mtd/mx25lx.c
+++ b/drivers/mtd/mx25lx.c
@@ -1093,6 +1093,15 @@ static int mx25l_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = MX25L_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY; /* Bad command */
diff --git a/drivers/mtd/mx25rxx.c b/drivers/mtd/mx25rxx.c
index e992754..2b092d3 100644
--- a/drivers/mtd/mx25rxx.c
+++ b/drivers/mtd/mx25rxx.c
@@ -763,6 +763,15 @@ int mx25rxx_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = MX25RXX_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad/unsupported command */
break;
diff --git a/drivers/mtd/n25qxxx.c b/drivers/mtd/n25qxxx.c
index e332639..cb3ca0a 100644
--- a/drivers/mtd/n25qxxx.c
+++ b/drivers/mtd/n25qxxx.c
@@ -1431,6 +1431,15 @@ static int n25qxxx_ioctl(FAR struct mtd_dev_s *dev,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = N25QXXX_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad/unsupported command */
break;
diff --git a/drivers/mtd/rammtd.c b/drivers/mtd/rammtd.c
index bacc389..47c80ab 100644
--- a/drivers/mtd/rammtd.c
+++ b/drivers/mtd/rammtd.c
@@ -410,6 +410,15 @@ static int ram_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = CONFIG_RAMMTD_ERASESTATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad command */
break;
diff --git a/drivers/mtd/s25fl1.c b/drivers/mtd/s25fl1.c
index 91c4e96..dcf6d2a 100644
--- a/drivers/mtd/s25fl1.c
+++ b/drivers/mtd/s25fl1.c
@@ -1477,6 +1477,15 @@ static int s25fl1_ioctl(FAR struct mtd_dev_s *dev,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = S25FL1_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad/unsupported command */
break;
diff --git a/drivers/mtd/sector512.c b/drivers/mtd/sector512.c
index f670f9d..cad2b82 100644
--- a/drivers/mtd/sector512.c
+++ b/drivers/mtd/sector512.c
@@ -557,6 +557,15 @@ static int s512_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = CONFIG_MTD_SECT512_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY; /* Bad command */
diff --git a/drivers/mtd/sst25.c b/drivers/mtd/sst25.c
index 8cde8ea..4e03389 100644
--- a/drivers/mtd/sst25.c
+++ b/drivers/mtd/sst25.c
@@ -1205,6 +1205,15 @@ static int sst25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = SST25_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY; /* Bad command */
diff --git a/drivers/mtd/w25.c b/drivers/mtd/w25.c
index a430ad7..4edc64f 100644
--- a/drivers/mtd/w25.c
+++ b/drivers/mtd/w25.c
@@ -1333,6 +1333,15 @@ static int w25_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = W25_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY; /* Bad command */
diff --git a/drivers/mtd/w25qxxxjv.c b/drivers/mtd/w25qxxxjv.c
index 830a814..b371ce6 100644
--- a/drivers/mtd/w25qxxxjv.c
+++ b/drivers/mtd/w25qxxxjv.c
@@ -1437,6 +1437,15 @@ static int w25qxxxjv_ioctl(FAR struct mtd_dev_s *dev,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = W25QXXXJV_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY; /* Bad/unsupported command */
break;
[incubator-nuttx] 05/05: risc-v/esp32c3: Implement
MTDIOC_ERASESTATE for SPI Flash driver
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c05feda208efe6c88797a8821f15a93393cb87ea
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Jul 16 14:21:57 2021 -0300
risc-v/esp32c3: Implement MTDIOC_ERASESTATE for SPI Flash driver
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/risc-v/src/esp32c3/esp32c3_spiflash.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
index ecd9ad8..24b48a1 100644
--- a/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
+++ b/arch/risc-v/src/esp32c3/esp32c3_spiflash.c
@@ -74,6 +74,7 @@
#define SPI_FLASH_BLK_SIZE 256
#define SPI_FLASH_ERASE_SIZE 4096
+#define SPI_FLASH_ERASED_STATE (0xff)
#define SPI_FLASH_SIZE (4 * 1024 * 1024)
#define ESP32C3_MTD_OFFSET CONFIG_ESP32C3_MTD_OFFSET
@@ -875,6 +876,15 @@ static int esp32c3_ioctl(struct mtd_dev_s *dev, int cmd,
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = SPI_FLASH_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
default:
ret = -ENOTTY;
break;
[incubator-nuttx] 03/05: arm/lpc43xx: Implement MTDIOC_ERASESTATE
for SPIFI Flash driver
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 50ea22314e787de13b8dcd73ca0ee694ad3123f6
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Fri Jul 16 14:15:51 2021 -0300
arm/lpc43xx: Implement MTDIOC_ERASESTATE for SPIFI Flash driver
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
arch/arm/src/lpc43xx/lpc43_spifi.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/src/lpc43xx/lpc43_spifi.c b/arch/arm/src/lpc43xx/lpc43_spifi.c
index 1e5df20..cbc2905 100644
--- a/arch/arm/src/lpc43xx/lpc43_spifi.c
+++ b/arch/arm/src/lpc43xx/lpc43_spifi.c
@@ -895,6 +895,15 @@ static int lpc43_ioctl(FAR struct mtd_dev_s *dev, int cmd, unsigned long arg)
}
break;
+ case MTDIOC_ERASESTATE:
+ {
+ FAR uint8_t *result = (FAR uint8_t *)arg;
+ *result = SPIFI_ERASED_STATE;
+
+ ret = OK;
+ }
+ break;
+
case MTDIOC_XIPBASE:
default:
ret = -ENOTTY; /* Bad command */
[incubator-nuttx] 01/05: mtd: Add MTDIOC_ERASESTATE command for
retrieving erase state value
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 30cb497fe125de6ae2e52a72758180437ec65974
Author: Gustavo Henrique Nihei <gu...@espressif.com>
AuthorDate: Tue Jul 13 19:33:12 2021 -0300
mtd: Add MTDIOC_ERASESTATE command for retrieving erase state value
Signed-off-by: Gustavo Henrique Nihei <gu...@espressif.com>
---
include/nuttx/mtd/mtd.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/nuttx/mtd/mtd.h b/include/nuttx/mtd/mtd.h
index 10e5567..fa29318 100644
--- a/include/nuttx/mtd/mtd.h
+++ b/include/nuttx/mtd/mtd.h
@@ -71,6 +71,9 @@
#define MTDIOC_FLUSH _MTDIOC(0x0009) /* IN: None
* OUT: None (ioctl return value provides
* success/failure indication). */
+#define MTDIOC_ERASESTATE _MTDIOC(0x000a) /* IN: Pointer to uint8_t
+ * OUT: Byte value that represents the
+ * erased state of the MTD cell */
/* Macros to hide implementation */