Commit 44df9a2a authored by Carl Vanderlip's avatar Carl Vanderlip Committed by Jeff Hugo
Browse files

accel/qaic: Increase number of in_reset states 



'in_reset' holds the state of the device. As part of bringup, the device
needs to be queried to check if it's in a valid state. Add a new state
that indicates that the device is coming up, but not ready for users
yet. Rename to 'dev_state' to better describe the variable.

Signed-off-by: default avatarCarl Vanderlip <quic_carlv@quicinc.com>
Reviewed-by: default avatarPranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>
Reviewed-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Signed-off-by: default avatarJeffrey Hugo <quic_jhugo@quicinc.com>
Reviewed-by: default avatarJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231117174337.20174-2-quic_jhugo@quicinc.com
parent ff367087

drivers/accel/qaic/qaic.h

+11 −2
Original line number Diff line number Diff line
@@ -31,6 +31,15 @@ 
#define to_drm(qddev) (&(qddev)->drm)

#define to_accel_kdev(qddev) (to_drm(qddev)->accel->kdev) /* Return Linux device of accel node */



enum __packed dev_states {

	/* Device is offline or will be very soon */

	QAIC_OFFLINE,

	/* Device is booting, not clear if it's in a usable state */

	QAIC_BOOT,

	/* Device is fully operational */

	QAIC_ONLINE,

};



extern bool datapath_polling;



struct qaic_user {
@@ -121,8 +130,8 @@ struct qaic_device { 
	struct workqueue_struct	*cntl_wq;

	/* Synchronizes all the users of device during cleanup */

	struct srcu_struct	dev_lock;

	/* true: Device under reset; false: Device not under reset */

	bool			in_reset;

	/* Track the state of the device during resets */

	enum dev_states		dev_state;

	/* true: single MSI is used to operate device */

	bool			single_msi;

	/*

drivers/accel/qaic/qaic_control.c

+3 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,8 @@ static void *msg_xfer(struct qaic_device *qdev, struct wrapper_list *wrappers, u 
	int xfer_count = 0;

	int retry_count;



	if (qdev->in_reset) {

	/* Allow QAIC_BOOT state since we need to check control protocol version */

	if (qdev->dev_state == QAIC_OFFLINE) {

		mutex_unlock(&qdev->cntl_mutex);

		return ERR_PTR(-ENODEV);

	}
@@ -1306,7 +1307,7 @@ int qaic_manage_ioctl(struct drm_device *dev, void *data, struct drm_file *file_ 
	qdev = usr->qddev->qdev;



	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		srcu_read_unlock(&qdev->dev_lock, qdev_rcu_id);

		srcu_read_unlock(&usr->qddev_lock, usr_rcu_id);

		return -ENODEV;

drivers/accel/qaic/qaic_data.c

+8 −8
Original line number Diff line number Diff line
@@ -690,7 +690,7 @@ int qaic_create_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *fi 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -749,7 +749,7 @@ int qaic_mmap_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -970,7 +970,7 @@ int qaic_attach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -1341,7 +1341,7 @@ static int __qaic_execute_bo_ioctl(struct drm_device *dev, void *data, struct dr 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -1497,7 +1497,7 @@ void irq_polling_work(struct work_struct *work) 
	rcu_id = srcu_read_lock(&dbc->ch_lock);



	while (1) {

		if (dbc->qdev->in_reset) {

		if (dbc->qdev->dev_state != QAIC_ONLINE) {

			srcu_read_unlock(&dbc->ch_lock, rcu_id);

			return;

		}
@@ -1687,7 +1687,7 @@ int qaic_wait_bo_ioctl(struct drm_device *dev, void *data, struct drm_file *file 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -1756,7 +1756,7 @@ int qaic_perf_stats_bo_ioctl(struct drm_device *dev, void *data, struct drm_file 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}
@@ -1847,7 +1847,7 @@ int qaic_detach_slice_bo_ioctl(struct drm_device *dev, void *data, struct drm_fi 


	qdev = usr->qddev->qdev;

	qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto unlock_dev_srcu;

	}

drivers/accel/qaic/qaic_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int qaic_open(struct drm_device *dev, struct drm_file *file) 
	int ret;



	rcu_id = srcu_read_lock(&qdev->dev_lock);

	if (qdev->in_reset) {

	if (qdev->dev_state != QAIC_ONLINE) {

		ret = -ENODEV;

		goto dev_unlock;

	}
@@ -121,7 +121,7 @@ static void qaic_postclose(struct drm_device *dev, struct drm_file *file) 
	if (qddev) {

		qdev = qddev->qdev;

		qdev_rcu_id = srcu_read_lock(&qdev->dev_lock);

		if (!qdev->in_reset) {

		if (qdev->dev_state == QAIC_ONLINE) {

			qaic_release_usr(qdev, usr);

			for (i = 0; i < qdev->num_dbc; ++i)

				if (qdev->dbc[i].usr && qdev->dbc[i].usr->handle == usr->handle)
@@ -254,7 +254,7 @@ static int qaic_mhi_probe(struct mhi_device *mhi_dev, const struct mhi_device_id 


	qdev = pci_get_drvdata(to_pci_dev(mhi_dev->mhi_cntrl->cntrl_dev));



	qdev->in_reset = false;

	qdev->dev_state = QAIC_ONLINE;



	dev_set_drvdata(&mhi_dev->dev, qdev);

	qdev->cntl_ch = mhi_dev;
@@ -291,7 +291,7 @@ static void qaic_notify_reset(struct qaic_device *qdev) 
{

	int i;



	qdev->in_reset = true;

	qdev->dev_state = QAIC_OFFLINE;

	/* wake up any waiters to avoid waiting for timeouts at sync */

	wake_all_cntl(qdev);

	for (i = 0; i < qdev->num_dbc; ++i)
@@ -313,7 +313,7 @@ void qaic_dev_reset_clean_local_state(struct qaic_device *qdev, bool exit_reset) 
		release_dbc(qdev, i);



	if (exit_reset)

		qdev->in_reset = false;

		qdev->dev_state = QAIC_ONLINE;

}



static void cleanup_qdev(struct qaic_device *qdev)
@@ -550,7 +550,7 @@ static void qaic_pci_reset_done(struct pci_dev *pdev) 
{

	struct qaic_device *qdev = pci_get_drvdata(pdev);



	qdev->in_reset = false;

	qdev->dev_state = QAIC_ONLINE;

	qaic_mhi_reset_done(qdev->mhi_cntrl);

}