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

!4039 crypto: hisilicon/qm: fix several issues 

Merge Pull Request from: @ci-robot 
 
PR sync from: wangyuan <wangyuan46@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/HVXGR3NPJY2C72AHMYRWAOKLUJ76XVFD/ 
 
https://gitee.com/openeuler/kernel/issues/I8WNSG 
 
Link:https://gitee.com/openeuler/kernel/pulls/4039

 

Reviewed-by: default avatarYang Shen <shenyang39@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 6d42798c 75be503b

drivers/crypto/hisilicon/qm.c

+20 −8
Original line number Diff line number Diff line
@@ -277,8 +277,7 @@ static const struct hisi_qm_hw_error qm_hw_error[] = { 
	{ .int_msk = BIT(9), .msg = "qm_sq_vf_invalid" },

	{ .int_msk = BIT(10), .msg = "qm_db_timeout" },

	{ .int_msk = BIT(11), .msg = "qm_of_fifo_of" },

	{ .int_msk = BIT(12), .msg = "qm_db_random_invalid" },

	{ /* sentinel */ }

	{ .int_msk = BIT(12), .msg = "qm_db_random_invalid" }

};



static const char * const qm_db_timeout[] = {
@@ -774,10 +773,11 @@ static irqreturn_t qm_aeq_irq(int irq, void *data) 


static irqreturn_t qm_abnormal_irq(int irq, void *data)

{

	const struct hisi_qm_hw_error *err = qm_hw_error;

	const struct hisi_qm_hw_error *err;

	struct hisi_qm *qm = data;

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

	u32 error_status, tmp;

	int i;



	atomic64_inc(&qm->debug.dfx.abnormal_irq_cnt);

	if (qm->abnormal_fix) {
@@ -789,12 +789,13 @@ static irqreturn_t qm_abnormal_irq(int irq, void *data) 
	tmp = readl(qm->io_base + QM_ABNORMAL_INT_STATUS);

	error_status = qm->msi_mask & tmp;



	while (err->msg) {

		if (err->int_msk & error_status)

	for (i = 0; i < ARRAY_SIZE(qm_hw_error); i++) {

		err = &qm_hw_error[i];

		if (!(err->int_msk & error_status))

			continue;



		dev_err(dev, "%s [error status=0x%x] found\n",

			err->msg, err->int_msk);



		err++;

	}



	/* clear err sts */
@@ -2639,12 +2640,23 @@ static int hisi_qm_memory_init(struct hisi_qm *qm) 


static int qm_clear_device(struct hisi_qm *qm)

{

	acpi_handle handle = ACPI_HANDLE(&qm->pdev->dev);

	u32 val;

	int ret;



	if (qm->fun_type == QM_HW_VF)

		return 0;



	if (!handle) {

		pci_warn(qm->pdev, "Device does not support reset, return.\n");

		return 0;

	}



	if (!acpi_has_method(handle, qm->err_ini.err_info.acpi_rst)) {

		pci_warn(qm->pdev, "BIOS has no reset method, return.\n");

		return 0;

	}



	/* OOO register set and check */

	writel(MASTER_GLOBAL_CTRL_SHUTDOWN, qm->io_base + MASTER_GLOBAL_CTRL);