Skip to content

Commit

Permalink
crypto: hisilicon/qm - modify the uacce mode check
Browse files Browse the repository at this point in the history 
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: Kai Ye <yekai13@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Kai Ye authored and Herbert Xu committed Oct 8, 2021
1 parent e42dff4 commit 183b60e
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions drivers/crypto/hisilicon/qm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -3402,8 +3402,10 @@ void hisi_qm_uninit(struct hisi_qm *qm)

qm_irq_unregister(qm);
hisi_qm_pci_uninit(qm);
uacce_remove(qm->uacce);
qm->uacce = NULL;
if (qm->use_sva) {
uacce_remove(qm->uacce);
qm->uacce = NULL;
}

up_write(&qm->qps_lock);
}
Expand Down Expand Up @@ -5823,9 +5825,11 @@ int hisi_qm_init(struct hisi_qm *qm)
goto err_irq_register;
}

ret = qm_alloc_uacce(qm);
if (ret < 0)
dev_warn(dev, "fail to alloc uacce (%d)\n", ret);
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)
Expand All @@ -5838,8 +5842,10 @@ int hisi_qm_init(struct hisi_qm *qm)
return 0;

err_alloc_uacce:
uacce_remove(qm->uacce);
qm->uacce = NULL;
if (qm->use_sva) {
uacce_remove(qm->uacce);
qm->uacce = NULL;
}
err_irq_register:
qm_irq_unregister(qm);
err_pci_init:
Expand Down

0 comments on commit 183b60e

Please sign in to comment.