habanalabs: fetch hard reset capability from FW
PATCH 1/1 habanalabs: fetch hard reset capability from FW
From: Ofir Bitton <[email protected]>
Driver must fetch FW hard reset capability during boot time, in order to skip the hard reset flow if necessary.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/firmware_if.c | 10 ++++++- drivers/misc/habanalabs/common/habanalabs.h | 2 ++ drivers/misc/habanalabs/gaudi/gaudi.c | 1 + drivers/misc/habanalabs/goya/goya.c | 1 + .../habanalabs/include/common/hl_boot_if.h | 30 ++++++++++++------- 5 files changed, 32 insertions(+), 12 deletions(-)
drivers/misc/habanalabs/common/firmware_if.c +9 -1
@@ -784,10 +784,18 @@ int hl_fw_init_cpu(struct hl_device *hdev, u32 cpu_boot_status_reg, }/* 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 =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" ); out:
drivers/misc/habanalabs/common/habanalabs.h +2 -0
@@ -412,6 +412,7 @@ struct hl_mmu_properties {* @fw_security_status_valid: security status bits are valid and can be fetched * from BOOT_DEV_STS0 * @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 hw_queue_properties *hw_queues_props;
@@ -469,6 +470,7 @@ struct asic_fixed_properties {u8 fw_security_disabled;u8 fw_security_status_valid;u8 dram_supports_virtual_memory; +u8 hard_reset_done_by_fw; };/**
drivers/misc/habanalabs/gaudi/gaudi.c +1 -0
@@ -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 */ prop->fw_security_disabled = true; prop->fw_security_status_valid = false; + prop->hard_reset_done_by_fw = false;return 0 ; }
drivers/misc/habanalabs/goya/goya.c +1 -0
@@ -458,6 +458,7 @@ int goya_get_fixed_properties(struct hl_device *hdev)/* disable fw security for now, set it in a later stage */ prop->fw_security_disabled = true; prop->fw_security_status_valid = false; + prop->hard_reset_done_by_fw = false;return 0 ; }
drivers/misc/habanalabs/include/common/hl_boot_if.h +19 -11
@@ -84,45 +84,52 @@* device is indicated as security enabled, * registers are protected, and device * uses keys for image verification. -* Initialized at: preboot +* Initialized in: preboot * * CPU_BOOT_DEV_STS0_DEBUG_EN Debug is enabled. * Enabled when JTAG or DEBUG is enabled * in FW. -* Initialized at: preboot +* Initialized in: preboot * * CPU_BOOT_DEV_STS0_WATCHDOG_EN Watchdog is enabled. * Watchdog is enabled in FW. -* Initialized at: preboot +* Initialized in: preboot * * CPU_BOOT_DEV_STS0_DRAM_INIT_EN DRAM initialization is enabled. * 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. * If set, it means that during boot, * FW waited for BMC data. -* Initialized at: u-boot +* Initialized in: u-boot * * CPU_BOOT_DEV_STS0_E2E_CRED_EN E2E credits initialized. * FW initialized E2E credits. -* Initialized at: u-boot +* Initialized in: u-boot * * CPU_BOOT_DEV_STS0_HBM_CRED_EN HBM credits initialized. * FW initialized HBM credits. -* Initialized at: u-boot +* Initialized in: u-boot * * CPU_BOOT_DEV_STS0_RL_EN Rate limiter initialized. * FW initialized rate limiter. -* Initialized at: u-boot +* Initialized in: u-boot * * CPU_BOOT_DEV_STS0_SRAM_SCR_EN SRAM scrambler enabled. * FW initialized SRAM scrambler. -* Initialized at: linux +* Initialized in: linux * * CPU_BOOT_DEV_STS0_DRAM_SCR_EN DRAM scrambler enabled. * 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. * This is a main indication that the
@@ -130,7 +137,7 @@* register. Meaning the device status * bits are not garbage, but actual * statuses. -* Initialized at: preboot +* Initialized in: preboot */ #define CPU_BOOT_DEV_STS0_SECURITY_EN (1 << 0)#define CPU_BOOT_DEV_STS0_DEBUG_EN (1 << 1)
@@ -142,6 +149,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_DRAM_SCR_EN (1 << 9) +#define CPU_BOOT_DEV_STS0_FW_HARD_RST_EN (1 << 10)#define CPU_BOOT_DEV_STS0_ENABLED (1 << 31)enum cpu_boot_status {
Signature · 1 line
2.17.1
PATCH 1/1 habanalabs: print message with correct device
During hard-reset, the driver rejects further IOCTL calls and prints an error message. That error message should be printed with the correct device instead of using only the control device.
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/habanalabs/common/habanalabs_ioctl.c +1 -1
@@ -573,7 +573,7 @@ static long _hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg,int retcode;if (hdev->hard_reset_pending) { -dev_crit_ratelimited (hdev->dev_ctrl, +dev_crit_ratelimited (dev,"Device HARD reset pending! Please close FD\n" );return -ENODEV ; }
Signature · 1 line
2.17.1
PATCH 1/1 habanalabs/gaudi: fetch HBM ecc info from FW
In reply to Oded GabbayFrom: Ofir Bitton <[email protected]>
Once FW security is enabled there is no access to HBM ecc registers, need to read values from FW using a dedicated interface.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/misc/habanalabs/gaudi/gaudi.c | 47 ++++++++++++++++--- .../misc/habanalabs/include/common/cpucp_if.h | 32 +++++++++++++ 2 files changed, 72 insertions(+), 7 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi.c +40 -7
@@ -6850,10 +6850,41 @@ static int gaudi_soft_reset_late_init(struct hl_device *hdev)return hl_fw_unmask_irq_arr (hdev, gaudi->events,sizeof (gaudi->events)); } -static int gaudi_hbm_read_interrupts (struct hl_device *hdev,int device) +static int gaudi_hbm_read_interrupts (struct hl_device *hdev,int device, +struct hl_eq_hbm_ecc_data *hbm_ecc_data) { -int ch, err =0 ; -u32 base, val, val2; +u32 base, val, val2, wr_par, rd_par, ca_par, derr, serr, type, ch; +int err =0 ; + +if (!hdev->asic_prop.fw_security_disabled) { +if (!hbm_ecc_data) { +dev_err (hdev->dev,"No FW ECC data" ); +return 0 ; + } + + wr_par =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_WR_PAR_MASK , + hbm_ecc_data->hbm_ecc_info); + rd_par =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_RD_PAR_MASK , + hbm_ecc_data->hbm_ecc_info); + ca_par =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_CA_PAR_MASK , + hbm_ecc_data->hbm_ecc_info); + derr =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_DERR_MASK , + hbm_ecc_data->hbm_ecc_info); + serr =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_SERR_MASK , + hbm_ecc_data->hbm_ecc_info); + type =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_TYPE_MASK , + hbm_ecc_data->hbm_ecc_info); + ch =FIELD_GET (CPUCP_PKT_HBM_ECC_INFO_HBM_CH_MASK , + hbm_ecc_data->hbm_ecc_info); + +dev_err (hdev->dev, +"HBM%d pc%d interrupts info: WR_PAR=%d, RD_PAR=%d, CA_PAR=%d, SERR=%d, DERR=%d\n" , + device, ch, wr_par, rd_par, ca_par, serr, derr); + + err =1 ; + +return 0 ; + } base =GAUDI_HBM_CFG_BASE + device *GAUDI_HBM_CFG_OFFSET ;for (ch =0 ; ch <GAUDI_HBM_CHANNELS ; ch++) {
@@ -6869,7 +6900,7 @@ static int gaudi_hbm_read_interrupts(struct hl_device *hdev, int device) val2 =RREG32 (base + ch *0x1000 +0x060 ); dev_err(hdev->dev, - "HBM%d pc%d ECC info: 1ST_ERR_ADDR=0x%x, 1ST_ERR_TYPE=%d, SEC_CONT_CNT=%d, SEC_CNT=%d, DED_CNT=%d\n", + "HBM%d pc%d ECC info: 1ST_ERR_ADDR=0x%x, 1ST_ERR_TYPE=%d, SEC_CONT_CNT=%d, SEC_CNT=%d, DEC_CNT=%d\n", device, ch * 2, RREG32(base + ch * 0x1000 + 0x064), (val2 & 0x200) >> 9, (val2 & 0xFC00) >> 10,
@@ -6889,7 +6920,7 @@ static int gaudi_hbm_read_interrupts(struct hl_device *hdev, int device) val2 =RREG32 (base + ch *0x1000 +0x070 ); dev_err(hdev->dev, - "HBM%d pc%d ECC info: 1ST_ERR_ADDR=0x%x, 1ST_ERR_TYPE=%d, SEC_CONT_CNT=%d, SEC_CNT=%d, DED_CNT=%d\n", + "HBM%d pc%d ECC info: 1ST_ERR_ADDR=0x%x, 1ST_ERR_TYPE=%d, SEC_CONT_CNT=%d, SEC_CNT=%d, DEC_CNT=%d\n", device, ch * 2 + 1, RREG32(base + ch * 0x1000 + 0x074), (val2 & 0x200) >> 9, (val2 & 0xFC00) >> 10,
@@ -7090,7 +7121,8 @@ static void gaudi_handle_eqe(struct hl_device *hdev,case GAUDI_EVENT_HBM3_SPI_0 :gaudi_print_irq_info (hdev, event_type, false);gaudi_hbm_read_interrupts (hdev, -gaudi_hbm_event_to_dev (event_type)); +gaudi_hbm_event_to_dev (event_type), + &eq_entry->hbm_ecc_data);if (hdev->hard_reset_on_fw_events)hl_device_reset (hdev, true, false);break ;
@@ -7101,7 +7133,8 @@ static void gaudi_handle_eqe(struct hl_device *hdev,case GAUDI_EVENT_HBM3_SPI_1 :gaudi_print_irq_info (hdev, event_type, false);gaudi_hbm_read_interrupts (hdev, -gaudi_hbm_event_to_dev (event_type)); +gaudi_hbm_event_to_dev (event_type), + &eq_entry->hbm_ecc_data);break ;case GAUDI_EVENT_TPC0_DEC :
drivers/misc/habanalabs/include/common/cpucp_if.h +32 -0
@@ -11,6 +11,37 @@#include <linux/types.h> #include <linux/if_ether.h> +#define NUM_HBM_PSEUDO_CH 2 +#define NUM_HBM_CH_PER_DEV 8 +#define CPUCP_PKT_HBM_ECC_INFO_WR_PAR_SHIFT 0 +#define CPUCP_PKT_HBM_ECC_INFO_WR_PAR_MASK 0x00000001 +#define CPUCP_PKT_HBM_ECC_INFO_RD_PAR_SHIFT 1 +#define CPUCP_PKT_HBM_ECC_INFO_RD_PAR_MASK 0x00000002 +#define CPUCP_PKT_HBM_ECC_INFO_CA_PAR_SHIFT 2 +#define CPUCP_PKT_HBM_ECC_INFO_CA_PAR_MASK 0x00000004 +#define CPUCP_PKT_HBM_ECC_INFO_DERR_SHIFT 3 +#define CPUCP_PKT_HBM_ECC_INFO_DERR_MASK 0x00000008 +#define CPUCP_PKT_HBM_ECC_INFO_SERR_SHIFT 4 +#define CPUCP_PKT_HBM_ECC_INFO_SERR_MASK 0x00000010 +#define CPUCP_PKT_HBM_ECC_INFO_TYPE_SHIFT 5 +#define CPUCP_PKT_HBM_ECC_INFO_TYPE_MASK 0x00000020 +#define CPUCP_PKT_HBM_ECC_INFO_HBM_CH_SHIFT 6 +#define CPUCP_PKT_HBM_ECC_INFO_HBM_CH_MASK 0x000007C0 + +struct hl_eq_hbm_ecc_data { +/* SERR counter */ +__le32 sec_cnt; +/* DERR counter */ +__le32 dec_cnt; +/* Supplemental Information according to the mask bits */ +__le32 hbm_ecc_info; +/* Address in hbm where the ecc happened */ +__le32 first_addr; +/* SERR continuous address counter */ +__le32 sec_cont_cnt; +__le32 pad; +}; +/* * EVENT QUEUE */
@@ -31,6 +62,7 @@ struct hl_eq_entry {struct hl_eq_header hdr;union {struct hl_eq_ecc_data ecc_data; +struct hl_eq_hbm_ecc_data hbm_ecc_data;__le64 data[7 ]; }; };
Signature · 1 line
2.17.1