habanalabs/gaudi2: get f/w reset status register dynamically

Get the firmware reset status address from the dynamic registers
we read from the firmware instead of using a define.

Signed-off-by: farah kassabri <fkassabri@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2.c b/drivers/misc/habanalabs/gaudi2/gaudi2.c
index 6ed9b3ce16ddb865d4d88d5599c14a23ecd0c92b..b95eab4c237c1006cc441348397093a66474fc88 100644 (file)
--- a/drivers/misc/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/misc/habanalabs/gaudi2/gaudi2.c
@@ -5439,7 +5439,10 @@ static void gaudi2_execute_soft_reset(struct hl_device *hdev, u32 reset_sleep_ms
 
        if (!driver_performs_reset) {
                /* set SP to indicate reset request sent to FW */
-               WREG32(mmCPU_RST_STATUS_TO_HOST, CPU_RST_STATUS_NA);
+               if (dyn_regs->cpu_rst_status)
+                       WREG32(le32_to_cpu(dyn_regs->cpu_rst_status), CPU_RST_STATUS_NA);
+               else
+                       WREG32(mmCPU_RST_STATUS_TO_HOST, CPU_RST_STATUS_NA);
 
                WREG32(le32_to_cpu(dyn_regs->gic_host_soft_rst_irq),
                        gaudi2_irq_map_table[GAUDI2_EVENT_CPU_SOFT_RESET].cpu_id);

diff --git a/drivers/misc/habanalabs/include/common/hl_boot_if.h b/drivers/misc/habanalabs/include/common/hl_boot_if.h
index 2e45be5de4fe0feda6fb5f5d4b10d98221b23d06..e0ea51cc74756c050343864b384cefd8a7436b6c 100644 (file)
--- a/drivers/misc/habanalabs/include/common/hl_boot_if.h
+++ b/drivers/misc/habanalabs/include/common/hl_boot_if.h
@@ -431,7 +431,9 @@ struct cpu_dyn_regs {
        __le32 gic_host_ints_irq;
        __le32 gic_host_soft_rst_irq;
        __le32 gic_rot_qm_irq_ctrl;
-       __le32 reserved1[22];           /* reserve for future use */
+       __le32 cpu_rst_status;
+       __le32 eng_arc_irq_ctrl;
+       __le32 reserved1[20];           /* reserve for future use */
 };
 
 /* TODO: remove the desc magic after the code is updated to use message */