xtensa/esp32s3: Add 16-byte-align SPI-Flash encryption write

Signed-off-by: chenwen@espressif.com <chenwen@espressif.com>

arch/xtensa/src/esp32s3/esp32s3_spiflash_mtd.c

@@ -61,6 +61,9 @@
 #define MTD_BLK2SIZE(_priv, _b)     (MTD_BLK_SIZE * (_b))
 #define MTD_SIZE2BLK(_priv, _s)     ((_s) / MTD_BLK_SIZE)
 
+#define SPI_FLASH_ENCRYPT_UNIT_SIZE (64)
+#define SPI_FLASH_ENCRYPT_MIN_SIZE  (16)
+
 /****************************************************************************
  * Private Types
  ****************************************************************************/
@@ -135,6 +138,10 @@ static ssize_t esp32s3_write(struct mtd_dev_s *dev, off_t offset,
                              size_t nbytes, const uint8_t *buffer);
 static ssize_t esp32s3_bwrite(struct mtd_dev_s *dev, off_t startblock,
                               size_t nblocks, const uint8_t *buffer);
+static int esp32s3_writedata_encrypt(struct mtd_dev_s *dev, off_t offset,
+                                     uint32_t size, const uint8_t *buffer);
+static ssize_t esp32s3_write_encrypt(struct mtd_dev_s *dev, off_t offset,
+                                     size_t nbytes, const uint8_t *buffer);
 static ssize_t esp32s3_bwrite_encrypt(struct mtd_dev_s *dev,
                                       off_t startblock,
                                       size_t nblocks,
@@ -184,7 +191,7 @@ static const struct esp32s3_mtd_dev_s g_esp32s3_spiflash_encrypt =
             .read   = esp32s3_read_decrypt,
             .ioctl  = esp32s3_ioctl,
 #ifdef CONFIG_MTD_BYTE_WRITE
-            .write  = NULL,
+            .write  = esp32s3_write_encrypt,
 #endif
             .name   = "esp32s3_spiflash_encrypt"
           },
@@ -625,6 +632,144 @@ static ssize_t esp32s3_bread_decrypt(struct mtd_dev_s *dev,
   return ret;
 }
 
+/****************************************************************************
+ * Name: esp32s3_writedata_encrypt
+ *
+ * Description:
+ *   Write plaintext data to SPI Flash at designated address by SPI Flash
+ *   hardware encryption, and written data in SPI Flash is ciphertext.
+ *
+ * Input Parameters:
+ *   dev    - MTD device data
+ *   offset - target address offset, must be 32Bytes-aligned
+ *   size   - data number, must be 32Bytes-aligned
+ *   buffer - data buffer pointer
+ *
+ * Returned Value:
+ *   0 if success or a negative value if fail.
+ *
+ ****************************************************************************/
+
+static int esp32s3_writedata_encrypt(struct mtd_dev_s *dev, off_t offset,
+                                     uint32_t size, const uint8_t *buffer)
+{
+  ssize_t ret;
+
+#ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
+  finfo("%s(%p, 0x%" PRIxOFF ", %zu, %p)\n", __func__, dev, offset,
+        size, buffer);
+#endif
+
+  DEBUGASSERT((offset % SPI_FLASH_ENCRYPT_MIN_SIZE) == 0);
+  DEBUGASSERT((size % SPI_FLASH_ENCRYPT_MIN_SIZE) == 0);
+  ret = nxmutex_lock(&g_lock);
+  if (ret < 0)
+    {
+      return ret;
+    }
+
+#ifdef CONFIG_ESP32S3_SPI_FLASH_SUPPORT_PSRAM_STACK
+  if (stack_is_psram())
+    {
+      ret = esp32s3_async_op(SPIFLASH_OP_CODE_ENCRYPT_WRITE, offset,
+                             buffer, size, 0);
+    }
+  else
+#endif
+    {
+      ret = spi_flash_write_encrypted(offset, buffer, size);
+    }
+
+  nxmutex_unlock(&g_lock);
+#ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
+  finfo("%s()=%d\n", __func__, ret);
+#endif
+  return ret;
+}
+
+/****************************************************************************
+ * Name: esp32s3_write_encrypt
+ *
+ * Description:
+ *   Write data to SPI Flash at designated address by SPI Flash hardware
+ *   encryption.
+ *
+ * Input Parameters:
+ *   dev    - MTD device data
+ *   offset - target address offset, must be 16Bytes-aligned
+ *   nbytes - data number, must be 16Bytes-aligned
+ *   buffer - data buffer pointer
+ *
+ * Returned Value:
+ *   Writen bytes if success or a negative value if fail.
+ *
+ ****************************************************************************/
+
+static ssize_t esp32s3_write_encrypt(struct mtd_dev_s *dev, off_t offset,
+                                     size_t nbytes, const uint8_t *buffer)
+{
+  ssize_t ret;
+  size_t n;
+  off_t addr;
+  size_t wbytes;
+  uint32_t step;
+  uint8_t enc_buf[SPI_FLASH_ENCRYPT_UNIT_SIZE];
+
+  if ((offset % SPI_FLASH_ENCRYPT_MIN_SIZE) ||
+      (nbytes % SPI_FLASH_ENCRYPT_MIN_SIZE))
+    {
+      return -EINVAL;
+    }
+  else if (nbytes == 0)
+    {
+      return 0;
+    }
+
+#ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
+  finfo("%s(%p, 0x%x, %d, %p)\n", __func__, dev, offset, nbytes, buffer);
+#endif
+
+  for (n = 0; n < nbytes; n += step)
+    {
+      /* The temporary buffer need to be seperated into
+       * 16-bytes, 32-bytes, 64-bytes(if supported).
+       */
+
+      addr = offset + n;
+      if ((addr % 64) == 0 && (nbytes - n) >= 64)
+        {
+          wbytes = 64;
+        }
+      else if ((addr % 32) == 0 && (nbytes - n) >= 32)
+        {
+          wbytes = 32;
+        }
+      else
+        {
+          wbytes = 16;
+        }
+
+      memcpy(enc_buf, buffer + n, wbytes);
+      step = wbytes;
+      ret = esp32s3_writedata_encrypt(dev, addr, wbytes, enc_buf);
+      if (ret < 0)
+        {
+          break;
+        }
+    }
+
+  if (ret >= 0)
+    {
+      ret = nbytes;
+    }
+
+#ifdef CONFIG_ESP32S3_STORAGE_MTD_DEBUG
+  finfo("esp32s3_write_encrypt()=%d\n", ret);
+#endif
+
+  return ret;
+}
+
 /****************************************************************************
  * Name: esp32s3_write
  *