habanalabs: add dedicated message towards f/w to set power

CPUCP_PACKET_POWER_GET packet type was used for both
hl_get_power() and hl_set_power().

To align with other sensor functions hl_set_power()
should use CPUCP_PACKET_POWER_SET.

This packet will only be used with newer ASICs, so need to add
a compatibility flag to the asic properties to indicate whether to use
this packet or the GET packet.

Signed-off-by: Rajaravi Krishna Katta <rkatta@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index 5fc9cfd892e8d8851fa46bd3d87e3850fe40a30d..dc61f7031c38df7050ccc9aa820b361b5cef9ae3 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -546,6 +546,8 @@ struct hl_hints_range {
  * @dynamic_fw_load: is dynamic FW load is supported.
  * @gic_interrupts_enable: true if FW is not blocking GIC controller,
  *                         false otherwise.
+ * @use_get_power_for_reset_history: To support backward compatibility for Goya
+ *                                   and Gaudi
  */
 struct asic_fixed_properties {
        struct hw_queue_properties      *hw_queues_props;
@@ -626,6 +628,7 @@ struct asic_fixed_properties {
        u8                              iatu_done_by_fw;
        u8                              dynamic_fw_load;
        u8                              gic_interrupts_enable;
+       u8                              use_get_power_for_reset_history;
 };
 
 /**

diff --git a/drivers/misc/habanalabs/common/hwmon.c b/drivers/misc/habanalabs/common/hwmon.c
index e33f65be8a00f3fe80a38a1f468d37f3cced19ea..70182b42940d1a908135782a35aca1c5f84c62cb 100644 (file)
--- a/drivers/misc/habanalabs/common/hwmon.c
+++ b/drivers/misc/habanalabs/common/hwmon.c
@@ -677,12 +677,18 @@ int hl_set_power(struct hl_device *hdev,
                        int sensor_index, u32 attr, long value)
 {
        struct cpucp_packet pkt;
+       struct asic_fixed_properties *prop = &hdev->asic_prop;
        int rc;
 
        memset(&pkt, 0, sizeof(pkt));
 
-       pkt.ctl = cpu_to_le32(CPUCP_PACKET_POWER_GET <<
+       if (prop->use_get_power_for_reset_history)
+               pkt.ctl = cpu_to_le32(CPUCP_PACKET_POWER_GET <<
                                CPUCP_PKT_CTL_OPCODE_SHIFT);
+       else
+               pkt.ctl = cpu_to_le32(CPUCP_PACKET_POWER_SET <<
+                               CPUCP_PKT_CTL_OPCODE_SHIFT);
+
        pkt.sensor_index = __cpu_to_le16(sensor_index);
        pkt.type = __cpu_to_le16(attr);
        pkt.value = __cpu_to_le64(value);

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 1dcce1bc976f58a338fcff2f16d37437702c2892..738ad2498439e0f5b1df190baaacacbdd64c51f6 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -665,6 +665,8 @@ static int gaudi_set_fixed_properties(struct hl_device *hdev)
        prop->clk_pll_index = HL_GAUDI_MME_PLL;
        prop->max_freq_value = GAUDI_MAX_CLK_FREQ;
 
+       prop->use_get_power_for_reset_history = true;
+
        return 0;
 }
 

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index ce06103292a0f1ea45b01f5fc1da2fdfb023f834..959eb21dcc69ad088a327591e159d3001a9d1315 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -475,6 +475,8 @@ int goya_set_fixed_properties(struct hl_device *hdev)
 
        prop->clk_pll_index = HL_GOYA_MME_PLL;
 
+       prop->use_get_power_for_reset_history = true;
+
        return 0;
 }
 

diff --git a/drivers/misc/habanalabs/include/common/cpucp_if.h b/drivers/misc/habanalabs/include/common/cpucp_if.h
index ae13231fda943db35b79480df08473c14a245f31..17927968e19a3aab6114dc87efceed97719e2d50 100644 (file)
--- a/drivers/misc/habanalabs/include/common/cpucp_if.h
+++ b/drivers/misc/habanalabs/include/common/cpucp_if.h
@@ -376,6 +376,9 @@ enum pq_init_status {
  *       and QMANs. The f/w will return a bitmask where each bit represents
  *       a different engine or QMAN according to enum cpucp_idle_mask.
  *       The bit will be 1 if the engine is NOT idle.
+ *
+ * CPUCP_PACKET_POWER_SET -
+ *       Resets power history of device to 0
  */
 
 enum cpucp_packet_id {
@@ -421,6 +424,7 @@ enum cpucp_packet_id {
        CPUCP_PACKET_NIC_STAT_REGS_CLR,         /* internal */
        CPUCP_PACKET_NIC_STAT_REGS_ALL_GET,     /* internal */
        CPUCP_PACKET_IS_IDLE_CHECK,             /* internal */
+       CPUCP_PACKET_POWER_SET,                 /* internal */
 };
 
 #define CPUCP_PACKET_FENCE_VAL 0xFE8CE7A5