Commit ea99aad6 authored by Kai Ye's avatar Kai Ye Committed by Zheng Zengkai
Browse files

crypto: hisilicon/qm - fix the process of VF's list adding 

mainline inclusion
from mainline-master
commit 0dbcf1a2
category: bugfix
bugzilla: 173981
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0dbcf1a24e6875d51c290a174a7f2526498e2836



----------------------------------------------------------------------

If Kunpeng 920 enabled the sva mode, the "qm alg register" process will
return directly. So the list of VF wasn't added to QM list.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarMingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 58fbe1d8

drivers/crypto/hisilicon/qm.c

+8 −8
Original line number Diff line number Diff line
@@ -4256,17 +4256,17 @@ int hisi_qm_alg_register(struct hisi_qm *qm, struct hisi_qm_list *qm_list) 
	int flag = 0;

	int ret = 0;



	if (qm->ver <= QM_HW_V2 && qm->use_sva) {

		dev_info(dev, "HW V2 not both use uacce sva mode and hardware crypto algs.\n");

		return 0;

	}



	mutex_lock(&qm_list->lock);

	if (list_empty(&qm_list->list))

		flag = 1;

	list_add_tail(&qm->list, &qm_list->list);

	mutex_unlock(&qm_list->lock);



	if (qm->ver <= QM_HW_V2 && qm->use_sva) {

		dev_info(dev, "HW V2 not both use uacce sva mode and hardware crypto algs.\n");

		return 0;

	}



	if (flag) {

		ret = qm_list->register_to_crypto(qm);

		if (ret) {
@@ -4291,13 +4291,13 @@ EXPORT_SYMBOL_GPL(hisi_qm_alg_register); 
 */

void hisi_qm_alg_unregister(struct hisi_qm *qm, struct hisi_qm_list *qm_list)

{

	if (qm->ver <= QM_HW_V2 && qm->use_sva)

		return;



	mutex_lock(&qm_list->lock);

	list_del(&qm->list);

	mutex_unlock(&qm_list->lock);



	if (qm->ver <= QM_HW_V2 && qm->use_sva)

		return;



	if (list_empty(&qm_list->list))

		qm_list->unregister_from_crypto(qm);

}