Skip to content

Commit 8569785

Browse files
committed
Merge tag 'misc-habanalabs-fixes-2019-07-22' of git://people.freedesktop.org/~gabbayo/linux into char-misc-linux
Oded writes: This tag contains the following fixes: - Fix to VRHOT event handling from the ASIC. No need to reset the ASIC, just notify it in dmesg. - Fix printk specifier for printing dma address * tag 'misc-habanalabs-fixes-2019-07-22' of git://people.freedesktop.org/~gabbayo/linux: habanalabs: don't reset device when getting VRHOT habanalabs: use %pad for printing a dma_addr_t
2 parents c8917b8 + 717261e commit 8569785

File tree

1 file changed

+3
-3
lines changed
  • drivers/misc/habanalabs/goya

1 file changed

+3
-3
lines changed

drivers/misc/habanalabs/goya/goya.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev)
695695
goto free_dma_pool;
696696
}
697697

698-
dev_dbg(hdev->dev, "cpu accessible memory at bus address 0x%llx\n",
699-
hdev->cpu_accessible_dma_address);
698+
dev_dbg(hdev->dev, "cpu accessible memory at bus address %pad\n",
699+
&hdev->cpu_accessible_dma_address);
700700

701701
hdev->cpu_accessible_dma_pool = gen_pool_create(ilog2(32), -1);
702702
if (!hdev->cpu_accessible_dma_pool) {
@@ -4449,7 +4449,6 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)
44494449
case GOYA_ASYNC_EVENT_ID_AXI_ECC:
44504450
case GOYA_ASYNC_EVENT_ID_L2_RAM_ECC:
44514451
case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET:
4452-
case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:
44534452
goya_print_irq_info(hdev, event_type, false);
44544453
hl_device_reset(hdev, true, false);
44554454
break;
@@ -4485,6 +4484,7 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry)
44854484
goya_unmask_irq(hdev, event_type);
44864485
break;
44874486

4487+
case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:
44884488
case GOYA_ASYNC_EVENT_ID_TPC0_BMON_SPMU:
44894489
case GOYA_ASYNC_EVENT_ID_TPC1_BMON_SPMU:
44904490
case GOYA_ASYNC_EVENT_ID_TPC2_BMON_SPMU:

0 commit comments

Comments
 (0)