minerva-ag/vr_update_version_and_remain_check

Author: Victor-Jhong

common/service/pldm/pldm_firmware_update.c

@@ -86,6 +86,13 @@ __weak uint16_t plat_find_update_info_work(uint16_t comp_id)
 	return comp_id;
 }
 
+__weak uint8_t plat_pldm_pass_component_table_check(uint16_t num_of_comp,
+						    const uint8_t *comp_image_version_str,
+						    uint8_t comp_image_version_str_len)
+{
+	return PLDM_SUCCESS;
+}
+
 int get_descriptor_type_length(uint16_t type)
 {
 	switch (type) {
@@ -645,7 +652,7 @@ static void state_update(uint8_t state)
 	}
 }
 
-static void pldm_status_reset()
+void pldm_status_reset()
 {
 	state_update(STATE_IDLE);
 	cur_aux_state = STATE_AUX_NOT_IN_UPDATE;
@@ -658,7 +665,7 @@ static void pldm_status_reset()
 
 static void exit_update_mode()
 {
-	printk("PLDM update mode timeout, exiting update mode...\n");
+	LOG_WRN("PLDM update mode timeout, exiting update mode...");
 	pldm_status_reset();
 }
 
@@ -1069,6 +1076,14 @@ static uint8_t pass_component_table(void *mctp_inst, uint8_t *buf, uint16_t len,
 	LOG_HEXDUMP_INF(buf + sizeof(struct pldm_pass_component_table_req), req_p->comp_ver_str_len,
 			"");
 
+	uint8_t check_result = plat_pldm_pass_component_table_check(
+		req_p->comp_identifier, buf + sizeof(struct pldm_pass_component_table_req),
+		req_p->comp_ver_str_len);
+	if (check_result != PLDM_SUCCESS) {
+		resp_p->completion_code = check_result;
+		goto exit;
+	}
+
 	if (current_state != STATE_LEARN_COMP) {
 		LOG_ERR("Firmware update failed because current state %d is not %d", current_state,
 			STATE_LEARN_COMP);

common/service/pldm/pldm_firmware_update.h

@@ -726,6 +726,10 @@ uint8_t fill_descriptor_into_buf(struct pldm_descriptor_string *descriptor, uint
 				 uint8_t *fill_length, uint16_t current_length);
 bool is_update_state_download_phase();
 bool is_update_state_idle();
+void pldm_status_reset();
+uint8_t plat_pldm_pass_component_table_check(uint16_t num_of_comp,
+					     const uint8_t *comp_image_version_str,
+					     uint8_t comp_image_version_str_len);
 
 #ifdef __cplusplus
 }

common/service/pldm/pldm_oem.c

@@ -43,6 +43,42 @@ static uint8_t oem_wf_read_spd_chunk(void *mctp_inst, uint8_t *buf, uint16_t len
 				     void *ext_params);
 #endif
 
+__weak uint8_t force_update_flag_set_cmd(void *mctp_inst, uint8_t *buf, uint16_t len,
+					 uint8_t instance_id, uint8_t *resp, uint16_t *resp_len,
+					 void *ext_params)
+{
+	CHECK_NULL_ARG_WITH_RETURN(mctp_inst, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(buf, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(resp, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(resp_len, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(ext_params, PLDM_ERROR);
+
+	uint8_t *completion_code_p = resp;
+
+	*completion_code_p = PLDM_ERROR_UNSUPPORTED_PLDM_CMD;
+	*resp_len = 1;
+
+	return PLDM_ERROR_UNSUPPORTED_PLDM_CMD;
+}
+
+__weak uint8_t force_update_flag_get_cmd(void *mctp_inst, uint8_t *buf, uint16_t len,
+					 uint8_t instance_id, uint8_t *resp, uint16_t *resp_len,
+					 void *ext_params)
+{
+	CHECK_NULL_ARG_WITH_RETURN(mctp_inst, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(buf, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(resp, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(resp_len, PLDM_ERROR);
+	CHECK_NULL_ARG_WITH_RETURN(ext_params, PLDM_ERROR);
+
+	uint8_t *completion_code_p = resp;
+
+	*completion_code_p = PLDM_ERROR_UNSUPPORTED_PLDM_CMD;
+	*resp_len = 1;
+
+	return PLDM_ERROR_UNSUPPORTED_PLDM_CMD;
+}
+
 __weak uint8_t sensor_polling_cmd(void *mctp_inst, uint8_t *buf, uint16_t len, uint8_t instance_id,
 				  uint8_t *resp, uint16_t *resp_len, void *ext_params)
 {
@@ -251,6 +287,8 @@ static pldm_cmd_handler pldm_oem_cmd_tbl[] = {
 #ifdef ENABLE_VISTARA
 	{ PLDM_OEM_WF_READ_SPD_CHUNK, oem_wf_read_spd_chunk },
 #endif
+	{ PLDM_OEM_FORCE_UPDATE_SETTING_CMD, force_update_flag_set_cmd },
+	{ PLDM_OEM_FORCE_UPDATE_GETTING_CMD, force_update_flag_get_cmd },
 };
 
 uint8_t pldm_oem_handler_query(uint8_t code, void **ret_fn)

common/service/pldm/pldm_oem.h

@@ -37,6 +37,8 @@ extern "C" {
 #define PLDM_OEM_READ_FILE_IO 0x03
 #define PLDM_OEM_SENSOR_POLLING_CMD 0x04
 #define PLDM_OEM_WF_READ_SPD_CHUNK 0x05
+#define PLDM_OEM_FORCE_UPDATE_SETTING_CMD 0x06
+#define PLDM_OEM_FORCE_UPDATE_GETTING_CMD 0x07
 
 #define POWER_CONTROL_LEN 0x01
 
@@ -286,6 +288,27 @@ struct _sensor_polling_cmd_resp {
 	uint8_t set_value;
 } __attribute__((packed));
 
+struct _force_update_flag_set_cmd_req {
+	uint8_t iana[IANA_LEN];
+	uint8_t set_value;
+} __attribute__((packed));
+
+struct _force_update_flag_set_cmd_resp {
+	uint8_t completion_code;
+	uint8_t iana[IANA_LEN];
+	uint8_t set_value;
+} __attribute__((packed));
+
+struct _force_update_flag_get_cmd_req {
+	uint8_t iana[IANA_LEN];
+} __attribute__((packed));
+
+struct _force_update_flag_get_cmd_resp {
+	uint8_t completion_code;
+	uint8_t iana[IANA_LEN];
+	uint8_t get_value;
+} __attribute__((packed));
+
 uint8_t check_iana(const uint8_t *iana);
 uint8_t set_iana(uint8_t *buf, uint8_t buf_len);
 uint8_t send_event_log_to_bmc(struct pldm_addsel_data msg);

meta-facebook/minerva-ag/boards/npcm400f_evb.conf

@@ -15,4 +15,5 @@ CONFIG_I2C_NPCM4XX=y
 CONFIG_I3C_NPCM4XX=y
 CONFIG_ADC_NPCM4XX=y
 CONFIG_USB_DC_NPCM4XX=y
-CONFIG_JTAG_NPCM4XX=y
+CONFIG_JTAG_NPCM4XX=y
+CONFIG_LOG_STRDUP_BUF_COUNT=16