Commit e7066160 authored by nieweiqiang's avatar nieweiqiang Committed by Herbert Xu
Browse files

crypto: hisilicon/qm - restore original qos values 



When the new qos valus setting fails, restore to
the original qos values.

Fixes: 72b010dc ("crypto: hisilicon/qm - supports writing QoS int the host")
Signed-off-by: default avatarnieweiqiang <nieweiqiang@huawei.com>
Signed-off-by: default avatarChenghai Huang <huangchenghai2@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7fc25ed2

drivers/crypto/hisilicon/qm.c

+13 −1
Original line number Diff line number Diff line
@@ -3678,6 +3678,7 @@ static void qm_clear_vft_config(struct hisi_qm *qm) 
static int qm_func_shaper_enable(struct hisi_qm *qm, u32 fun_index, u32 qos)

{

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

	struct qm_shaper_factor t_factor;

	u32 ir = qos * QM_QOS_RATE;

	int ret, total_vfs, i;
@@ -3685,6 +3686,7 @@ static int qm_func_shaper_enable(struct hisi_qm *qm, u32 fun_index, u32 qos) 
	if (fun_index > total_vfs)

		return -EINVAL;



	memcpy(&t_factor, &qm->factor[fun_index], sizeof(t_factor));

	qm->factor[fun_index].func_qos = qos;



	ret = qm_get_shaper_para(ir, &qm->factor[fun_index]);
@@ -3698,11 +3700,21 @@ static int qm_func_shaper_enable(struct hisi_qm *qm, u32 fun_index, u32 qos) 
		ret = qm_set_vft_common(qm, SHAPER_VFT, fun_index, i, 1);

		if (ret) {

			dev_err(dev, "type: %d, failed to set shaper vft!\n", i);

			return -EINVAL;

			goto back_func_qos;

		}

	}



	return 0;



back_func_qos:

	memcpy(&qm->factor[fun_index], &t_factor, sizeof(t_factor));

	for (i--; i >= ALG_TYPE_0; i--) {

		ret = qm_set_vft_common(qm, SHAPER_VFT, fun_index, i, 1);

		if (ret)

			dev_err(dev, "failed to restore shaper vft during rollback!\n");

	}



	return -EINVAL;

}



static u32 qm_get_shaper_vft_qos(struct hisi_qm *qm, u32 fun_index)