diff options
| author | Tomer Tayar <ttayar@habana.ai> | 2019-07-01 13:59:45 +0000 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2019-07-01 13:59:45 +0000 |
| commit | e8960ca06bb22d0d84edf246b0bf395e8322e127 (patch) | |
| tree | 1026bbbd6ccc8241fe58bd3742353c647b459c5c /drivers/misc/habanalabs/goya | |
| parent | 06deb86a748a1667d906af996775603f2bc34d00 (diff) | |
| download | linux-e8960ca06bb22d0d84edf246b0bf395e8322e127.tar.bz2 | |
habanalabs: Add busy engines bitmask to HW idle IOCTL
The information which is currently provided as a response to the
"HL_INFO_HW_IDLE" IOCTL is merely a general boolean value.
This patch extends it and provides also a bitmask that indicates which
of the device engines are busy.
Signed-off-by: Tomer Tayar <ttayar@habana.ai>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Diffstat (limited to 'drivers/misc/habanalabs/goya')
| -rw-r--r-- | drivers/misc/habanalabs/goya/goya.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c index 41e97531f300..75294ec65257 100644 --- a/drivers/misc/habanalabs/goya/goya.c +++ b/drivers/misc/habanalabs/goya/goya.c @@ -2828,7 +2828,7 @@ static int goya_send_job_on_qman0(struct hl_device *hdev, struct hl_cs_job *job) else timeout = HL_DEVICE_TIMEOUT_USEC; - if (!hdev->asic_funcs->is_device_idle(hdev, NULL)) { + if (!hdev->asic_funcs->is_device_idle(hdev, NULL, NULL)) { dev_err_ratelimited(hdev->dev, "Can't send KMD job on QMAN0 because the device is not idle\n"); return -EBUSY; @@ -4914,7 +4914,8 @@ int goya_armcp_info_get(struct hl_device *hdev) return 0; } -static bool goya_is_device_idle(struct hl_device *hdev, struct seq_file *s) +static bool goya_is_device_idle(struct hl_device *hdev, u32 *mask, + struct seq_file *s) { const char *fmt = "%-5d%-9s%#-14x%#-16x%#x\n"; const char *dma_fmt = "%-5d%-9s%#-14x%#x\n"; @@ -4937,6 +4938,8 @@ static bool goya_is_device_idle(struct hl_device *hdev, struct seq_file *s) IS_DMA_IDLE(dma_core_sts0); is_idle &= is_eng_idle; + if (mask) + *mask |= !is_eng_idle << (GOYA_ENGINE_ID_DMA_0 + i); if (s) seq_printf(s, dma_fmt, i, is_eng_idle ? "Y" : "N", qm_glbl_sts0, dma_core_sts0); @@ -4958,6 +4961,8 @@ static bool goya_is_device_idle(struct hl_device *hdev, struct seq_file *s) IS_TPC_IDLE(tpc_cfg_sts); is_idle &= is_eng_idle; + if (mask) + *mask |= !is_eng_idle << (GOYA_ENGINE_ID_TPC_0 + i); if (s) seq_printf(s, fmt, i, is_eng_idle ? "Y" : "N", qm_glbl_sts0, cmdq_glbl_sts0, tpc_cfg_sts); @@ -4976,6 +4981,8 @@ static bool goya_is_device_idle(struct hl_device *hdev, struct seq_file *s) IS_MME_IDLE(mme_arch_sts); is_idle &= is_eng_idle; + if (mask) + *mask |= !is_eng_idle << GOYA_ENGINE_ID_MME_0; if (s) { seq_printf(s, fmt, 0, is_eng_idle ? "Y" : "N", qm_glbl_sts0, cmdq_glbl_sts0, mme_arch_sts); |