habanalabs: PCIe Advanced Error Reporting support
PATCH 1/2 habanalabs: PCIe Advanced Error Reporting support
From: Ofir Bitton <[email protected]>
driver will now get notified upon any PCI error occurred and will respond according to the severity of the error.
Signed-off-by Ofir Bitton <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- .../misc/habanalabs/common/habanalabs_drv.c | 76 ++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-)
drivers/misc/habanalabs/common/habanalabs_drv.c +75 -1
@@ -11,6 +11,7 @@#include "habanalabs.h" #include <linux/pci.h> +#include <linux/aer.h> #include <linux/module.h> #define HL_DRIVER_AUTHOR "HabanaLabs Kernel Driver Team"
@@ -408,6 +409,8 @@ static int hl_pci_probe(struct pci_dev *pdev,pci_set_drvdata (pdev, hdev); +pci_enable_pcie_error_reporting (pdev); + rc =hl_device_init (hdev, hl_class);if (rc) {dev_err (&pdev->dev,"Fatal error during habanalabs device init\n" );
@@ -440,22 +443,93 @@ static void hl_pci_remove(struct pci_dev *pdev)return ;hl_device_fini (hdev); +pci_disable_pcie_error_reporting (pdev);pci_set_drvdata (pdev,NULL ); -destroy_hdev (hdev); } +/** +* hl_pci_err_detected - a PCI bus error detected on this device +* +* @pdev: pointer to pci device +* @err: PCI error type +* +* Called by the PCI subsystem whenever a non-correctable +* PCI bus error is detected +*/ +static pci_ers_result_t +hl_pci_err_detected (struct pci_dev *pdev,enum pci_channel_state state) +{ +struct hl_device *hdev =pci_get_drvdata (pdev); +enum pci_ers_result result; + +switch (state) { +case pci_channel_io_normal: +return PCI_ERS_RESULT_CAN_RECOVER ; + +case pci_channel_io_frozen: +dev_warn (hdev->dev,"frozen state error detected\n" ); + result =PCI_ERS_RESULT_NEED_RESET ; +break ; + +case pci_channel_io_perm_failure: +dev_warn (hdev->dev,"failure state error detected\n" ); + result =PCI_ERS_RESULT_DISCONNECT ; +break ; + +default : + result =PCI_ERS_RESULT_NONE ; + } + + hdev->asic_funcs->halt_engines (hdev, true); + +return result; +} + +/** +* hl_pci_err_resume - resume after a PCI slot reset +* +* @pdev: pointer to pci device +* +*/ +static void hl_pci_err_resume (struct pci_dev *pdev) +{ +struct hl_device *hdev =pci_get_drvdata (pdev); + +dev_warn (hdev->dev,"Resuming device after PCI slot reset\n" ); +hl_device_resume (hdev); +} + +/** +* hl_pci_err_slot_reset - a PCI slot reset has just happened +* +* @pdev: pointer to pci device +* +* Determine if the driver can recover from the PCI slot reset +*/ +static pci_ers_result_t hl_pci_err_slot_reset (struct pci_dev *pdev) +{ +return PCI_ERS_RESULT_RECOVERED ; +} +static const struct dev_pm_ops hl_pm_ops = { .suspend = hl_pmops_suspend, .resume = hl_pmops_resume, }; +static const struct pci_error_handlers hl_pci_err_handler = { + .error_detected = hl_pci_err_detected, + .slot_reset = hl_pci_err_slot_reset, + .resume = hl_pci_err_resume, +}; +static struct pci_driver hl_pci_driver = { .name =HL_NAME , .id_table = ids, .probe = hl_pci_probe, .remove = hl_pci_remove, .driver.pm = &hl_pm_ops, + .err_handler = &hl_pci_err_handler, };/*
Signature · 1 line
2.17.1
PATCH 2/2 habanalabs: remove security from ARB_MST_QUIET register
From: farah kassabri <[email protected]>
Allow user application to write to this register in order to be able to configure the quiet period of the QMAN between grants.
Signed-off-by farah kassabri <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- .../misc/habanalabs/gaudi/gaudi_security.c | 55 +++++++------------ 1 file changed, 19 insertions(+), 36 deletions(-)
drivers/misc/habanalabs/gaudi/gaudi_security.c +19 -36
@@ -831,8 +831,7 @@ static void gaudi_init_mme_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmMME0_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmMME0_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmMME0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmMME0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmMME0_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmMME0_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmMME0_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -1311,8 +1310,7 @@ static void gaudi_init_mme_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmMME2_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmMME2_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmMME2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmMME2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmMME2_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmMME2_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmMME2_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -1790,8 +1788,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA0_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA0_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA0_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA0_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA0_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -2186,8 +2183,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA1_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA1_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA1_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA1_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA1_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA1_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA1_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -2582,8 +2578,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA2_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA2_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA2_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA2_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA2_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -2978,8 +2973,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA3_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA3_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA3_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA3_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA3_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA3_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA3_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -3374,8 +3368,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA4_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA4_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA4_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA4_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA4_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA4_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA4_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -3770,8 +3763,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA5_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA5_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA5_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA5_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA5_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA5_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA5_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -4166,8 +4158,8 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA6_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA6_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA6_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + + mask =1 << ((mmDMA6_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA6_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA6_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA6_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -4562,8 +4554,7 @@ static void gaudi_init_dma_protection_bits(struct hl_device *hdev) word_offset = ((mmDMA7_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmDMA7_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmDMA7_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmDMA7_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmDMA7_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmDMA7_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmDMA7_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -5491,8 +5482,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev) word_offset = ((mmTPC0_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC0_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC0_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC0_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC0_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC0_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -5947,8 +5937,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev) word_offset = ((mmTPC1_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC1_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC1_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC1_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC1_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC1_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC1_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -6402,8 +6391,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmTPC2_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC2_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC2_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC2_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC2_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC2_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -6857,8 +6845,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmTPC3_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC3_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC3_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC3_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC3_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC3_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC3_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -7312,8 +7299,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmTPC4_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC4_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC4_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC4_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC4_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC4_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC4_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -7767,8 +7753,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmTPC5_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC5_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC5_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC5_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC5_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC5_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC5_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -8223,8 +8208,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev) word_offset = ((mmTPC6_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC6_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC6_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC6_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC6_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC6_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC6_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
@@ -8681,8 +8665,7 @@ static void gaudi_init_tpc_protection_bits(struct hl_device *hdev)PROT_BITS_OFFS ; word_offset = ((mmTPC7_QM_ARB_MST_CHOISE_PUSH_OFST_23 &PROT_BITS_OFFS ) >>7 ) <<2 ; - mask =1 << ((mmTPC7_QM_ARB_MST_QUIET_PER &0x7F ) >>2 ); - mask |=1 << ((mmTPC7_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); + mask =1 << ((mmTPC7_QM_ARB_SLV_CHOISE_WDT &0x7F ) >>2 ); mask |=1 << ((mmTPC7_QM_ARB_MSG_MAX_INFLIGHT &0x7F ) >>2 ); mask |=1 << ((mmTPC7_QM_ARB_MSG_AWUSER_31_11 &0x7F ) >>2 ); mask |=1 << ((mmTPC7_QM_ARB_MSG_AWUSER_SEC_PROP &0x7F ) >>2 );
Signature · 1 line
2.17.1