accel/habanalabs: change razwi handle after fw fix

FW had one data route for tpc0 and tpc1 when running in secured mode
and a different one when running without secured mode. After fw fixed
this issue, both mode have the same data path.

Signed-off-by: Dani Liberman <dliberman@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h
index 1636f6a..a6f5c21 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs.h
+++ b/drivers/accel/habanalabs/common/habanalabs.h
@@ -3547,6 +3547,10 @@ struct hl_ioctl_desc {
        hl_ioctl_t *func;
 };
 
+static inline bool hl_is_fw_ver_below_1_9(struct hl_device *hdev)
+{
+       return (hdev->fw_major_version < 42);
+}
 
 /*
  * Kernel module functions that can be accessed by entire module

diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c
index cff1d45..b13f998 100644 (file)
--- a/drivers/accel/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c
@@ -7973,10 +7973,8 @@ static void gaudi2_ack_module_razwi_event_handler(struct hl_device *hdev,
        case RAZWI_TPC:
                hbw_rtr_id = gaudi2_tpc_initiator_hbw_rtr_id[module_idx];
 
-               /* TODO : remove this check and depend only on tpc routers table
-                * when SW-118828 is resolved
-                */
-               if (!hdev->asic_prop.fw_security_enabled &&
+               if (hl_is_fw_ver_below_1_9(hdev) &&
+                               !hdev->asic_prop.fw_security_enabled &&
                                ((module_idx == 0) || (module_idx == 1)))
                        lbw_rtr_id = DCORE0_RTR0;
                else