Commit d611b9f0 authored by Ofir Bitton's avatar Ofir Bitton Committed by Oded Gabbay

habanalabs: fetch hard reset capability from FW

Driver must fetch FW hard reset capability during boot time,
in order to skip the hard reset flow if necessary.
Signed-off-by: default avatarOfir Bitton <obitton@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 7f070c91
...@@ -784,10 +784,18 @@ int hl_fw_init_cpu(struct hl_device *hdev, u32 cpu_boot_status_reg, ...@@ -784,10 +784,18 @@ int hl_fw_init_cpu(struct hl_device *hdev, u32 cpu_boot_status_reg,
} }
/* Read FW application security bits */ /* Read FW application security bits */
if (hdev->asic_prop.fw_security_status_valid) if (hdev->asic_prop.fw_security_status_valid) {
hdev->asic_prop.fw_app_security_map = hdev->asic_prop.fw_app_security_map =
RREG32(cpu_security_boot_status_reg); RREG32(cpu_security_boot_status_reg);
if (hdev->asic_prop.fw_app_security_map &
CPU_BOOT_DEV_STS0_FW_HARD_RST_EN)
hdev->asic_prop.hard_reset_done_by_fw = true;
}
dev_info(hdev->dev, "Firmware hard-reset is %s\n",
hdev->asic_prop.hard_reset_done_by_fw ? "enabled" : "disabled");
dev_info(hdev->dev, "Successfully loaded firmware to device\n"); dev_info(hdev->dev, "Successfully loaded firmware to device\n");
out: out:
......
...@@ -412,6 +412,7 @@ struct hl_mmu_properties { ...@@ -412,6 +412,7 @@ struct hl_mmu_properties {
* @fw_security_status_valid: security status bits are valid and can be fetched * @fw_security_status_valid: security status bits are valid and can be fetched
* from BOOT_DEV_STS0 * from BOOT_DEV_STS0
* @dram_supports_virtual_memory: is there an MMU towards the DRAM * @dram_supports_virtual_memory: is there an MMU towards the DRAM
* @hard_reset_done_by_fw: true if firmware is handling hard reset flow
*/ */
struct asic_fixed_properties { struct asic_fixed_properties {
struct hw_queue_properties *hw_queues_props; struct hw_queue_properties *hw_queues_props;
...@@ -469,6 +470,7 @@ struct asic_fixed_properties { ...@@ -469,6 +470,7 @@ struct asic_fixed_properties {
u8 fw_security_disabled; u8 fw_security_disabled;
u8 fw_security_status_valid; u8 fw_security_status_valid;
u8 dram_supports_virtual_memory; u8 dram_supports_virtual_memory;
u8 hard_reset_done_by_fw;
}; };
/** /**
......
...@@ -518,6 +518,7 @@ static int gaudi_get_fixed_properties(struct hl_device *hdev) ...@@ -518,6 +518,7 @@ static int gaudi_get_fixed_properties(struct hl_device *hdev)
/* disable fw security for now, set it in a later stage */ /* disable fw security for now, set it in a later stage */
prop->fw_security_disabled = true; prop->fw_security_disabled = true;
prop->fw_security_status_valid = false; prop->fw_security_status_valid = false;
prop->hard_reset_done_by_fw = false;
return 0; return 0;
} }
......
...@@ -458,6 +458,7 @@ int goya_get_fixed_properties(struct hl_device *hdev) ...@@ -458,6 +458,7 @@ int goya_get_fixed_properties(struct hl_device *hdev)
/* disable fw security for now, set it in a later stage */ /* disable fw security for now, set it in a later stage */
prop->fw_security_disabled = true; prop->fw_security_disabled = true;
prop->fw_security_status_valid = false; prop->fw_security_status_valid = false;
prop->hard_reset_done_by_fw = false;
return 0; return 0;
} }
......
...@@ -84,45 +84,52 @@ ...@@ -84,45 +84,52 @@
* device is indicated as security enabled, * device is indicated as security enabled,
* registers are protected, and device * registers are protected, and device
* uses keys for image verification. * uses keys for image verification.
* Initialized at: preboot * Initialized in: preboot
* *
* CPU_BOOT_DEV_STS0_DEBUG_EN Debug is enabled. * CPU_BOOT_DEV_STS0_DEBUG_EN Debug is enabled.
* Enabled when JTAG or DEBUG is enabled * Enabled when JTAG or DEBUG is enabled
* in FW. * in FW.
* Initialized at: preboot * Initialized in: preboot
* *
* CPU_BOOT_DEV_STS0_WATCHDOG_EN Watchdog is enabled. * CPU_BOOT_DEV_STS0_WATCHDOG_EN Watchdog is enabled.
* Watchdog is enabled in FW. * Watchdog is enabled in FW.
* Initialized at: preboot * Initialized in: preboot
* *
* CPU_BOOT_DEV_STS0_DRAM_INIT_EN DRAM initialization is enabled. * CPU_BOOT_DEV_STS0_DRAM_INIT_EN DRAM initialization is enabled.
* DRAM initialization has been done in FW. * DRAM initialization has been done in FW.
* Initialized at: u-boot * Initialized in: u-boot
* *
* CPU_BOOT_DEV_STS0_BMC_WAIT_EN Waiting for BMC data enabled. * CPU_BOOT_DEV_STS0_BMC_WAIT_EN Waiting for BMC data enabled.
* If set, it means that during boot, * If set, it means that during boot,
* FW waited for BMC data. * FW waited for BMC data.
* Initialized at: u-boot * Initialized in: u-boot
* *
* CPU_BOOT_DEV_STS0_E2E_CRED_EN E2E credits initialized. * CPU_BOOT_DEV_STS0_E2E_CRED_EN E2E credits initialized.
* FW initialized E2E credits. * FW initialized E2E credits.
* Initialized at: u-boot * Initialized in: u-boot
* *
* CPU_BOOT_DEV_STS0_HBM_CRED_EN HBM credits initialized. * CPU_BOOT_DEV_STS0_HBM_CRED_EN HBM credits initialized.
* FW initialized HBM credits. * FW initialized HBM credits.
* Initialized at: u-boot * Initialized in: u-boot
* *
* CPU_BOOT_DEV_STS0_RL_EN Rate limiter initialized. * CPU_BOOT_DEV_STS0_RL_EN Rate limiter initialized.
* FW initialized rate limiter. * FW initialized rate limiter.
* Initialized at: u-boot * Initialized in: u-boot
* *
* CPU_BOOT_DEV_STS0_SRAM_SCR_EN SRAM scrambler enabled. * CPU_BOOT_DEV_STS0_SRAM_SCR_EN SRAM scrambler enabled.
* FW initialized SRAM scrambler. * FW initialized SRAM scrambler.
* Initialized at: linux * Initialized in: linux
* *
* CPU_BOOT_DEV_STS0_DRAM_SCR_EN DRAM scrambler enabled. * CPU_BOOT_DEV_STS0_DRAM_SCR_EN DRAM scrambler enabled.
* FW initialized DRAM scrambler. * FW initialized DRAM scrambler.
* Initialized at: u-boot * Initialized in: u-boot
*
* CPU_BOOT_DEV_STS0_FW_HARD_RST_EN FW hard reset procedure is enabled.
* FW has the hard reset procedure
* implemented. This means that FW will
* perform hard reset procedure on
* receiving the halt-machine event.
* Initialized in: linux
* *
* CPU_BOOT_DEV_STS0_ENABLED Device status register enabled. * CPU_BOOT_DEV_STS0_ENABLED Device status register enabled.
* This is a main indication that the * This is a main indication that the
...@@ -130,7 +137,7 @@ ...@@ -130,7 +137,7 @@
* register. Meaning the device status * register. Meaning the device status
* bits are not garbage, but actual * bits are not garbage, but actual
* statuses. * statuses.
* Initialized at: preboot * Initialized in: preboot
*/ */
#define CPU_BOOT_DEV_STS0_SECURITY_EN (1 << 0) #define CPU_BOOT_DEV_STS0_SECURITY_EN (1 << 0)
#define CPU_BOOT_DEV_STS0_DEBUG_EN (1 << 1) #define CPU_BOOT_DEV_STS0_DEBUG_EN (1 << 1)
...@@ -142,6 +149,7 @@ ...@@ -142,6 +149,7 @@
#define CPU_BOOT_DEV_STS0_RL_EN (1 << 7) #define CPU_BOOT_DEV_STS0_RL_EN (1 << 7)
#define CPU_BOOT_DEV_STS0_SRAM_SCR_EN (1 << 8) #define CPU_BOOT_DEV_STS0_SRAM_SCR_EN (1 << 8)
#define CPU_BOOT_DEV_STS0_DRAM_SCR_EN (1 << 9) #define CPU_BOOT_DEV_STS0_DRAM_SCR_EN (1 << 9)
#define CPU_BOOT_DEV_STS0_FW_HARD_RST_EN (1 << 10)
#define CPU_BOOT_DEV_STS0_ENABLED (1 << 31) #define CPU_BOOT_DEV_STS0_ENABLED (1 << 31)
enum cpu_boot_status { enum cpu_boot_status {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment