diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-04 10:20:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-04 10:20:48 +0200 |
| commit | a94de2e7a380064a6e8a4c3e5e10d97e8aa711f4 (patch) | |
| tree | 1026bbbd6ccc8241fe58bd3742353c647b459c5c /include | |
| parent | 60e8523e2ea18dc0c0cea69d6c1d69a065019062 (diff) | |
| parent | e8960ca06bb22d0d84edf246b0bf395e8322e127 (diff) | |
Merge tag 'misc-habanalabs-next-2019-07-04' of git://people.freedesktop.org/~gabbayo/linux into char-misc-next
Oded writes:
This tag contains the following changes for kernel 5.3:
- Change the way the device's CPU access the host memory. This allows the
driver to use the kernel API of setting DMA mask in a standard way (call
it once).
- Add a new debugfs entry to show the status of the internal DMA and
compute engines. This is very helpful for debugging in case a command
submission get stuck.
- Return to the user a mask of the internal engines indicating their busy
state.
- Make sure to restore registers that can be modified by the user to their
default values. Only applies to registers that are initialized by the
driver.
- Elimination of redundant and dead-code.
- Support memset of the device's memory with size larger then 4GB
- Force the user to set the device to debug mode before configuring the
device's coresight infrastructure
- Improve error printing in case of interrupts from the device
* tag 'misc-habanalabs-next-2019-07-04' of git://people.freedesktop.org/~gabbayo/linux: (31 commits)
habanalabs: Add busy engines bitmask to HW idle IOCTL
habanalabs: Add debugfs node for engines status
habanalabs: Update the device idle check
habanalabs: Allow accessing host mapped addresses via debugfs
habanalabs: add WARN in case of bad MMU mapping
habanalabs: remove DMA mask hack for Goya
habanalabs: set Goya CPU to use ASIC MMU
habanalabs: add MMU mappings for Goya CPU
habanalabs: initialize MMU context for driver
habanalabs: de-couple MMU and VM module initialization
habanalabs: initialize device CPU queues after MMU init
docs/habanalabs: update text for some entries in sysfs
habanalabs: add rate-limit to an error message
habanalabs: remove simulator dedicated code
habanalabs: restore unsecured registers default values
habanalabs: clear sobs and monitors in context switch
habanalabs: make tpc registers secured
habanalabs: don't limit packet size for device CPU
habanalabs: support device memory memset > 4GB
habanalabs: print event name for fatal and non-RAZWI events
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/misc/habanalabs.h | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/include/uapi/misc/habanalabs.h b/include/uapi/misc/habanalabs.h index 204ab9b4ae67..3956c226ca35 100644 --- a/include/uapi/misc/habanalabs.h +++ b/include/uapi/misc/habanalabs.h @@ -45,6 +45,30 @@ enum goya_queue_id { GOYA_QUEUE_ID_SIZE }; +/* + * Engine Numbering + * + * Used in the "busy_engines_mask" field in `struct hl_info_hw_idle' + */ + +enum goya_engine_id { + GOYA_ENGINE_ID_DMA_0 = 0, + GOYA_ENGINE_ID_DMA_1, + GOYA_ENGINE_ID_DMA_2, + GOYA_ENGINE_ID_DMA_3, + GOYA_ENGINE_ID_DMA_4, + GOYA_ENGINE_ID_MME_0, + GOYA_ENGINE_ID_TPC_0, + GOYA_ENGINE_ID_TPC_1, + GOYA_ENGINE_ID_TPC_2, + GOYA_ENGINE_ID_TPC_3, + GOYA_ENGINE_ID_TPC_4, + GOYA_ENGINE_ID_TPC_5, + GOYA_ENGINE_ID_TPC_6, + GOYA_ENGINE_ID_TPC_7, + GOYA_ENGINE_ID_SIZE +}; + enum hl_device_status { HL_DEVICE_STATUS_OPERATIONAL, HL_DEVICE_STATUS_IN_RESET, @@ -86,7 +110,11 @@ struct hl_info_dram_usage { struct hl_info_hw_idle { __u32 is_idle; - __u32 pad; + /* + * Bitmask of busy engines. + * Bits definition is according to `enum <chip>_enging_id'. + */ + __u32 busy_engines_mask; }; struct hl_info_device_status { |
