mcumgr: img_mgmt rework

img_mgmt and RRAM handling rework.

Signed-off-by: Mateusz Michalek <mateusz.michalek@nordicsemi.no>

Author: michalek-no

applications/firmware_loader/ble_mcumgr/prj.conf

@@ -41,6 +41,11 @@ CONFIG_NRF_SECURITY=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_PSA_WANT_GENERATE_RANDOM=y
 CONFIG_BLE_MCUMGR=y
+CONFIG_BM_STORAGE=y
+CONFIG_BM_STORAGE_BACKEND_SD=y
+CONFIG_BM_STORAGE_BACKEND_SD_QUEUE_SIZE=4
+CONFIG_RING_BUFFER=y
+CONFIG_RING_BUFFER_LARGE=y
 
 CONFIG_LOG=y
 CONFIG_LOG_MODE_MINIMAL=y

drivers/flash/soc_flash_nrf_rram.c

@@ -121,27 +121,6 @@ static int nrf_rram_write(const struct device *dev, off_t addr, const void *data
 		return -EIO;
 	}
 
-	while (1) {
-		int taskid;
-
-		/* Wait for an event. */
-		__WFE();
-
-		/* Clear Event Register */
-		__SEV();
-		__WFE();
-
-		ret = sd_evt_get(&taskid);
-
-		if (!ret && (taskid == NRF_EVT_FLASH_OPERATION_SUCCESS ||
-			     taskid == NRF_EVT_FLASH_OPERATION_ERROR)) {
-			if (taskid != NRF_EVT_FLASH_OPERATION_SUCCESS) {
-				ret = -EIO;
-			}
-
-			break;
-		}
-	}
 
 	barrier_dmem_fence_full(); /* Barrier following our last write. */
 

subsys/mgmt/mcumgr/grp/img_mgmt/CMakeLists.txt

@@ -9,13 +9,13 @@
 # when Image Management is enabled.
 zephyr_library_named(mgmt_mcumgr_grp_img)
 zephyr_library_sources(
-  ${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c
+  src/zephyr_img_mgmt.c
   ${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_util.c
   src/img_mgmt_state.c
-  ${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
+  src/img_mgmt.c
 )
 
-zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/mgmt/mcumgr/grp/img_mgmt/include)
+zephyr_library_include_directories(include)
 
 if(CONFIG_MCUBOOT_IMG_MANAGER)
   zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)

subsys/mgmt/mcumgr/grp/img_mgmt/include/img_mgmt.h

@@ -179,6 +179,8 @@ enum img_mgmt_err_code_t {
 
 	/** Current active slot for image cannot be determined */
 	IMG_MGMT_ERR_ACTIVE_SLOT_NOT_KNOWN,
+
+	IMG_MGMT_ERR_BUSY,
 };
 
 /**

subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_config.h

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2018-2021 mcumgr authors
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef H_IMG_MGMT_CONFIG_
+#define H_IMG_MGMT_CONFIG_
+
+#define IMG_MGMT_BOOT_CURR_SLOT 0
+
+#endif

subsys/mgmt/mcumgr/grp/img_mgmt/include/mgmt/mcumgr/grp/img_mgmt/img_mgmt_priv.h

@@ -59,14 +59,13 @@ int img_mgmt_write_confirmed(void);
 /**
  * @brief Reads the specified chunk of data from an image slot.
  *
- * @param slot		The index of the slot to read from.
  * @param offset	The offset within the slot to read from.
  * @param dst		On success, the read data gets written here.
  * @param num_bytes	The number of bytes to read.
  *
  * @return 0 on success, MGMT_ERR_[...] code on failure.
  */
-int img_mgmt_read(int slot, unsigned int offset, void *dst, unsigned int num_bytes);
+int img_mgmt_read(unsigned int offset, void *dst, unsigned int num_bytes);
 
 /**
  * @brief Writes the specified chunk of image data to slot 1.