Commit ee1788c6 authored by Zhou Wang's avatar Zhou Wang Committed by Herbert Xu

crypto: hisilicon - tiny fix about QM/ZIP error callback print

Tiny fix to make QM/ZIP error callback print clear and right. If one version
hardware does not support error handling, we directly print this.

And QM is embedded in ZIP, we can use ZIP print only, so remove unnecessary
QM print.
Signed-off-by: default avatarZhou Wang <wangzhou1@hisilicon.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 798ac398
...@@ -987,9 +987,6 @@ static int qm_create_debugfs_file(struct hisi_qm *qm, enum qm_debug_file index) ...@@ -987,9 +987,6 @@ static int qm_create_debugfs_file(struct hisi_qm *qm, enum qm_debug_file index)
static void qm_hw_error_init_v1(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe, static void qm_hw_error_init_v1(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe,
u32 msi) u32 msi)
{ {
dev_info(&qm->pdev->dev,
"QM v%d does not support hw error handle\n", qm->ver);
writel(QM_ABNORMAL_INT_MASK_VALUE, qm->io_base + QM_ABNORMAL_INT_MASK); writel(QM_ABNORMAL_INT_MASK_VALUE, qm->io_base + QM_ABNORMAL_INT_MASK);
} }
...@@ -1868,8 +1865,7 @@ void hisi_qm_hw_error_init(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe, ...@@ -1868,8 +1865,7 @@ void hisi_qm_hw_error_init(struct hisi_qm *qm, u32 ce, u32 nfe, u32 fe,
u32 msi) u32 msi)
{ {
if (!qm->ops->hw_error_init) { if (!qm->ops->hw_error_init) {
dev_err(&qm->pdev->dev, "QM version %d doesn't support hw error handling!\n", dev_err(&qm->pdev->dev, "QM doesn't support hw error handling!\n");
qm->ver);
return; return;
} }
...@@ -1886,8 +1882,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_hw_error_init); ...@@ -1886,8 +1882,7 @@ EXPORT_SYMBOL_GPL(hisi_qm_hw_error_init);
int hisi_qm_hw_error_handle(struct hisi_qm *qm) int hisi_qm_hw_error_handle(struct hisi_qm *qm)
{ {
if (!qm->ops->hw_error_handle) { if (!qm->ops->hw_error_handle) {
dev_err(&qm->pdev->dev, "QM version %d doesn't support hw error report!\n", dev_err(&qm->pdev->dev, "QM doesn't support hw error report!\n");
qm->ver);
return PCI_ERS_RESULT_NONE; return PCI_ERS_RESULT_NONE;
} }
......
...@@ -335,8 +335,7 @@ static void hisi_zip_hw_error_set_state(struct hisi_zip *hisi_zip, bool state) ...@@ -335,8 +335,7 @@ static void hisi_zip_hw_error_set_state(struct hisi_zip *hisi_zip, bool state)
if (qm->ver == QM_HW_V1) { if (qm->ver == QM_HW_V1) {
writel(HZIP_CORE_INT_DISABLE, qm->io_base + HZIP_CORE_INT_MASK); writel(HZIP_CORE_INT_DISABLE, qm->io_base + HZIP_CORE_INT_MASK);
dev_info(&qm->pdev->dev, "ZIP v%d does not support hw error handle\n", dev_info(&qm->pdev->dev, "Does not support hw error handle\n");
qm->ver);
return; return;
} }
......
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