accel/habanalabs: remove call to deprecated function
Oded Gabbay
maintainerPATCH 1/2 accel/habanalabs: remove call to deprecated function
From: Dani Liberman <[email protected]>
In newer kernel versions, irq_set_affinity_hint() is deprecated. Instead, use the newer version which is irq_set_affinity_and_hint().
Signed-off-by Dani Liberman <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/accel/habanalabs/common/device.c | 2 +- drivers/accel/habanalabs/gaudi2/gaudi2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/accel/habanalabs/common/device.c +1 -1
@@ -2839,6 +2839,6 @@ void hl_set_irq_affinity(struct hl_device *hdev, int irq)return ; } -if (irq_set_affinity_hint (irq, &hdev->irq_affinity_mask)) +if (irq_set_affinity_and_hint (irq, &hdev->irq_affinity_mask))dev_err (hdev->dev,"Failed setting irq %d affinity\n" , irq); }
drivers/accel/habanalabs/gaudi2/gaudi2.c +2 -2
@@ -4395,7 +4395,7 @@ static int gaudi2_enable_msix(struct hl_device *hdev) i < GAUDI2_IRQ_NUM_USER_FIRST + user_irq_init_cnt ; i++, j++) { irq =pci_irq_vector (hdev->pdev, i); -irq_set_affinity_hint (irq,NULL ); +irq_set_affinity_and_hint (irq,NULL );free_irq (irq, &hdev->user_interrupt[j]); } irq =pci_irq_vector (hdev->pdev,GAUDI2_IRQ_NUM_UNEXPECTED_ERROR );
@@ -4476,7 +4476,7 @@ static void gaudi2_disable_msix(struct hl_device *hdev) k < hdev->asic_prop.user_interrupt_count ; i++, j++, k++) { irq =pci_irq_vector (hdev->pdev, i); -irq_set_affinity_hint (irq,NULL ); +irq_set_affinity_and_hint (irq,NULL );free_irq (irq, &hdev->user_interrupt[j]); }
Signature · 1 line
2.34.1
Oded Gabbay
maintainerPATCH 2/2 accel/habanalabs/gaudi2: fail memory memset when failing to copy QM packet to device
From: Tomer Tayar <[email protected]>
gaudi2_memset_memory_chunk_using_edma_qm() calls the access_dev_mem() ASIC function, but ignores its return value.
Add this missing check.
Signed-off-by Tomer Tayar <[email protected]>
Reviewed-by Oded Gabbay <[email protected]>
Signed-off-by Oded Gabbay <[email protected]>
--- drivers/accel/habanalabs/gaudi2/gaudi2.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/accel/habanalabs/gaudi2/gaudi2.c +8 -2
@@ -10345,14 +10345,20 @@ static int gaudi2_memset_memory_chunk_using_edma_qm(struct hl_device *hdev, pkt_size =sizeof (struct packet_lin_dma ); -for (i =0 ; i <3 ; i++) +for (i =0 ; i <3 ; i++) { rc = hdev->asic_funcs->access_dev_mem (hdev,PCI_REGION_DRAM , phys_addr + (i *sizeof (u64)), ((u64 *)(lin_dma_pkt)) + i,DEBUGFS_WRITE64 ); +if (rc) { +dev_err (hdev->dev,"Failed to copy lin_dma packet to HBM (%#llx)\n" , + phys_addr); +return rc; + } + } rc =hl_hw_queue_send_cb_no_cmpl (hdev, hw_queue_id, pkt_size, phys_addr);if (rc) -dev_err (hdev->dev,"Failed to send lin dma packet to H/W queue %d\n" , +dev_err (hdev->dev,"Failed to send lin_dma packet to H/W queue %d\n" , hw_queue_id);return rc;
Signature · 1 line
2.34.1