Commit ecc7169d authored by Kai Ye's avatar Kai Ye Committed by Herbert Xu

crypto: hisilicon/qm - modify the value of qos initialization

The value of qos should be reset after flr resetting or device
resetting. So set the max of qos value for every function. Then
update the value of qos when user writing the alg_qos.
Signed-off-by: default avatarKai Ye <yekai13@huawei.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 376a5c3c
...@@ -1126,10 +1126,10 @@ static int qm_set_vft_common(struct hisi_qm *qm, enum vft_type type, ...@@ -1126,10 +1126,10 @@ static int qm_set_vft_common(struct hisi_qm *qm, enum vft_type type,
static int qm_shaper_init_vft(struct hisi_qm *qm, u32 fun_num) static int qm_shaper_init_vft(struct hisi_qm *qm, u32 fun_num)
{ {
u32 qos = qm->factor[fun_num].func_qos;
int ret, i; int ret, i;
qm->factor[fun_num].func_qos = QM_QOS_MAX_VAL; ret = qm_get_shaper_para(qos * QM_QOS_RATE, &qm->factor[fun_num]);
ret = qm_get_shaper_para(QM_QOS_MAX_VAL * QM_QOS_RATE, &qm->factor[fun_num]);
if (ret) { if (ret) {
dev_err(&qm->pdev->dev, "failed to calculate shaper parameter!\n"); dev_err(&qm->pdev->dev, "failed to calculate shaper parameter!\n");
return ret; return ret;
...@@ -5750,13 +5750,15 @@ static int hisi_qp_alloc_memory(struct hisi_qm *qm) ...@@ -5750,13 +5750,15 @@ static int hisi_qp_alloc_memory(struct hisi_qm *qm)
static int hisi_qm_memory_init(struct hisi_qm *qm) static int hisi_qm_memory_init(struct hisi_qm *qm)
{ {
struct device *dev = &qm->pdev->dev; struct device *dev = &qm->pdev->dev;
int ret, total_vfs; int ret, total_func, i;
size_t off = 0; size_t off = 0;
total_vfs = pci_sriov_get_totalvfs(qm->pdev); total_func = pci_sriov_get_totalvfs(qm->pdev) + 1;
qm->factor = kcalloc(total_vfs + 1, sizeof(struct qm_shaper_factor), GFP_KERNEL); qm->factor = kcalloc(total_func, sizeof(struct qm_shaper_factor), GFP_KERNEL);
if (!qm->factor) if (!qm->factor)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < total_func; i++)
qm->factor[i].func_qos = QM_QOS_MAX_VAL;
#define QM_INIT_BUF(qm, type, num) do { \ #define QM_INIT_BUF(qm, type, num) do { \
(qm)->type = ((qm)->qdma.va + (off)); \ (qm)->type = ((qm)->qdma.va + (off)); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment