sb: rb: Fix bugs, add power capping and add RNS vr test mode functions

common/dev/include/mp29816a.h

@@ -24,6 +24,8 @@ bool mp29816a_get_vout_max(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
 bool mp29816a_get_vout_min(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
 bool mp29816a_set_vout_max(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
 bool mp29816a_set_vout_min(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
+bool mp29816a_get_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t *value);
+bool mp29816a_set_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t value);
 bool mp29816a_fwupdate(uint8_t bus, uint8_t addr, uint8_t *img_buff, uint32_t img_size);
 bool mp29816a_get_vout_command(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
 bool mp29816a_set_vout_command(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);

common/dev/include/raa228249.h

@@ -28,6 +28,8 @@ int raa228249_get_remaining_wr(uint8_t bus, uint8_t addr, uint8_t *remain);
 bool raa228249_fwupdate(uint8_t bus, uint8_t addr, uint8_t *img_buff, uint32_t img_size);
 bool raa228249_get_vout_command(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
 bool raa228249_set_vout_command(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt);
+bool raa228249_get_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t *value);
+bool raa228249_set_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t value);
 bool raa228249_get_vr_status(sensor_cfg *cfg, uint8_t rail, uint8_t vr_status_rail,
 			     uint16_t *vr_status);
 bool raa228249_clear_vr_status(sensor_cfg *cfg, uint8_t rail);

common/dev/include/tmp431.h

@@ -20,6 +20,7 @@
 #include "sensor.h"
 
 bool tmp432_get_temp_status(sensor_cfg *cfg, uint8_t *temp_status);
+bool tmp432_get_temp_open_status(sensor_cfg *cfg, uint8_t *temp_status);
 bool tmp432_clear_temp_status(sensor_cfg *cfg);
 
 enum TMP431_CHANNELS {

common/dev/mp29816a.c

@@ -38,6 +38,7 @@ LOG_MODULE_REGISTER(mp29816a);
 
 #define MP29816A_VOUT_MAX_REG 0x24
 #define MP29816A_VOUT_MIN_REG 0x2B
+#define MP29816A_SVI3_IOUT_RPT_REG 0x67
 
 /* --------- PAGE1 ---------- */
 #define VR_REG_EXPECTED_USER_CRC 0xED
@@ -319,6 +320,74 @@ bool mp29816a_set_vout_min(sensor_cfg *cfg, uint8_t rail, uint16_t *millivolt)
 	return true;
 }
 
+bool mp29816a_get_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t *value)
+{
+	CHECK_NULL_ARG_WITH_RETURN(cfg, false);
+	CHECK_NULL_ARG_WITH_RETURN(value, false);
+
+	uint8_t data[2] = { 0 };
+	uint8_t scale_bit = 0;
+	if (!mp29816a_i2c_read(cfg->port, cfg->target_addr, MP29816A_SVI3_IOUT_RPT_REG, data,
+			       sizeof(data))) {
+		return false;
+	}
+	scale_bit = data[0] & 0x07;
+
+	if (!mp29816a_i2c_read(cfg->port, cfg->target_addr, PMBUS_IOUT_OC_WARN_LIMIT, data,
+			       sizeof(data))) {
+		return false;
+	}
+
+	// final value: 8 * data * scale_bit
+	if (scale_bit == 7) {
+		// 2A for scale_bit
+		*value = 8 * (data[0] | (data[1] << 8)) * 2;
+	} else if (scale_bit < 6 && scale_bit > 0) {
+		// 1/32, 1/16, 1/8 ...
+		*value = 8 * (data[0] | (data[1] << 8)) / (2 ^ (6 - scale_bit));
+	} else {
+		// 1A
+		*value = 8 * (data[0] | (data[1] << 8));
+	}
+
+	return true;
+}
+
+bool mp29816a_set_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t value)
+{
+	CHECK_NULL_ARG_WITH_RETURN(cfg, false);
+
+	uint8_t data[2] = { 0 };
+	uint8_t scale_bit = 0;
+	if (!mp29816a_i2c_read(cfg->port, cfg->target_addr, MP29816A_SVI3_IOUT_RPT_REG, data,
+			       sizeof(data))) {
+		return false;
+	}
+	scale_bit = data[0] & 0x07;
+
+	// final value: (data / scale_bit) / 8
+	if (scale_bit == 7) {
+		// 2A for scale_bit
+		value = (value / 2) / 8;
+	} else if (scale_bit < 6 && scale_bit > 0) {
+		// 1/32, 1/16, 1/8 ...
+		value = (value * (2 ^ (6 - scale_bit))) / 8;
+	} else {
+		// 1A
+		value = value / 8;
+	}
+
+	data[0] = value & 0xFF;
+	data[1] = value >> 8;
+
+	if (!mp29816a_i2c_write(cfg->port, cfg->target_addr, PMBUS_IOUT_OC_WARN_LIMIT, data,
+				sizeof(data))) {
+		return false;
+	}
+
+	return true;
+}
+
 static uint8_t mp29816a_do_update(struct cfg_data *cfg_data_list, uint32_t cfg_cnt, uint8_t bus,
 				  uint8_t addr)
 {

common/dev/raa228249.c

@@ -519,6 +519,40 @@ bool raa228249_set_vout_command(sensor_cfg *cfg, uint8_t rail, uint16_t *millivo
 	return true;
 }
 
+bool raa228249_get_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t *value)
+{
+	CHECK_NULL_ARG_WITH_RETURN(cfg, false);
+	CHECK_NULL_ARG_WITH_RETURN(value, false);
+
+	uint8_t data[2] = { 0 };
+	if (!raa228249_i2c_read(cfg->port, cfg->target_addr, PMBUS_IOUT_OC_WARN_LIMIT, data,
+				sizeof(data))) {
+		return false;
+	}
+
+	// 1 unit = 0.1A
+	*value = (data[0] | (data[1] << 8)) * 0.1;
+	return true;
+}
+
+bool raa228249_set_iout_oc_warn_limit(sensor_cfg *cfg, uint16_t value)
+{
+	CHECK_NULL_ARG_WITH_RETURN(cfg, false);
+
+	/* input value unit: 1A */
+	uint8_t data[2] = { 0 };
+	uint16_t cal_value = value * 10;
+	data[0] = cal_value & 0xFF;
+	data[1] = cal_value >> 8;
+
+	if (!raa228249_i2c_write(cfg->port, cfg->target_addr, PMBUS_IOUT_OC_WARN_LIMIT, data,
+				 sizeof(data))) {
+		return false;
+	}
+
+	return true;
+}
+
 bool raa228249_get_vr_status(sensor_cfg *cfg, uint8_t rail, uint8_t vr_status_rail,
 			     uint16_t *vr_status)
 {

common/dev/tmp431.c

@@ -406,6 +406,28 @@ bool tmp432_get_temp_status(sensor_cfg *cfg, uint8_t *temp_status)
 	return true;
 }
 
+bool tmp432_get_temp_open_status(sensor_cfg *cfg, uint8_t *temp_status)
+{
+	CHECK_NULL_ARG_WITH_RETURN(cfg, false);
+
+	I2C_MSG i2c_msg = { 0 };
+	uint8_t retry = 5;
+	i2c_msg.bus = cfg->port;
+	i2c_msg.target_addr = cfg->target_addr;
+	i2c_msg.tx_len = 1;
+	i2c_msg.rx_len = 1;
+	i2c_msg.data[0] = TMP432_OPEN_STATUS_REG;
+
+	if (i2c_master_read(&i2c_msg, retry)) {
+		LOG_ERR("TMP[0x%x] get open status reg[0x%d] failed.", cfg->num,
+			TMP432_OPEN_STATUS_REG);
+		return false;
+	}
+	*temp_status = i2c_msg.data[0];
+
+	return true;
+}
+
 bool tmp432_clear_temp_status(sensor_cfg *cfg)
 {
 	CHECK_NULL_ARG_WITH_RETURN(cfg, false);

common/service/pldm/pldm_monitor.h

@@ -88,7 +88,8 @@ enum pldm_sensor_operational_state {
 	PLDM_SENSOR_FAILED,
 	PLDM_SENSOR_INITIALIZING,
 	PLDM_SENSOR_SHUTTINGDOWN,
-	PLDM_SENSOR_INTEST
+	PLDM_SENSOR_INTEST,
+	PLDM_SENSOR_OPEN_CIRCUIT,
 };
 
 enum pldm_effecter_operational_state {

common/service/pldm/pldm_oem.h

@@ -195,6 +195,8 @@ enum iris_event_source {
 	IRIS_OWL_W_TRVDD0P75,
 	IRIS_HAMSA_AVDD_PCIE,
 	IRIS_HAMSA_VDDHRXTX_PCIE,
+	IRIS_4V2,
+	IRIS_P0V75_AVDD_HCSL,
 	// VR Power Fault 2
 	IRIS_MEDHA1_VDD,
 	IRIS_MEDHA0_VDD,

common/service/sensor/pldm_sensor.c

@@ -122,7 +122,7 @@
 	}
 
 	int pldm_sensor_count = plat_pldm_sensor_get_sensor_count(thread_id);
 	if ((sensor_pdr_index < 0) || (sensor_pdr_index >= pldm_sensor_count)) {
 		LOG_ERR("Invalid sensor_pdr_index: %d for thread_id: %d. Max allowed: %d",
 			sensor_pdr_index, thread_id, pldm_sensor_count);
 		return -1;
@@ -303,7 +303,10 @@
 	if (pldm_sensor_cfg->post_sensor_read_hook) {
 		if (!pldm_sensor_cfg->post_sensor_read_hook(
 			    pldm_sensor_cfg, pldm_sensor_cfg->post_sensor_read_args, &reading)) {
-			pldm_sensor_cfg->cache_status = PLDM_SENSOR_FAILED;
+			if (pldm_sensor_cfg->cache_status == SENSOR_OPEN_CIRCUIT)
+				pldm_sensor_cfg->cache_status = PLDM_SENSOR_OPEN_CIRCUIT;
+			else
+				pldm_sensor_cfg->cache_status = PLDM_SENSOR_FAILED;
 			*update_time_ms = k_uptime_get_32();
 			*update_time = (*update_time_ms / 1000);
 			LOG_DBG("Failed to pose read sensor_num 0x%x of thread %d", sensor_num,
@@ -419,14 +422,14 @@
 	uint32_t poll_interval_ms = PLDM_SENSOR_POLL_TIME_DEFAULT_MS;
 
 	pldm_sensor_count = plat_pldm_sensor_get_sensor_count(thread_id);
 	if (pldm_sensor_count <= 0) {
 		LOG_ERR("Failed to get PLDM sensor count(%d) of thread%d", pldm_sensor_count,
 			thread_id);
 		return;
 	}
 
 	pldm_sensor_list[thread_id] = plat_pldm_sensor_load(thread_id);
 	if (pldm_sensor_list[thread_id] == NULL) {
 		LOG_ERR("Failed to load PLDM sensor list of thread%d, ret%d", thread_id, ret);
 		return;
 	}
@@ -489,13 +492,13 @@
 		size_t stack_size = plat_get_pldm_sensor_stack_size(i);
 
 #ifdef ENABLE_PLATFORM_PROVIDES_PLDM_SENSOR_STACKS
 		if (stack == NULL || stack_size == 0) {
 			LOG_WRN("Invalid stack for thread %d, skipping", i);
 			continue;
 		}
 #else
 		stack = pldm_sensor_poll_stacks[i];
 		stack_size = K_THREAD_STACK_SIZEOF(pldm_sensor_poll_stacks[i]);
 #endif
 
 		LOG_INF("Creating thread %d (%s) with stack size %zu", i,

common/service/sensor/sensor.h

@@ -256,6 +256,7 @@ enum {
 	SENSOR_PEC_ERROR,
 	SENSOR_PARAMETER_NOT_VALID,
 	SENSOR_UNAVAILABLE,
+	SENSOR_OPEN_CIRCUIT,
 };
 
 enum { SENSOR_INIT_SUCCESS, SENSOR_INIT_UNSPECIFIED_ERROR };

common/shell/commands/sensor_shell.c

@@ -59,6 +59,8 @@
 	"sensor_not_present",
 	"pec_error",
 	"parameter_not_valid",
+	"unavailable",
+	"open_circuit",
 };
 
 #ifdef ENABLE_PLDM_SENSOR
@@ -71,6 +73,7 @@
 	"sensor_initializing",
 	"sensor_shuttingdown",
 	"sensor_intest",
+	"sensor_open_circuit",
 };
 #endif
 // clang-format on
@@ -361,7 +364,7 @@
 	}
 
 #ifdef ENABLE_PLDM_SENSOR
 	char *keyword = NULL;
 	if (argc == 2)
 		keyword = argv[1];
 

meta-facebook/sb-rb/boards/npcm400f_evb.conf

@@ -9,18 +9,19 @@ CONFIG_PECI_NPCM4XX=n
 CONFIG_SPI_NPCM4XX_SPIM=y
 CONFIG_SPI_NPCM4XX_FIU=y
 CONFIG_SPIP_NPCM4XX=y
-CONFIG_ESPI_NPCM4XX=y
-CONFIG_IPMI_KCS_NPCM4XX=y
+CONFIG_ESPI_NPCM4XX=n
+CONFIG_IPMI_KCS_NPCM4XX=n
 CONFIG_I2C_NPCM4XX=y
 CONFIG_I3C_NPCM4XX=y
-CONFIG_ADC_NPCM4XX=y
-CONFIG_USB_DC_NPCM4XX=y
-CONFIG_JTAG_NPCM4XX=y
+CONFIG_ADC_NPCM4XX=n
+CONFIG_USB_DC_NPCM4XX=n
+CONFIG_JTAG_NPCM4XX=n
 
 # I3C More actions
 CONFIG_I3C=y
 CONFIG_I3C_SLAVE=y
 CONFIG_I3C_SLAVE_MQUEUE=y
+CONFIG_I3C_SHELL=n
 
 # PWM Driver
 CONFIG_PWM=y

meta-facebook/sb-rb/boards/npcm400f_evb.overlay

@@ -3,7 +3,7 @@
 };
 
 &adc0 {
-    status = "okay";
+    status = "disabled";
 };
 
 &uart0 {

meta-facebook/sb-rb/prj.conf

@@ -24,14 +24,14 @@ CONFIG_I2C=y
 CONFIG_THREAD_RUNTIME_STATS=y
 CONFIG_GPIO_SHELL=y
 CONFIG_I2C_SLAVE=y
-CONFIG_I2C_EEPROM_SLAVE=y
-CONFIG_I2C_IPMB_SLAVE=y
-CONFIG_ADC=y
+CONFIG_I2C_EEPROM_SLAVE=n
+CONFIG_I2C_IPMB_SLAVE=n
+CONFIG_ADC=n
 CONFIG_FLASH=y
 CONFIG_FLASH_SHELL=y
 CONFIG_SENSOR=y
 CONFIG_HWINFO=y
-CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=153840
+CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=143360
 CONFIG_REBOOT=y
 CONFIG_POSIX_CLOCK=y
 CONFIG_STACK_SENTINEL=y