tenstorrent: bh_chip: enable input power reading in BMC FW

Enable input power reading in BMC FW using the INA228. Send input power to ASIC
instead of input current, since SMC FW just only uses input current to calculate
input power for throttling.

Signed-off-by: Petra Alexson <[email protected]>

Author: kikkiakki

app/dmc/src/main.c

@@ -127,18 +127,17 @@ void process_cm2dm_message(struct bh_chip *chip)
 	}
 }
 
-void ina228_current_update(void)
+void ina228_pwr_update(void)
 {
-	struct sensor_value current_sensor_val;
+	struct sensor_value sensor_val;
 
-	sensor_sample_fetch_chan(ina228, SENSOR_CHAN_CURRENT);
-	sensor_channel_get(ina228, SENSOR_CHAN_CURRENT, &current_sensor_val);
+	sensor_sample_fetch_chan(ina228, SENSOR_CHAN_POWER);
+	sensor_channel_get(ina228, SENSOR_CHAN_POWER, &sensor_val);
 
-	int32_t current =
-		(current_sensor_val.val1 << 16) + (current_sensor_val.val2 * 65536ULL) / 1000000ULL;
+	int32_t power = (sensor_val.val1 << 16) + (sensor_val.val2 * 65536ULL) / 1000000ULL;
 
 	ARRAY_FOR_EACH_PTR(BH_CHIPS, chip) {
-		bh_chip_set_input_current(chip, &current);
+		bh_chip_set_input_pwr(chip, &power);
 	}
 }
 
@@ -349,7 +348,7 @@ int main(void)
 		}
 
 		if (IS_ENABLED(CONFIG_INA228)) {
-			ina228_current_update();
+			ina228_pwr_update();
 		}
 
 		if (IS_ENABLED(CONFIG_TT_FAN_CTRL)) {

include/tenstorrent/bh_chip.h

@@ -117,8 +117,9 @@ void bh_chip_cancel_bus_transfer_clear(struct bh_chip *chip);
 cm2dmMessageRet bh_chip_get_cm2dm_message(struct bh_chip *chip);
 int bh_chip_set_static_info(struct bh_chip *chip, dmStaticInfo *info);
 int bh_chip_set_input_current(struct bh_chip *chip, int32_t *current);
+int bh_chip_set_input_pwr(struct bh_chip *chip, uint32_t *power);
+int bh_chip_set_input_pwr_lim(struct bh_chip *chip, uint16_t max_pwr);
 int bh_chip_set_fan_rpm(struct bh_chip *chip, uint16_t rpm);
-int bh_chip_set_board_pwr_lim(struct bh_chip *chip, uint16_t max_pwr);
 
 void bh_chip_assert_asic_reset(const struct bh_chip *chip);
 void bh_chip_deassert_asic_reset(const struct bh_chip *chip);

lib/tenstorrent/bh_arc/throttler.c

@@ -195,7 +195,7 @@ void CalculateThrottlers(void)
 	UpdateThrottler(kThrottlerFastTDC, telemetry_internal_data.vcore_current);
 	UpdateThrottler(kThrottlerTDC, telemetry_internal_data.vcore_current);
 	UpdateThrottler(kThrottlerThm, telemetry_internal_data.asic_temperature);
-	UpdateThrottler(kThrottlerBoardPwr, 12 * ConvertTelemetryToFloat(GetInputCurrent()));
+	UpdateThrottler(kThrottlerBoardPwr, ConvertTelemetryToFloat(GetInputPower()));
 	UpdateThrottler(kThrottlerGDDRThm, GetMaxGDDRTemp());
 
 	for (ThrottlerId i = 0; i < kThrottlerCount; i++) {

lib/tenstorrent/bh_chip/bh_chip.c

@@ -66,16 +66,17 @@ int bh_chip_set_input_current(struct bh_chip *chip, int32_t *current)
 
 	return ret;
 }
-int bh_chip_set_fan_rpm(struct bh_chip *chip, uint16_t rpm)
+
+int bh_chip_set_input_pwr(struct bh_chip *chip, uint32_t *power)
 {
 	int ret;
 
-	ret = bharc_smbus_word_data_write(&chip->config.arc, 0x23, rpm);
+	ret = bharc_smbus_block_write(&chip->config.arc, 0x25, 4, (uint8_t *)power);
 
 	return ret;
 }
 
-int bh_chip_set_board_pwr_lim(struct bh_chip *chip, uint16_t max_pwr)
+int bh_chip_set_input_pwr_lim(struct bh_chip *chip, uint16_t max_pwr)
 {
 	int ret;
 
@@ -84,6 +85,15 @@ int bh_chip_set_board_pwr_lim(struct bh_chip *chip, uint16_t max_pwr)
 	return ret;
 }
 
+int bh_chip_set_fan_rpm(struct bh_chip *chip, uint16_t rpm)
+{
+	int ret;
+
+	ret = bharc_smbus_word_data_write(&chip->config.arc, 0x23, rpm);
+
+	return ret;
+}
+
 void bh_chip_assert_asic_reset(const struct bh_chip *chip)
 {
 	gpio_pin_set_dt(&chip->config.asic_reset, 1);