[nrf fromtree] bluetooth: mesh: Adapt BLOB IO to RRAM write size

Adapts flash writing for BLOB IO to RRAM. The previously used write block alignment is not needed for RRAM. Signed-off-by: Håvard Reierstad <[email protected]> (cherry picked from commit 0f416b3576d2b259f1bf4f381d8cae430bb41d2a) Signed-off-by: Håvard Reierstad <[email protected]>
nrfconnect · May 13, 2024 · 2fca28b · 2fca28b
1 parent 8e18208
commit 2fca28b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/subsys/bluetooth/mesh/blob_io_flash.c b/subsys/bluetooth/mesh/blob_io_flash.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Noioic Semiconductor ASA
+ * Copyright (c) 2020 Nordic Semiconductor ASA
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -12,7 +12,7 @@
 #include "net.h"
 #include "transport.h"
 
-#define WRITE_BLOCK_SIZE 4
+#define WRITE_BLOCK_SIZE DT_PROP(DT_INST(0, soc_nv_flash), write_block_size)
 
 #define FLASH_IO(_io) CONTAINER_OF(_io, struct bt_mesh_blob_io_flash, io)
 
@@ -110,6 +110,13 @@ static int wr_chunk(const struct bt_mesh_blob_io *io,
 		    const struct bt_mesh_blob_chunk *chunk)
 {
 	struct bt_mesh_blob_io_flash *flash = FLASH_IO(io);
+
+	if (IS_ENABLED(CONFIG_SOC_FLASH_NRF_RRAM)) {
+		return flash_area_write(flash->area,
+					flash->offset + block->offset + chunk->offset,
+					chunk->data, chunk->size);
+	}
+
 	uint8_t buf[ROUND_UP(BLOB_CHUNK_SIZE_MAX(BT_MESH_RX_SDU_MAX),
 			  WRITE_BLOCK_SIZE)];
 	off_t area_offset = flash->offset + block->offset + chunk->offset;