wip

Author: michalek-no

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

@@ -173,6 +173,198 @@ static int img_mgmt_find_tlvs(int slot, size_t *start_off, size_t *end_off, uint
 	return IMG_MGMT_ERR_OK;
 }
 
+int img_mgmt_active_slot(int image)
+{
+	return 0;
+}
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO)
+/**
+ * Command handler: image slot info
+ */
+static int img_mgmt_slot_info(struct smp_streamer *ctxt)
+{
+	LOG_ERR("slot info");
+	int rc;
+	zcbor_state_t *zse = ctxt->writer->zs;
+	bool ok;
+	uint8_t i = 0;
+	size_t area_sizes[SLOTS_PER_IMAGE];
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+	int32_t err_rc;
+	uint16_t err_group;
+	enum mgmt_cb_return status;
+#endif
+
+	img_mgmt_take_lock();
+
+	ok = zcbor_tstr_put_lit(zse, "images") &&
+	     zcbor_list_start_encode(zse, 10);
+
+	while (i < CONFIG_MCUMGR_GRP_IMG_UPDATABLE_IMAGE_NUMBER * SLOTS_PER_IMAGE) {
+		const struct flash_area *fa;
+		int area_id = img_mgmt_flash_area_id(i);
+
+		if ((i % SLOTS_PER_IMAGE) == 0) {
+			memset(area_sizes, 0, sizeof(area_sizes));
+
+			ok = zcbor_map_start_encode(zse, 4) &&
+			     zcbor_tstr_put_lit(zse, "image") &&
+			     zcbor_uint32_put(zse, (uint32_t)(i / SLOTS_PER_IMAGE)) &&
+			     zcbor_tstr_put_lit(zse, "slots") &&
+			     zcbor_list_start_encode(zse, 4);
+
+			if (!ok) {
+				goto finish;
+			}
+		}
+
+		ok = zcbor_map_start_encode(zse, 4) &&
+		     zcbor_tstr_put_lit(zse, "slot") &&
+		     zcbor_uint32_put(zse, (uint32_t)(i % SLOTS_PER_IMAGE));
+
+		if (!ok) {
+			goto finish;
+		}
+
+		rc = flash_area_open(area_id, &fa);
+
+		if (rc) {
+			/* Failed opening slot, mark as error */
+			ok = zcbor_tstr_put_lit(zse, "rc") &&
+			     zcbor_int32_put(zse, rc);
+
+			LOG_ERR("Failed to open slot %d for information fetching: %d", area_id, rc);
+		} else {
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+			struct img_mgmt_slot_info_slot slot_info_data = {
+				.image = (i / SLOTS_PER_IMAGE),
+				.slot = (i % SLOTS_PER_IMAGE),
+				.fa = fa,
+				.zse = zse,
+			};
+#endif
+
+			if (sizeof(fa->fa_size) == sizeof(uint64_t)) {
+				ok = zcbor_tstr_put_lit(zse, "size") &&
+				     zcbor_uint64_put(zse, fa->fa_size);
+			} else {
+				ok = zcbor_tstr_put_lit(zse, "size") &&
+				     zcbor_uint32_put(zse, fa->fa_size);
+			}
+
+			area_sizes[(i % SLOTS_PER_IMAGE)] = fa->fa_size;
+
+			if (!ok) {
+				goto finish;
+			}
+
+			/*
+			 * Check if we support uploading to this slot and if so, return the
+			 * image ID
+			 */
+#if defined(CONFIG_MCUMGR_GRP_IMG_DIRECT_UPLOAD)
+			ok = zcbor_tstr_put_lit(zse, "upload_image_id") &&
+			     zcbor_uint32_put(zse, (i + 1));
+#else
+			if (img_mgmt_active_slot((i / SLOTS_PER_IMAGE)) != i) {
+				ok = zcbor_tstr_put_lit(zse, "upload_image_id") &&
+				     zcbor_uint32_put(zse, (i / SLOTS_PER_IMAGE));
+			}
+#endif
+
+			if (!ok) {
+				goto finish;
+			}
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+			status = mgmt_callback_notify(MGMT_EVT_OP_IMG_MGMT_SLOT_INFO_SLOT,
+						      &slot_info_data, sizeof(slot_info_data),
+						      &err_rc, &err_group);
+#endif
+
+			flash_area_close(fa);
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+			if (status != MGMT_CB_OK) {
+				if (status == MGMT_CB_ERROR_RC) {
+					img_mgmt_release_lock();
+					return err_rc;
+				}
+
+				ok = smp_mgmt_reset_zse(ctxt) &&
+				     smp_add_cmd_err(zse, err_group, (uint16_t)err_rc);
+
+				goto finish;
+			}
+#endif
+		}
+
+		ok &= zcbor_map_end_encode(zse, 4);
+
+		if (!ok) {
+			goto finish;
+		}
+
+		if ((i % SLOTS_PER_IMAGE) == (SLOTS_PER_IMAGE - 1)) {
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+			struct img_mgmt_slot_info_image image_info_data = {
+				.image = (i / SLOTS_PER_IMAGE),
+				.zse = zse,
+			};
+#endif
+
+			ok = zcbor_list_end_encode(zse, 4);
+
+			if (!ok) {
+				goto finish;
+			}
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_TOO_LARGE_SYSBUILD) || \
+	defined(CONFIG_MCUMGR_GRP_IMG_TOO_LARGE_BOOTLOADER_INFO)
+			ok = img_mgmt_slot_max_size(area_sizes, zse);
+
+			if (!ok) {
+				goto finish;
+			}
+#endif
+
+#if defined(CONFIG_MCUMGR_GRP_IMG_SLOT_INFO_HOOKS)
+			status = mgmt_callback_notify(MGMT_EVT_OP_IMG_MGMT_SLOT_INFO_IMAGE,
+						      &image_info_data, sizeof(image_info_data),
+						      &err_rc, &err_group);
+
+			if (status != MGMT_CB_OK) {
+				if (status == MGMT_CB_ERROR_RC) {
+					img_mgmt_release_lock();
+					return err_rc;
+				}
+
+				ok = smp_mgmt_reset_zse(ctxt) &&
+				     smp_add_cmd_err(zse, err_group, (uint16_t)err_rc);
+
+				goto finish;
+			}
+#endif
+
+			ok = zcbor_map_end_encode(zse, 4);
+
+			if (!ok) {
+				goto finish;
+			}
+		}
+
+		++i;
+	}
+
+	ok = zcbor_list_end_encode(zse, 10);
+
+finish:
+	img_mgmt_release_lock();
+
+	return ok ? MGMT_ERR_EOK : MGMT_ERR_EMSGSIZE;
+}
+#endif
 
 
 /*
@@ -692,10 +884,18 @@ static int img_mgmt_translate_error_code(uint16_t err)
 #endif
 
 static const struct mgmt_handler img_mgmt_handlers[] = {
+	[IMG_MGMT_ID_STATE] = {
+		.mh_read = img_mgmt_state_read,
+		.mh_write = NULL
+	},
 	[IMG_MGMT_ID_UPLOAD] = {
 		.mh_read = NULL,
 		.mh_write = img_mgmt_upload
 	},
+	[IMG_MGMT_ID_SLOT_INFO] = {
+		.mh_read = img_mgmt_slot_info,
+		.mh_write = NULL
+	},
 };
 
 static const struct mgmt_handler img_mgmt_handlers[];

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

@@ -509,9 +509,12 @@ static bool img_mgmt_state_encode_slot(struct smp_streamer *ctxt, uint32_t slot,
 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);