Re: [PATCH] crypto: hisilicon - fix the check on dma address

[Herbert Xu]

On Fri, Mar 19, 2021 at 06:45:05PM +0800, Hui Tang wrote:
> System may be able to get physical address of zero if not reserved by
> firmware.
> 
> The dma address obtained by 'dma_alloc_coherent' is valid, since already
> checking cpu va before, so do not check again.
> 
> Signed-off-by: Hui Tang 
> ---
>  drivers/crypto/hisilicon/hpre/hpre_crypto.c | 12 
>  drivers/crypto/hisilicon/qm.c   |  2 +-
>  drivers/crypto/hisilicon/sec2/sec_crypto.c  |  6 --
>  3 files changed, 1 insertion(+), 19 deletions(-)

Patch applied.  Thanks.
-- 
Email: Herbert Xu 
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[PATCH] crypto: hisilicon - fix the check on dma address

[Hui Tang]

System may be able to get physical address of zero if not reserved by
firmware.

The dma address obtained by 'dma_alloc_coherent' is valid, since already
checking cpu va before, so do not check again.

Signed-off-by: Hui Tang 
---
 drivers/crypto/hisilicon/hpre/hpre_crypto.c | 12 
 drivers/crypto/hisilicon/qm.c   |  2 +-
 drivers/crypto/hisilicon/sec2/sec_crypto.c  |  6 --
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c 
b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
index d7a4adf..d743c54 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c
@@ -298,8 +298,6 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,
dma_addr_t tmp;
 
tmp = le64_to_cpu(sqe->in);
-   if (unlikely(!tmp))
-   return;
 
if (src) {
if (req->src)
@@ -309,8 +307,6 @@ static void hpre_hw_data_clr_all(struct hpre_ctx *ctx,
}
 
tmp = le64_to_cpu(sqe->out);
-   if (unlikely(!tmp))
-   return;
 
if (req->dst) {
if (dst)
@@ -1369,15 +1365,11 @@ static void hpre_ecdh_hw_data_clr_all(struct hpre_ctx 
*ctx,
dma_addr_t dma;
 
dma = le64_to_cpu(sqe->in);
-   if (unlikely(!dma))
-   return;
 
if (src && req->src)
dma_free_coherent(dev, ctx->key_sz << 2, req->src, dma);
 
dma = le64_to_cpu(sqe->out);
-   if (unlikely(!dma))
-   return;
 
if (req->dst)
dma_free_coherent(dev, ctx->key_sz << 1, req->dst, dma);
@@ -1668,15 +1660,11 @@ static void hpre_curve25519_hw_data_clr_all(struct 
hpre_ctx *ctx,
dma_addr_t dma;
 
dma = le64_to_cpu(sqe->in);
-   if (unlikely(!dma))
-   return;
 
if (src && req->src)
dma_free_coherent(dev, ctx->key_sz, req->src, dma);
 
dma = le64_to_cpu(sqe->out);
-   if (unlikely(!dma))
-   return;
 
if (req->dst)
dma_free_coherent(dev, ctx->key_sz, req->dst, dma);
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index bc23174..e3688bf 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -2681,7 +2681,7 @@ static int __hisi_qm_start(struct hisi_qm *qm)
 {
int ret;
 
-   WARN_ON(!qm->qdma.dma);
+   WARN_ON(!qm->qdma.va);
 
if (qm->fun_type == QM_HW_PF) {
ret = qm_dev_mem_reset(qm);
diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c 
b/drivers/crypto/hisilicon/sec2/sec_crypto.c
index f835514..6c91c90 100644
--- a/drivers/crypto/hisilicon/sec2/sec_crypto.c
+++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c
@@ -710,12 +710,6 @@ static int sec_cipher_pbuf_map(struct sec_ctx *ctx, struct 
sec_req *req,
}
 
c_req->c_in_dma = qp_ctx->res[req_id].pbuf_dma;
-
-   if (!c_req->c_in_dma) {
-   dev_err(dev, "fail to set pbuffer address!\n");
-   return -ENOMEM;
-   }
-
c_req->c_out_dma = c_req->c_in_dma;
 
return 0;
-- 
2.8.1