wip

Author: michalek-no

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c

@@ -387,8 +387,9 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 	}
 
 	rc = img_mgmt_read(image_slot,
-			   boot_get_image_start_offset(img_mgmt_flash_area_id(image_slot)),
+			   0,
 			   &hdr, sizeof(hdr));
+	LOG_ERR("read info - %d", rc);
 
 	if (rc != 0) {
 		return rc;
@@ -417,8 +418,7 @@ int img_mgmt_read_info(int image_slot, struct image_version *ver, uint8_t *hash,
 	 * TLV. All images are required to have a hash TLV.  If the hash is missing, the image
 	 * is considered invalid.
 	 */
-	data_off = hdr.ih_hdr_size + hdr.ih_img_size +
-		   boot_get_image_start_offset(img_mgmt_flash_area_id(image_slot));
+	data_off = hdr.ih_hdr_size + hdr.ih_img_size;
 
 	rc = img_mgmt_find_tlvs(image_slot, &data_off, &data_end, IMAGE_TLV_PROT_INFO_MAGIC);
 	if (!rc) {

subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c

@@ -505,68 +505,6 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 /**
  * Command handler: image state read
  */
-#if !defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER)
-int
-img_mgmt_state_read(struct smp_streamer *ctxt)
-{
-	LOG_ERR("state read");
-	return MGMT_ERR_EOK;
-	zcbor_state_t *zse = ctxt->writer->zs;
-	uint32_t i;
-	bool ok;
-	
-
-	ok = zcbor_tstr_put_lit(zse, "images") &&
-	     zcbor_list_start_encode(zse, 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER);
-
-	img_mgmt_take_lock();
-
-	for (i = 0; ok && i < CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
-		/* _a is active slot, _o is opposite slot */
-		enum img_mgmt_next_boot_type type = NEXT_BOOT_TYPE_NORMAL;
-		int next_boot_slot = img_mgmt_get_next_boot_slot(i, &type);
-		int slot_a = img_mgmt_active_slot(i);
-		int slot_o = img_mgmt_get_opposite_slot(slot_a);
-		int flags_a = REPORT_SLOT_ACTIVE;
-		int flags_o = 0;
-
-		if (type != NEXT_BOOT_TYPE_REVERT) {
-			flags_a |= REPORT_SLOT_CONFIRMED;
-		}
-
-		if (next_boot_slot != slot_a) {
-			if (type == NEXT_BOOT_TYPE_NORMAL) {
-				flags_o = REPORT_SLOT_PENDING | REPORT_SLOT_PERMANENT;
-			} else if (type == NEXT_BOOT_TYPE_REVERT) {
-				flags_o = REPORT_SLOT_CONFIRMED;
-			} else if (type == NEXT_BOOT_TYPE_TEST) {
-				flags_o = REPORT_SLOT_PENDING;
-			}
-		}
-
-		/* Need to report slots in proper order */
-		if (slot_a < slot_o) {
-			ok = img_mgmt_state_encode_slot(ctxt, slot_a, flags_a) &&
-			     img_mgmt_state_encode_slot(ctxt, slot_o, flags_o);
-		} else {
-			ok = img_mgmt_state_encode_slot(ctxt, slot_o, flags_o) &&
-			     img_mgmt_state_encode_slot(ctxt, slot_a, flags_a);
-		}
-	}
-
-	/* Ending list encoding for two slots per image */
-	ok = ok && zcbor_list_end_encode(zse, 2 * CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER);
-	/* splitStatus is always 0 so in frugal list it is not present at all */
-	if (!IS_ENABLED(CONFIG_MCUMGR_GRP_IMG_FRUGAL_LIST) && ok) {
-		ok = zcbor_tstr_put_lit(zse, "splitStatus") &&
-		     zcbor_int32_put(zse, 0);
-	}
-
-	img_mgmt_release_lock();
-
-	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;
-}
-#else
 int
 img_mgmt_state_read(struct smp_streamer *ctxt)
 {
@@ -580,6 +518,7 @@ img_mgmt_state_read(struct smp_streamer *ctxt)
 	img_mgmt_take_lock();
 
 	for (i = 0; ok && i < CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER; i++) {
+		LOG_ERR("state read %d", i);
 		/* _a is active slot, _o is opposite slot */
 		int slot_a = img_mgmt_active_slot(i);
 		int slot_o = img_mgmt_get_opposite_slot(slot_a);
@@ -602,7 +541,6 @@ img_mgmt_state_read(struct smp_streamer *ctxt)
 
 	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;
 }
-#endif /* !defined(CONFIG_MCUBOOT_BOOTLOADER_MODE_FIRMWARE_UPDATER) */
 
 static int img_mgmt_set_next_boot_slot_common(int slot, int active_slot, bool confirm)
 {

subsys/mgmt/mcumgr/grp/img_mgmt/src/zephyr_img_mgmt.c

@@ -36,6 +36,7 @@ LOG_MODULE_DECLARE(mcumgr_img_grp, CONFIG_MCUMGR_GRP_IMG_LOG_LEVEL);
 #define S0_SIZE DT_REG_SIZE(S0_PARTITION)
 
 static struct bm_storage s0_storage;
+static int storage_init;
 
 /* SLOT0_PARTITION and SLOT1_PARTITION are not checked because
  * there is not conditional code that depends on them. If they do
@@ -61,6 +62,12 @@ static void bm_storage_evt_handler_a(struct bm_storage_evt *evt)
 		ongoing--;
 	}
 }
+struct bm_storage_config storage_config_a = {
+	.evt_handler = bm_storage_evt_handler_a,
+	.start_addr = S0_START,
+	.end_addr = S0_START+S0_SIZE,
+};
+
 
 /**
  * Get flash_area ID for a image number; actually the slots are images
@@ -178,6 +185,11 @@ int img_mgmt_vercmp(const struct image_version *a, const struct image_version *b
 int img_mgmt_read(int slot, unsigned int offset, void *dst, unsigned int num_bytes)
 {
 
+	if(!storage_init){
+		LOG_ERR("init");
+		bm_storage_init(&s0_storage, &storage_config_a);
+		storage_init=1;
+	}
 	return bm_storage_read(&s0_storage, s0_storage.start_addr + offset,
 		dst, num_bytes);
 }
@@ -191,12 +203,10 @@ int img_mgmt_write_image_data(unsigned int offset, const void *data, unsigned in
 	uint8_t *rb_data;
 
 	if (offset == 0) {
-		struct bm_storage_config storage_config_a = {
-			.evt_handler = bm_storage_evt_handler_a,
-			.start_addr = S0_START,
-			.end_addr = S0_START+S0_SIZE,
-		};
-		bm_storage_init(&s0_storage, &storage_config_a);
+		if(!storage_init){
+			bm_storage_init(&s0_storage, &storage_config_a);
+			storage_init=1;
+		}
 	}
 	int rb_freespace = ring_buf_space_get(&ring_buf);