Commit 21508f00 authored by Weili Qian's avatar Weili Qian Committed by JiangShui
Browse files

crypto: hisilicon/qm - increase device doorbell timeout 

mainline inclusion
from mainline-v6.6-rc1
commit b925a0cc
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8B6T4
CVE: NA

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



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

When both the accelerator device and SMMU are busy,
the processing time of the doorbell may be prolonged.
As a result, the doorbell may timeout, especially in the sva
scenario. Therefore, the doorbell timeout is increased.

Signed-off-by: default avatarWeili Qian <qianweili@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarJiangShui Yang <yangjiangshui@h-partners.com>
parent c2ac271a

drivers/crypto/hisilicon/qm.c

+6 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ 
#define QM_DB_PRIORITY_SHIFT_V1		48

#define QM_PAGE_SIZE			0x0034

#define QM_QP_DB_INTERVAL		0x10000

#define QM_DB_TIMEOUT_CFG		0x100074

#define QM_DB_TIMEOUT_SET		0x1fffff



#define QM_MEM_START_INIT		0x100040

#define QM_MEM_INIT_DONE		0x100044
@@ -5626,6 +5628,8 @@ int hisi_qm_init(struct hisi_qm *qm) 
		goto err_pci_init;



	if (qm->fun_type == QM_HW_PF) {

		/* Set the doorbell timeout to QM_DB_TIMEOUT_CFG ns. */

		writel(QM_DB_TIMEOUT_SET, qm->io_base + QM_DB_TIMEOUT_CFG);

		qm_disable_clock_gate(qm);

		ret = qm_dev_mem_reset(qm);

		if (ret) {
@@ -5793,6 +5797,8 @@ static int qm_rebuild_for_resume(struct hisi_qm *qm) 


	qm_cmd_init(qm);

	hisi_qm_dev_err_init(qm);

	/* Set the doorbell timeout to QM_DB_TIMEOUT_CFG ns. */

	writel(QM_DB_TIMEOUT_SET, qm->io_base + QM_DB_TIMEOUT_CFG);

	qm_disable_clock_gate(qm);

	ret = qm_dev_mem_reset(qm);

	if (ret)