Commit 57963ff8 authored by Tomer Tayar's avatar Tomer Tayar Committed by Oded Gabbay
Browse files

accel/habanalabs: Move ioctls to the device specific ioctls range 



To use drm_ioctl(), move the ioctls to the device specific ioctls
range at [DRM_COMMAND_BASE, DRM_COMMAND_END).

Signed-off-by: default avatarTomer Tayar <ttayar@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 38ed55bc

drivers/accel/habanalabs/common/command_buffer.c

+3 −2
Original line number Diff line number Diff line
@@ -361,10 +361,11 @@ static int hl_cb_info(struct hl_mem_mgr *mmg, 
	return rc;

}



int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data)

int hl_cb_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv)

{

	union hl_cb_args *args = data;

	struct hl_fpriv *hpriv = file_priv->driver_priv;

	struct hl_device *hdev = hpriv->hdev;

	union hl_cb_args *args = data;

	u64 handle = 0, device_va = 0;

	enum hl_device_status status;

	u32 usage_cnt = 0;

drivers/accel/habanalabs/common/command_submission.c

+4 −2
Original line number Diff line number Diff line
@@ -2558,8 +2558,9 @@ static int cs_ioctl_flush_pci_hbw_writes(struct hl_fpriv *hpriv) 
	return 0;

}



int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data)

int hl_cs_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv)

{

	struct hl_fpriv *hpriv = file_priv->driver_priv;

	union hl_cs_args *args = data;

	enum hl_cs_type cs_type = 0;

	u64 cs_seq = ULONG_MAX;
@@ -3718,8 +3719,9 @@ static int hl_interrupt_wait_ioctl(struct hl_fpriv *hpriv, void *data) 
	return 0;

}



int hl_wait_ioctl(struct hl_fpriv *hpriv, void *data)

int hl_wait_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv)

{

	struct hl_fpriv *hpriv = file_priv->driver_priv;

	struct hl_device *hdev = hpriv->hdev;

	union hl_wait_cs_args *args = data;

	u32 flags = args->in.flags;

drivers/accel/habanalabs/common/habanalabs.h

+6 −5
Original line number Diff line number Diff line
@@ -4118,11 +4118,12 @@ void hl_ack_pb_single_dcore(struct hl_device *hdev, u32 dcore_offset, 
		const u32 pb_blocks[], u32 blocks_array_size);



/* IOCTLs */

long hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg);

long hl_ioctl_control(struct file *filep, unsigned int cmd, unsigned long arg);

int hl_cb_ioctl(struct hl_fpriv *hpriv, void *data);

int hl_cs_ioctl(struct hl_fpriv *hpriv, void *data);

int hl_wait_ioctl(struct hl_fpriv *hpriv, void *data);

int hl_mem_ioctl(struct hl_fpriv *hpriv, void *data);

int hl_info_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);

int hl_cb_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);

int hl_cs_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);

int hl_wait_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);

int hl_mem_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);

int hl_debug_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv);



#endif /* HABANALABSP_H_ */

drivers/accel/habanalabs/common/habanalabs_drv.c

+15 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <drm/drm_accel.h>

#include <drm/drm_drv.h>

#include <drm/drm_ioctl.h>



#define CREATE_TRACE_POINTS

#include <trace/events/habanalabs.h>
@@ -73,12 +74,21 @@ static const struct pci_device_id ids[] = { 
};

MODULE_DEVICE_TABLE(pci, ids);



static const struct drm_ioctl_desc hl_drm_ioctls[] = {

	DRM_IOCTL_DEF_DRV(HL_INFO, hl_info_ioctl, 0),

	DRM_IOCTL_DEF_DRV(HL_CB, hl_cb_ioctl, 0),

	DRM_IOCTL_DEF_DRV(HL_CS, hl_cs_ioctl, 0),

	DRM_IOCTL_DEF_DRV(HL_WAIT_CS, hl_wait_ioctl, 0),

	DRM_IOCTL_DEF_DRV(HL_MEMORY, hl_mem_ioctl, 0),

	DRM_IOCTL_DEF_DRV(HL_DEBUG, hl_debug_ioctl, 0),

};



static const struct file_operations hl_fops = {

	.owner = THIS_MODULE,

	.open = accel_open,

	.release = drm_release,

	.unlocked_ioctl = hl_ioctl,

	.compat_ioctl = hl_ioctl,

	.unlocked_ioctl = drm_ioctl,

	.compat_ioctl = drm_compat_ioctl,

	.llseek = noop_llseek,

	.mmap = hl_mmap

};
@@ -95,7 +105,9 @@ static const struct drm_driver hl_driver = { 


	.fops = &hl_fops,

	.open = hl_device_open,

	.postclose = hl_device_release

	.postclose = hl_device_release,

	.ioctls = hl_drm_ioctls,

	.num_ioctls = ARRAY_SIZE(hl_drm_ioctls)

};



/*

drivers/accel/habanalabs/common/habanalabs_ioctl.c

+10 −43
Original line number Diff line number Diff line
@@ -1095,8 +1095,10 @@ static int _hl_info_ioctl(struct hl_fpriv *hpriv, void *data, 
	return rc;

}



static int hl_info_ioctl(struct hl_fpriv *hpriv, void *data)

int hl_info_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv)

{

	struct hl_fpriv *hpriv = file_priv->driver_priv;



	return _hl_info_ioctl(hpriv, data, hpriv->hdev->dev);

}
@@ -1105,10 +1107,11 @@ static int hl_info_ioctl_control(struct hl_fpriv *hpriv, void *data) 
	return _hl_info_ioctl(hpriv, data, hpriv->hdev->dev_ctrl);

}



static int hl_debug_ioctl(struct hl_fpriv *hpriv, void *data)

int hl_debug_ioctl(struct drm_device *ddev, void *data, struct drm_file *file_priv)

{

	struct hl_debug_args *args = data;

	struct hl_fpriv *hpriv = file_priv->driver_priv;

	struct hl_device *hdev = hpriv->hdev;

	struct hl_debug_args *args = data;

	enum hl_device_status status;



	int rc = 0;
@@ -1151,19 +1154,10 @@ static int hl_debug_ioctl(struct hl_fpriv *hpriv, void *data) 
}



#define HL_IOCTL_DEF(ioctl, _func) \

	[_IOC_NR(ioctl)] = {.cmd = ioctl, .func = _func}



static const struct hl_ioctl_desc hl_ioctls[] = {

	HL_IOCTL_DEF(HL_IOCTL_INFO, hl_info_ioctl),

	HL_IOCTL_DEF(HL_IOCTL_CB, hl_cb_ioctl),

	HL_IOCTL_DEF(HL_IOCTL_CS, hl_cs_ioctl),

	HL_IOCTL_DEF(HL_IOCTL_WAIT_CS, hl_wait_ioctl),

	HL_IOCTL_DEF(HL_IOCTL_MEMORY, hl_mem_ioctl),

	HL_IOCTL_DEF(HL_IOCTL_DEBUG, hl_debug_ioctl)

};

	[_IOC_NR(ioctl) - HL_COMMAND_START] = {.cmd = ioctl, .func = _func}



static const struct hl_ioctl_desc hl_ioctls_control[] = {

	HL_IOCTL_DEF(HL_IOCTL_INFO, hl_info_ioctl_control)

	HL_IOCTL_DEF(DRM_IOCTL_HL_INFO, hl_info_ioctl_control)

};



static long _hl_ioctl(struct hl_fpriv *hpriv, unsigned int cmd, unsigned long arg,
@@ -1232,33 +1226,6 @@ static long _hl_ioctl(struct hl_fpriv *hpriv, unsigned int cmd, unsigned long ar 
	return retcode;

}



long hl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)

{

	struct drm_file *file_priv = filep->private_data;

	struct hl_fpriv *hpriv = file_priv->driver_priv;

	struct hl_device *hdev = hpriv->hdev;

	const struct hl_ioctl_desc *ioctl = NULL;

	unsigned int nr = _IOC_NR(cmd);



	if (!hdev) {

		pr_err_ratelimited("Sending ioctl after device was removed! Please close FD\n");

		return -ENODEV;

	}



	if ((nr >= HL_COMMAND_START) && (nr < HL_COMMAND_END)) {

		ioctl = &hl_ioctls[nr];

	} else {

		char task_comm[TASK_COMM_LEN];



		dev_dbg_ratelimited(hdev->dev,

				"invalid ioctl: pid=%d, comm=\"%s\", cmd=%#010x, nr=%#04x\n",

				task_pid_nr(current), get_task_comm(task_comm, current), cmd, nr);

		return -ENOTTY;

	}



	return _hl_ioctl(hpriv, cmd, arg, ioctl, hdev->dev);

}



long hl_ioctl_control(struct file *filep, unsigned int cmd, unsigned long arg)

{

	struct hl_fpriv *hpriv = filep->private_data;
@@ -1271,8 +1238,8 @@ long hl_ioctl_control(struct file *filep, unsigned int cmd, unsigned long arg) 
		return -ENODEV;

	}



	if (nr == _IOC_NR(HL_IOCTL_INFO)) {

		ioctl = &hl_ioctls_control[nr];

	if (nr == _IOC_NR(DRM_IOCTL_HL_INFO)) {

		ioctl = &hl_ioctls_control[nr - HL_COMMAND_START];

	} else {

		char task_comm[TASK_COMM_LEN];