Unverified Commit 844b9b09 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8723 crypto: hisilicon/qm - change function type to void 

Merge Pull Request from: @wizardWithSword 
 
9066ac364d86;crypto: hisilicon/qm - change function type to void;Sat Feb 17 00:00:00 GMT+08:00 2024;40;Weili Qian 
 
Link:https://gitee.com/openeuler/kernel/pulls/8723

 

Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 961b4597 a0c710d4

drivers/crypto/hisilicon/qm.c

+11 −27
Original line number Diff line number Diff line
@@ -2203,7 +2203,7 @@ static int qm_drain_qp(struct hisi_qp *qp) 
	return ret;

}



static int qm_stop_qp_nolock(struct hisi_qp *qp)

static void qm_stop_qp_nolock(struct hisi_qp *qp)

{

	struct hisi_qm *qm = qp->qm;

	struct device *dev = &qm->pdev->dev;
@@ -2217,7 +2217,7 @@ static int qm_stop_qp_nolock(struct hisi_qp *qp) 
	 */

	if (atomic_read(&qp->qp_status.flags) != QP_START) {

		qp->is_resetting = false;

		return 0;

		return;

	}



	atomic_set(&qp->qp_status.flags, QP_STOP);
@@ -2235,25 +2235,19 @@ static int qm_stop_qp_nolock(struct hisi_qp *qp) 
		qp_stop_fail_cb(qp);



	dev_dbg(dev, "stop queue %u!", qp->qp_id);



	return 0;

}



/**

 * hisi_qm_stop_qp() - Stop a qp in qm.

 * @qp: The qp we want to stop.

 *

 * This function is reverse of hisi_qm_start_qp. Return 0 if successful.

 * This function is reverse of hisi_qm_start_qp.

 */

int hisi_qm_stop_qp(struct hisi_qp *qp)

void hisi_qm_stop_qp(struct hisi_qp *qp)

{

	int ret;



	down_write(&qp->qm->qps_lock);

	ret = qm_stop_qp_nolock(qp);

	qm_stop_qp_nolock(qp);

	up_write(&qp->qm->qps_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(hisi_qm_stop_qp);
@@ -3278,27 +3272,20 @@ static int qm_restart(struct hisi_qm *qm) 
}



/* Stop started qps in reset flow */

static int qm_stop_started_qp(struct hisi_qm *qm)

static void qm_stop_started_qp(struct hisi_qm *qm)

{

	struct device *dev = &qm->pdev->dev;

	struct hisi_qp *qp;

	int i, ret;

	int i;



	for (i = 0; i < qm->qp_num; i++) {

		qp = &qm->qp_array[i];

		if (qp && atomic_read(&qp->qp_status.flags) == QP_START) {

		if (atomic_read(&qp->qp_status.flags) == QP_START) {

			qp->is_resetting = true;

			ret = qm_stop_qp_nolock(qp);

			if (ret < 0) {

				dev_err(dev, "Failed to stop qp%d!\n", i);

				return ret;

			qm_stop_qp_nolock(qp);

		}

	}

}



	return 0;

}



/**

 * qm_clear_queues() - Clear all queues memory in a qm.

 * @qm: The qm in which the queues will be cleared.
@@ -3359,11 +3346,8 @@ int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r) 
			}

		}



		ret = qm_stop_started_qp(qm);

		if (ret < 0) {

			dev_err(dev, "Failed to stop started qp!\n");

			goto err_unlock;

		}

		qm_stop_started_qp(qm);



		hisi_qm_set_hw_reset(qm, QM_RESET_STOP_RX_OFFSET);

	}

include/linux/hisi_acc_qm.h

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ void hisi_qm_uninit(struct hisi_qm *qm); 
int hisi_qm_start(struct hisi_qm *qm);

int hisi_qm_stop(struct hisi_qm *qm, enum qm_stop_reason r);

int hisi_qm_start_qp(struct hisi_qp *qp, unsigned long arg);

int hisi_qm_stop_qp(struct hisi_qp *qp);

void hisi_qm_stop_qp(struct hisi_qp *qp);

int hisi_qp_send(struct hisi_qp *qp, const void *msg);

void hisi_qm_debug_init(struct hisi_qm *qm);

void hisi_qm_debug_regs_clear(struct hisi_qm *qm);