accel/habanalabs: disable events ioctls on control device

Because it is not used and also, for graceful reset to work
those ioctls should run on the compute device.

Signed-off-by: Dafna Hirschfeld <dhirschfeld@habana.ai>
Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
Signed-off-by: Oded Gabbay <ogabbay@kernel.org>

diff --git a/drivers/accel/habanalabs/common/device.c b/drivers/accel/habanalabs/common/device.c
index c0c9e95046721bacf5672622e9c5c4cc02e1a4bc..d9531e434f602b6592d0d4f160f7e856737a2b6d 100644 (file)
--- a/drivers/accel/habanalabs/common/device.c
+++ b/drivers/accel/habanalabs/common/device.c
@@ -572,11 +572,6 @@ static int hl_device_release_ctrl(struct inode *inode, struct file *filp)
        list_del(&hpriv->dev_node);
        mutex_unlock(&hdev->fpriv_ctrl_list_lock);
 out:
-       /* release the eventfd */
-       if (hpriv->notifier_event.eventfd)
-               eventfd_ctx_put(hpriv->notifier_event.eventfd);
-
-       mutex_destroy(&hpriv->notifier_event.lock);
        put_pid(hpriv->taskpid);
 
        kfree(hpriv);
@@ -1995,14 +1990,6 @@ void hl_notifier_event_send_all(struct hl_device *hdev, u64 event_mask)
                hl_notifier_event_send(&hpriv->notifier_event, event_mask);
 
        mutex_unlock(&hdev->fpriv_list_lock);
-
-       /* control device */
-       mutex_lock(&hdev->fpriv_ctrl_list_lock);
-
-       list_for_each_entry(hpriv, &hdev->fpriv_ctrl_list, dev_node)
-               hl_notifier_event_send(&hpriv->notifier_event, event_mask);
-
-       mutex_unlock(&hdev->fpriv_ctrl_list_lock);
 }
 
 /*

diff --git a/drivers/accel/habanalabs/common/habanalabs_drv.c b/drivers/accel/habanalabs/common/habanalabs_drv.c
index 5db9af7e2daf5c1b6902f62bd554219da4cbaa62..306a5bc9bf8949e8b336d49717cc1ea3986c819f 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs_drv.c
+++ b/drivers/accel/habanalabs/common/habanalabs_drv.c
@@ -296,7 +296,6 @@ int hl_device_open_ctrl(struct inode *inode, struct file *filp)
        hpriv->hdev = hdev;
        filp->private_data = hpriv;
 
-       mutex_init(&hpriv->notifier_event.lock);
        nonseekable_open(inode, filp);
 
        hpriv->taskpid = get_task_pid(current, PIDTYPE_PID);

diff --git a/drivers/accel/habanalabs/common/habanalabs_ioctl.c b/drivers/accel/habanalabs/common/habanalabs_ioctl.c
index 87a6a0c0c48a6cdc13b31c80ec35956141654664..8c3f1e2de2feb5355880671ecbb98e5f5d7325ac 100644 (file)
--- a/drivers/accel/habanalabs/common/habanalabs_ioctl.c
+++ b/drivers/accel/habanalabs/common/habanalabs_ioctl.c
@@ -1104,6 +1104,17 @@ int hl_info_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_pri
 
 static int hl_info_ioctl_control(struct hl_fpriv *hpriv, void *data)
 {
+       struct hl_info_args *args = data;
+
+       switch (args->op) {
+       case HL_INFO_GET_EVENTS:
+       case HL_INFO_UNREGISTER_EVENTFD:
+       case HL_INFO_REGISTER_EVENTFD:
+               return -EOPNOTSUPP;
+       default:
+               break;
+       }
+
        return _hl_info_ioctl(hpriv, data, hpriv->hdev->dev_ctrl);
 }