提交 dc4cf0fe 编写于 作者: H Hui Tang 提交者: Zheng Zengkai

crypto: hisilicon/hpre - tiny fix

mainline inclusion
from mainline-v5.12-rc1-dontuse
commit 8db84129
category: bugfix
bugzilla: 173981
CVE: NA

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

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

Update since some special settings only for Kunpeng920.
Signed-off-by: NHui Tang <tanghui20@huawei.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NMingqiang Ling <lingmingqiang@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 4839e4f8
......@@ -318,7 +318,7 @@ static int hpre_set_cluster(struct hisi_qm *qm)
}
/*
* For Hi1620, we shoul disable FLR triggered by hardware (BME/PM/SRIOV).
* For Kunpeng 920, we shoul disable FLR triggered by hardware (BME/PM/SRIOV).
* Or it may stay in D3 state when we bind and unbind hpre quickly,
* as it does FLR triggered by hardware.
*/
......@@ -376,11 +376,14 @@ static int hpre_set_user_domain_and_cache(struct hisi_qm *qm)
if (ret)
return -ETIMEDOUT;
ret = hpre_cfg_by_dsm(qm);
if (ret)
dev_err(dev, "acpi_evaluate_dsm err.\n");
/* This setting is only needed by Kunpeng 920. */
if (qm->ver == QM_HW_V2) {
ret = hpre_cfg_by_dsm(qm);
if (ret)
dev_err(dev, "acpi_evaluate_dsm err.\n");
disable_flr_of_bme(qm);
disable_flr_of_bme(qm);
}
return ret;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册