diff options
| author | Ofir Bitton <obitton@habana.ai> | 2023-03-28 10:59:43 +0300 |
|---|---|---|
| committer | Oded Gabbay <ogabbay@kernel.org> | 2023-04-08 10:39:34 +0300 |
| commit | 38f3c732fce6c57ab174800e2e5456498207d440 (patch) | |
| tree | 95a38fc3de7ed4b835d6a9c91d349b59f1eb64a8 /drivers/accel | |
| parent | c19350efa9dae7f4474d7847ab7d6e667082fd18 (diff) | |
| download | linux-next-38f3c732fce6c57ab174800e2e5456498207d440.tar.gz | |
accel/habanalabs: fixes for unexpected error interrupt
Removing redundant asic prop variable as we don't need to expose this
to common code. In addition, fix some typos.
Signed-off-by: Ofir Bitton <obitton@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
Diffstat (limited to 'drivers/accel')
| -rw-r--r-- | drivers/accel/habanalabs/common/habanalabs.h | 2 | ||||
| -rw-r--r-- | drivers/accel/habanalabs/gaudi2/gaudi2.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/accel/habanalabs/common/habanalabs.h b/drivers/accel/habanalabs/common/habanalabs.h index 8c3bcc50e560..eaae69a9f817 100644 --- a/drivers/accel/habanalabs/common/habanalabs.h +++ b/drivers/accel/habanalabs/common/habanalabs.h @@ -663,7 +663,6 @@ struct hl_hints_range { * @user_dec_intr_count: number of decoder interrupts exposed to user. * @tpc_interrupt_id: interrupt id for TPC to use in order to raise events towards the host. * @eq_interrupt_id: interrupt id for EQ, uses to synchronize EQ interrupts in hard-reset. - * @unexpected_user_error_interrupt_id: interrupt id used to indicate an unexpected user error. * @cache_line_size: device cache line size. * @server_type: Server type that the ASIC is currently installed in. * The value is according to enum hl_server_type in uapi file. @@ -795,7 +794,6 @@ struct asic_fixed_properties { u16 user_dec_intr_count; u16 tpc_interrupt_id; u16 eq_interrupt_id; - u16 unexpected_user_error_interrupt_id; u16 cache_line_size; u16 server_type; u8 completion_queues_count; diff --git a/drivers/accel/habanalabs/gaudi2/gaudi2.c b/drivers/accel/habanalabs/gaudi2/gaudi2.c index 554020026da8..da1b2e6dd683 100644 --- a/drivers/accel/habanalabs/gaudi2/gaudi2.c +++ b/drivers/accel/habanalabs/gaudi2/gaudi2.c @@ -2440,7 +2440,6 @@ static int gaudi2_set_fixed_properties(struct hl_device *hdev) prop->first_available_user_interrupt = GAUDI2_IRQ_NUM_USER_FIRST; prop->tpc_interrupt_id = GAUDI2_IRQ_NUM_TPC_ASSERT; prop->eq_interrupt_id = GAUDI2_IRQ_NUM_EVENT_QUEUE; - prop->unexpected_user_error_interrupt_id = GAUDI2_IRQ_NUM_UNEXPECTED_ERROR; prop->first_available_cq[0] = GAUDI2_RESERVED_CQ_NUMBER; @@ -3351,7 +3350,7 @@ static void gaudi2_user_interrupt_setup(struct hl_device *hdev) /* Initialize TPC interrupt */ HL_USR_INTR_STRUCT_INIT(hdev->tpc_interrupt, hdev, 0, HL_USR_INTERRUPT_TPC); - /* Initialize general purpose interrupt */ + /* Initialize unexpected error interrupt */ HL_USR_INTR_STRUCT_INIT(hdev->unexpected_error_interrupt, hdev, 0, HL_USR_INTERRUPT_UNEXPECTED); @@ -4015,7 +4014,7 @@ static const char *gaudi2_irq_name(u16 irq_number) case GAUDI2_IRQ_NUM_TPC_ASSERT: return "gaudi2 tpc assert"; case GAUDI2_IRQ_NUM_UNEXPECTED_ERROR: - return "gaudi2 tpc assert"; + return "gaudi2 unexpected error"; case GAUDI2_IRQ_NUM_USER_FIRST ... GAUDI2_IRQ_NUM_USER_LAST: return "gaudi2 user completion"; default: |