| From f365f5fa510f2be67aff9dc638efe480d06feb5c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 21 Aug 2025 09:38:04 +0800 |
| Subject: crypto: hisilicon/zip - remove unnecessary validation for |
| high-performance mode configurations |
| |
| From: Chenghai Huang <huangchenghai2@huawei.com> |
| |
| [ Upstream commit d4e081510471e79171c4e0a11f6cb608e49bc082 ] |
| |
| When configuring the high-performance mode register, there is no |
| need to verify whether the register has been successfully |
| enabled, as there is no possibility of a write failure for this |
| register. |
| |
| Fixes: a9864bae1806 ("crypto: hisilicon/zip - add zip comp high perf mode configuration") |
| Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/crypto/hisilicon/zip/zip_main.c | 14 ++------------ |
| 1 file changed, 2 insertions(+), 12 deletions(-) |
| |
| diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c |
| index d8ba23b7cc7dd..fb7b19927dd32 100644 |
| --- a/drivers/crypto/hisilicon/zip/zip_main.c |
| +++ b/drivers/crypto/hisilicon/zip/zip_main.c |
| @@ -448,10 +448,9 @@ bool hisi_zip_alg_support(struct hisi_qm *qm, u32 alg) |
| return false; |
| } |
| |
| -static int hisi_zip_set_high_perf(struct hisi_qm *qm) |
| +static void hisi_zip_set_high_perf(struct hisi_qm *qm) |
| { |
| u32 val; |
| - int ret; |
| |
| val = readl_relaxed(qm->io_base + HZIP_HIGH_PERF_OFFSET); |
| if (perf_mode == HZIP_HIGH_COMP_PERF) |
| @@ -461,13 +460,6 @@ static int hisi_zip_set_high_perf(struct hisi_qm *qm) |
| |
| /* Set perf mode */ |
| writel(val, qm->io_base + HZIP_HIGH_PERF_OFFSET); |
| - ret = readl_relaxed_poll_timeout(qm->io_base + HZIP_HIGH_PERF_OFFSET, |
| - val, val == perf_mode, HZIP_DELAY_1_US, |
| - HZIP_POLL_TIMEOUT_US); |
| - if (ret) |
| - pci_err(qm->pdev, "failed to set perf mode\n"); |
| - |
| - return ret; |
| } |
| |
| static void hisi_zip_open_sva_prefetch(struct hisi_qm *qm) |
| @@ -1251,9 +1243,7 @@ static int hisi_zip_pf_probe_init(struct hisi_zip *hisi_zip) |
| if (ret) |
| return ret; |
| |
| - ret = hisi_zip_set_high_perf(qm); |
| - if (ret) |
| - return ret; |
| + hisi_zip_set_high_perf(qm); |
| |
| hisi_zip_open_sva_prefetch(qm); |
| hisi_qm_dev_err_init(qm); |
| -- |
| 2.51.0 |
| |