bh_arc: telemetry: hide input current telemetry entry and SMBus handler

As SMC FW will now only receive input power readings from BMC FW and input
current won't be updated, hide the INPUT_CURRENT entry in the telemetry table.

Remove SMBus handler that receives input current.

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

Author: kikkiakki

lib/tenstorrent/bh_arc/cm2bm_msg.c

@@ -11,6 +11,7 @@
  */
 
 #include <string.h>
+#include <zephyr/sys/byteorder.h>
 #include <zephyr/kernel.h>
 #include <tenstorrent/msg_type.h>
 #include <tenstorrent/msgqueue.h>
@@ -229,7 +230,7 @@ int32_t Bm2CmSendCurrentHandler(const uint8_t *data, uint8_t size)
 		return -1;
 	}
 
-	current = UNALIGNED_GET((uint32_t *)data);
+	power = sys_get_le32(data) * 12;
 
 	return 0;
 }
@@ -240,7 +241,7 @@ int32_t Bm2CmSendPwrHandler(const uint8_t *data, uint8_t size)
 		return -1;
 	}
 
-	power = UNALIGNED_GET((uint32_t *)data);
+	power = sys_get_le32(data);
 
 	return 0;
 }

lib/tenstorrent/bh_arc/cm2dm_msg.c

@@ -28,7 +28,6 @@ typedef struct {
 
 static Cm2DmMsgState cm2dm_msg_state;
 static bool dmfw_ping_valid;
-static int32_t current;
 static uint32_t power;
 K_MSGQ_DEFINE(cm2dm_msg_q, sizeof(Cm2DmMsg), 4, _Alignof(Cm2DmMsg));
 
@@ -231,17 +230,6 @@ int32_t Dm2CmPingHandler(const uint8_t *data, uint8_t size)
 	return 0;
 }
 
-int32_t Dm2CmSendCurrentHandler(const uint8_t *data, uint8_t size)
-{
-	if (size != 4) {
-		return -1;
-	}
-
-	current = *(int32_t *)data;
-
-	return 0;
-}
-
 int32_t Dm2CmSendPwrHandler(const uint8_t *data, uint8_t size)
 {
 	if (size != 4) {
@@ -254,10 +242,6 @@ int32_t Dm2CmSendPwrHandler(const uint8_t *data, uint8_t size)
 }
 
 /* TODO: Put these somewhere else? */
-int32_t GetInputCurrent(void)
-{
-	return current;
-}
 
 uint32_t GetInputPower(void)
 {

lib/tenstorrent/bh_arc/smbus_target.c

@@ -168,10 +168,6 @@ static SmbusConfig smbus_config = {
 		[0x21] = {.valid = 1,
 			  .trans_type = kSmbusTransWriteWord,
 			  .handler = {.rcv_handler = &Dm2CmPingHandler}},
-		[0x22] = {.valid = 1,
-			  .trans_type = kSmbusTransBlockWrite,
-			  .expected_blocksize = 4,
-			  .handler = {.rcv_handler = &Dm2CmSendCurrentHandler}},
 		[0x23] = {.valid = 1,
 			  .trans_type = kSmbusTransWriteWord,
 			  .handler = {.rcv_handler = &Dm2CmSendFanRPMHandler}},

lib/tenstorrent/bh_arc/telemetry.c

@@ -263,8 +263,6 @@ static void update_telemetry(void)
 	telemetry[FAN_RPM] = GetFanRPM();     /* Actual fan RPM */
 	UpdateGddrTelemetry();
 	telemetry[MAX_GDDR_TEMP] = GetMaxGDDRTemp();
-	telemetry[INPUT_CURRENT] =
-		GetInputCurrent(); /* Input current - reported in A in signed int 16.16 format */
 	telemetry[INPUT_POWER] =
 		GetInputPower();      /* Input power - reported in W in unsigned int 16.16 format */
 	telemetry[TIMER_HEARTBEAT]++; /* Incremented every time the timer is called */
@@ -310,23 +308,22 @@ static void update_tag_table(void)
 	tag_table[34] = (struct telemetry_entry){TAG_ENABLED_GDDR, ENABLED_GDDR};
 	tag_table[35] = (struct telemetry_entry){TAG_ENABLED_L2CPU, ENABLED_L2CPU};
 	tag_table[36] = (struct telemetry_entry){TAG_PCIE_USAGE, PCIE_USAGE};
-	tag_table[37] = (struct telemetry_entry){TAG_INPUT_CURRENT, INPUT_CURRENT};
-	tag_table[38] = (struct telemetry_entry){TAG_NOC_TRANSLATION, NOC_TRANSLATION};
-	tag_table[39] = (struct telemetry_entry){TAG_FAN_RPM, FAN_RPM};
-	tag_table[40] = (struct telemetry_entry){TAG_GDDR_0_1_TEMP, GDDR_0_1_TEMP};
-	tag_table[41] = (struct telemetry_entry){TAG_GDDR_2_3_TEMP, GDDR_2_3_TEMP};
-	tag_table[42] = (struct telemetry_entry){TAG_GDDR_4_5_TEMP, GDDR_4_5_TEMP};
-	tag_table[43] = (struct telemetry_entry){TAG_GDDR_6_7_TEMP, GDDR_6_7_TEMP};
-	tag_table[44] = (struct telemetry_entry){TAG_GDDR_0_1_CORR_ERRS, GDDR_0_1_CORR_ERRS};
-	tag_table[45] = (struct telemetry_entry){TAG_GDDR_2_3_CORR_ERRS, GDDR_2_3_CORR_ERRS};
-	tag_table[46] = (struct telemetry_entry){TAG_GDDR_4_5_CORR_ERRS, GDDR_4_5_CORR_ERRS};
-	tag_table[47] = (struct telemetry_entry){TAG_GDDR_6_7_CORR_ERRS, GDDR_6_7_CORR_ERRS};
-	tag_table[48] = (struct telemetry_entry){TAG_GDDR_UNCORR_ERRS, GDDR_UNCORR_ERRS};
-	tag_table[49] = (struct telemetry_entry){TAG_MAX_GDDR_TEMP, MAX_GDDR_TEMP};
-	tag_table[50] = (struct telemetry_entry){TAG_ASIC_LOCATION, ASIC_LOCATION};
-	tag_table[51] = (struct telemetry_entry){TAG_BOARD_PWR_LIMIT, BOARD_PWR_LIMIT};
-	tag_table[52] = (struct telemetry_entry){TAG_INPUT_POWER, INPUT_POWER};
-	tag_table[53] = (struct telemetry_entry){TAG_TELEM_ENUM_COUNT, TELEM_ENUM_COUNT};
+	tag_table[37] = (struct telemetry_entry){TAG_NOC_TRANSLATION, NOC_TRANSLATION};
+	tag_table[38] = (struct telemetry_entry){TAG_FAN_RPM, FAN_RPM};
+	tag_table[39] = (struct telemetry_entry){TAG_GDDR_0_1_TEMP, GDDR_0_1_TEMP};
+	tag_table[40] = (struct telemetry_entry){TAG_GDDR_2_3_TEMP, GDDR_2_3_TEMP};
+	tag_table[41] = (struct telemetry_entry){TAG_GDDR_4_5_TEMP, GDDR_4_5_TEMP};
+	tag_table[42] = (struct telemetry_entry){TAG_GDDR_6_7_TEMP, GDDR_6_7_TEMP};
+	tag_table[43] = (struct telemetry_entry){TAG_GDDR_0_1_CORR_ERRS, GDDR_0_1_CORR_ERRS};
+	tag_table[44] = (struct telemetry_entry){TAG_GDDR_2_3_CORR_ERRS, GDDR_2_3_CORR_ERRS};
+	tag_table[45] = (struct telemetry_entry){TAG_GDDR_4_5_CORR_ERRS, GDDR_4_5_CORR_ERRS};
+	tag_table[46] = (struct telemetry_entry){TAG_GDDR_6_7_CORR_ERRS, GDDR_6_7_CORR_ERRS};
+	tag_table[47] = (struct telemetry_entry){TAG_GDDR_UNCORR_ERRS, GDDR_UNCORR_ERRS};
+	tag_table[48] = (struct telemetry_entry){TAG_MAX_GDDR_TEMP, MAX_GDDR_TEMP};
+	tag_table[49] = (struct telemetry_entry){TAG_ASIC_LOCATION, ASIC_LOCATION};
+	tag_table[50] = (struct telemetry_entry){TAG_BOARD_PWR_LIMIT, BOARD_PWR_LIMIT};
+	tag_table[51] = (struct telemetry_entry){TAG_INPUT_POWER, INPUT_POWER};
+	tag_table[52] = (struct telemetry_entry){TAG_TELEM_ENUM_COUNT, TELEM_ENUM_COUNT};
 }
 
 /* Handler functions for zephyr timer and worker objects */

lib/tenstorrent/bh_arc/telemetry.h

@@ -123,7 +123,6 @@ typedef enum {
 	/* Board telemetry */
 	FAN_SPEED,
 	FAN_RPM,
-	INPUT_CURRENT,
 	BOARD_PWR_LIMIT,
 	INPUT_POWER,
 

lib/tenstorrent/bh_chip/bh_chip.c

@@ -58,15 +58,6 @@ int bh_chip_set_static_info(struct bh_chip *chip, dmStaticInfo *info)
 	return ret;
 }
 
-int bh_chip_set_input_current(struct bh_chip *chip, int32_t *current)
-{
-	int ret;
-
-	ret = bharc_smbus_block_write(&chip->config.arc, 0x22, 4, (uint8_t *)current);
-
-	return ret;
-}
-
 int bh_chip_set_input_pwr(struct bh_chip *chip, uint32_t *power)
 {
 	int ret;