accel/habanalabs: upon DMA errors, use FW-extracted error cause

Initially, the driver used to read the error cause data directly from
the ASIC. However, the FW now clears it before the driver could read
it. Therefore we should use the error cause data that is extracted by
the FW.

Signed-off-by: Koby Elbaz <kelbaz@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c
index e900017f4ff7d9de39666011a6d4dfc3e136aa1d..b8644d87f8175dd3fe88806f3dee2531e7687578 100644 (file)
--- a/drivers/accel/habanalabs/gaudi2/gaudi2.c
+++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c
@@ -8807,13 +8807,13 @@ static int gaudi2_handle_kdma_core_event(struct hl_device *hdev, u16 event_type,
        return error_count;
 }
 
-static int gaudi2_handle_dma_core_event(struct hl_device *hdev, u16 event_type, int sts_addr)
+static int gaudi2_handle_dma_core_event(struct hl_device *hdev, u16 event_type, u64 intr_cause)
 {
-       u32 error_count = 0, sts_val = RREG32(sts_addr);
+       u32 error_count = 0;
        int i;
 
        for (i = 0 ; i < GAUDI2_NUM_OF_DMA_CORE_INTR_CAUSE ; i++)
-               if (sts_val & BIT(i)) {
+               if (intr_cause & BIT(i)) {
                        gaudi2_print_event(hdev, event_type, true,
                                "err cause: %s", gaudi2_dma_core_interrupts_cause[i]);
                        error_count++;
@@ -8824,27 +8824,6 @@ static int gaudi2_handle_dma_core_event(struct hl_device *hdev, u16 event_type,
        return error_count;
 }
 
-static int gaudi2_handle_pdma_core_event(struct hl_device *hdev, u16 event_type, int pdma_idx)
-{
-       u32 sts_addr;
-
-       sts_addr = mmPDMA0_CORE_ERR_CAUSE + pdma_idx * PDMA_OFFSET;
-       return gaudi2_handle_dma_core_event(hdev, event_type, sts_addr);
-}
-
-static int gaudi2_handle_edma_core_event(struct hl_device *hdev, u16 event_type, int edma_idx)
-{
-       static const int edma_event_index_map[] = {2, 3, 0, 1, 6, 7, 4, 5};
-       u32 sts_addr, index;
-
-       index = edma_event_index_map[edma_idx];
-
-       sts_addr = mmDCORE0_EDMA0_CORE_ERR_CAUSE +
-                               DCORE_OFFSET * (index / NUM_OF_EDMA_PER_DCORE) +
-                               DCORE_EDMA_OFFSET * (index % NUM_OF_EDMA_PER_DCORE);
-       return gaudi2_handle_dma_core_event(hdev, event_type, sts_addr);
-}
-
 static void gaudi2_print_pcie_mstr_rr_mstr_if_razwi_info(struct hl_device *hdev, u64 *event_mask)
 {
        u32 mstr_if_base_addr = mmPCIE_MSTR_RR_MSTR_IF_RR_SHRD_HBW_BASE, razwi_happened_addr;
@@ -9725,19 +9704,19 @@ static void gaudi2_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_ent
        case GAUDI2_EVENT_KDMA_CH0_AXI_ERR_RSP:
        case GAUDI2_EVENT_KDMA0_CORE:
                error_count = gaudi2_handle_kdma_core_event(hdev, event_type,
-                                       le64_to_cpu(eq_entry->intr_cause.intr_cause_data));
+                               le64_to_cpu(eq_entry->intr_cause.intr_cause_data));
                event_mask |= HL_NOTIFIER_EVENT_GENERAL_HW_ERR;
                break;
 
        case GAUDI2_EVENT_HDMA2_CORE ... GAUDI2_EVENT_HDMA5_CORE:
-               index = event_type - GAUDI2_EVENT_HDMA2_CORE;
-               error_count = gaudi2_handle_edma_core_event(hdev, event_type, index);
+               error_count = gaudi2_handle_dma_core_event(hdev, event_type,
+                               le64_to_cpu(eq_entry->intr_cause.intr_cause_data));
                event_mask |= HL_NOTIFIER_EVENT_USER_ENGINE_ERR;
                break;
 
        case GAUDI2_EVENT_PDMA0_CORE ... GAUDI2_EVENT_PDMA1_CORE:
-               index = event_type - GAUDI2_EVENT_PDMA0_CORE;
-               error_count = gaudi2_handle_pdma_core_event(hdev, event_type, index);
+               error_count = gaudi2_handle_dma_core_event(hdev, event_type,
+                               le64_to_cpu(eq_entry->intr_cause.intr_cause_data));
                event_mask |= HL_NOTIFIER_EVENT_USER_ENGINE_ERR;
                break;