Commit 183b60e0 authored by Kai Ye's avatar Kai Ye Committed by Herbert Xu
Browse files

crypto: hisilicon/qm - modify the uacce mode check 



As qm should register to uacce in UACCE_DEV_SVA mode,
this patch modifies to checks uacce mode before doing uacce
registration.

Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e42dff46

drivers/crypto/hisilicon/qm.c

+14 −8
Original line number Diff line number Diff line
@@ -3127,7 +3127,7 @@ static int qm_alloc_uacce(struct hisi_qm *qm) 
	if (IS_ERR(uacce))

		return PTR_ERR(uacce);



	if (uacce->flags & UACCE_DEV_SVA && qm->mode == UACCE_MODE_SVA) {

	if (uacce->flags & UACCE_DEV_SVA) {

		qm->use_sva = true;

	} else {

		/* only consider sva case */
@@ -3402,8 +3402,10 @@ void hisi_qm_uninit(struct hisi_qm *qm) 


	qm_irq_unregister(qm);

	hisi_qm_pci_uninit(qm);

	if (qm->use_sva) {

		uacce_remove(qm->uacce);

		qm->uacce = NULL;

	}



	up_write(&qm->qps_lock);

}
@@ -5823,9 +5825,11 @@ int hisi_qm_init(struct hisi_qm *qm) 
			goto err_irq_register;

	}



	if (qm->mode == UACCE_MODE_SVA) {

		ret = qm_alloc_uacce(qm);

		if (ret < 0)

			dev_warn(dev, "fail to alloc uacce (%d)\n", ret);

	}



	ret = hisi_qm_memory_init(qm);

	if (ret)
@@ -5838,8 +5842,10 @@ int hisi_qm_init(struct hisi_qm *qm) 
	return 0;



err_alloc_uacce:

	if (qm->use_sva) {

		uacce_remove(qm->uacce);

		qm->uacce = NULL;

	}

err_irq_register:

	qm_irq_unregister(qm);

err_pci_init: