Commit 85697853 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'misc-habanalabs-fixes-2019-07-22' of... 

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
parents c8917b8f 717261e1

drivers/misc/habanalabs/goya/goya.c

+3 −3
Original line number Diff line number Diff line
@@ -695,8 +695,8 @@ static int goya_sw_init(struct hl_device *hdev) 
		goto free_dma_pool;

	}



	dev_dbg(hdev->dev, "cpu accessible memory at bus address 0x%llx\n",

		hdev->cpu_accessible_dma_address);

	dev_dbg(hdev->dev, "cpu accessible memory at bus address %pad\n",

		&hdev->cpu_accessible_dma_address);



	hdev->cpu_accessible_dma_pool = gen_pool_create(ilog2(32), -1);

	if (!hdev->cpu_accessible_dma_pool) {
@@ -4449,7 +4449,6 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry) 
	case GOYA_ASYNC_EVENT_ID_AXI_ECC:

	case GOYA_ASYNC_EVENT_ID_L2_RAM_ECC:

	case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_05_SW_RESET:

	case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:

		goya_print_irq_info(hdev, event_type, false);

		hl_device_reset(hdev, true, false);

		break;
@@ -4485,6 +4484,7 @@ void goya_handle_eqe(struct hl_device *hdev, struct hl_eq_entry *eq_entry) 
		goya_unmask_irq(hdev, event_type);

		break;



	case GOYA_ASYNC_EVENT_ID_PSOC_GPIO_10_VRHOT_ICRIT:

	case GOYA_ASYNC_EVENT_ID_TPC0_BMON_SPMU:

	case GOYA_ASYNC_EVENT_ID_TPC1_BMON_SPMU:

	case GOYA_ASYNC_EVENT_ID_TPC2_BMON_SPMU: