2019-08-14 09:31:28

by Zhou Wang

Subject: [PATCH 0/5] crypto: hisilicon: Misc fixes

Patch 1~3 are fixes about kbuild errors, patch 4,5 are tiny fixes about qm
and zip.

This series is based on cryptodev-2.6.

Zhou Wang (5):
crypto: hisilicon - fix kbuild warnings
crypto: hisilicon - add dependency for CRYPTO_DEV_HISI_ZIP
crypto: hisilicon - init curr_sgl_dma to fix compile warning
crypto: hisilicon - add missing single_release
crypto: hisilicon - fix error handle in hisi_zip_create_req_q

drivers/crypto/hisilicon/Kconfig | 1 +
drivers/crypto/hisilicon/qm.c | 7 ++++---
drivers/crypto/hisilicon/sgl.c | 2 +-
drivers/crypto/hisilicon/zip/zip_crypto.c | 6 ++++--
4 files changed, 10 insertions(+), 6 deletions(-)

--
2.8.1

2019-08-14 09:31:32

by Zhou Wang

Subject: [PATCH 5/5] crypto: hisilicon - fix error handle in hisi_zip_create_req_q

Directly return error in the first loop in hisi_zip_create_req_q.

Fixes: 62c455ca853e ("crypto: hisilicon - add HiSilicon ZIP accelerator support")
Signed-off-by: Zhou Wang <[email protected]>
---
drivers/crypto/hisilicon/zip/zip_crypto.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c b/drivers/crypto/hisilicon/zip/zip_crypto.c
index 3033513..5a3f84d 100644
--- a/drivers/crypto/hisilicon/zip/zip_crypto.c
+++ b/drivers/crypto/hisilicon/zip/zip_crypto.c
@@ -223,8 +223,10 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
sizeof(long), GFP_KERNEL);
if (!req_q->req_bitmap) {
ret = -ENOMEM;
- if (i == 1)
- goto err_free_loop0;
+ if (i == 0)
+ return ret;
+
+ goto err_free_loop0;
}
rwlock_init(&req_q->req_lock);

--
2.8.1

2019-08-14 09:31:47

by Zhou Wang

Subject: [PATCH 2/5] crypto: hisilicon - add dependency for CRYPTO_DEV_HISI_ZIP

Add ARM64/PCI/PCI_MSI dependency for CRYPTO_DEV_HISI_ZIP.

Fixes: 62c455ca853e ("crypto: hisilicon - add HiSilicon ZIP accelerator support")
Reported-by: kbuild test robot <[email protected]>
Signed-off-by: Zhou Wang <[email protected]>
---
drivers/crypto/hisilicon/Kconfig | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/hisilicon/Kconfig b/drivers/crypto/hisilicon/Kconfig
index 1929317..fa8aa06 100644
--- a/drivers/crypto/hisilicon/Kconfig
+++ b/drivers/crypto/hisilicon/Kconfig
@@ -30,6 +30,7 @@ config CRYPTO_HISI_SGL

config CRYPTO_DEV_HISI_ZIP
tristate "Support for HiSilicon ZIP accelerator"
+ depends on ARM64 && PCI && PCI_MSI
select CRYPTO_DEV_HISI_QM
select CRYPTO_HISI_SGL
select SG_SPLIT
--
2.8.1

2019-08-14 09:32:03

by Zhou Wang

Subject: [PATCH 4/5] crypto: hisilicon - add missing single_release

Fix to add missing single_release in qm_regs_fops.

Fixes: 263c9959c937 ("crypto: hisilicon - add queue management driver for HiSilicon QM module")
Signed-off-by: Zhou Wang <[email protected]>
---
drivers/crypto/hisilicon/qm.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 796fdbf..d72e062 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -958,6 +958,7 @@ static const struct file_operations qm_regs_fops = {
.owner = THIS_MODULE,
.open = qm_regs_open,
.read = seq_read,
+ .release = single_release,
};

static int qm_create_debugfs_file(struct hisi_qm *qm, enum qm_debug_file index)
--
2.8.1

2019-08-15 12:22:41

by Herbert Xu

Subject: Re: [PATCH 0/5] crypto: hisilicon: Misc fixes

On Wed, Aug 14, 2019 at 05:28:34PM +0800, Zhou Wang wrote:
> Patch 1~3 are fixes about kbuild errors, patch 4,5 are tiny fixes about qm
> and zip.
>
> This series is based on cryptodev-2.6.
>
> Zhou Wang (5):
> crypto: hisilicon - fix kbuild warnings
> crypto: hisilicon - add dependency for CRYPTO_DEV_HISI_ZIP
> crypto: hisilicon - init curr_sgl_dma to fix compile warning
> crypto: hisilicon - add missing single_release
> crypto: hisilicon - fix error handle in hisi_zip_create_req_q
>
> drivers/crypto/hisilicon/Kconfig | 1 +
> drivers/crypto/hisilicon/qm.c | 7 ++++---
> drivers/crypto/hisilicon/sgl.c | 2 +-
> drivers/crypto/hisilicon/zip/zip_crypto.c | 6 ++++--
> 4 files changed, 10 insertions(+), 6 deletions(-)

All applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

2019-08-15 14:00:49

by Zhou Wang

Subject: Re: [PATCH 0/5] crypto: hisilicon: Misc fixes

On 2019/8/15 20:08, Herbert Xu wrote:
> On Wed, Aug 14, 2019 at 05:28:34PM +0800, Zhou Wang wrote:
>> Patch 1~3 are fixes about kbuild errors, patch 4,5 are tiny fixes about qm
>> and zip.
>>
>> This series is based on cryptodev-2.6.
>>
>> Zhou Wang (5):
>> crypto: hisilicon - fix kbuild warnings
>> crypto: hisilicon - add dependency for CRYPTO_DEV_HISI_ZIP
>> crypto: hisilicon - init curr_sgl_dma to fix compile warning
>> crypto: hisilicon - add missing single_release
>> crypto: hisilicon - fix error handle in hisi_zip_create_req_q
>>
>> drivers/crypto/hisilicon/Kconfig | 1 +
>> drivers/crypto/hisilicon/qm.c | 7 ++++---
>> drivers/crypto/hisilicon/sgl.c | 2 +-
>> drivers/crypto/hisilicon/zip/zip_crypto.c | 6 ++++--
>> 4 files changed, 10 insertions(+), 6 deletions(-)
>
> All applied. Thanks.
>

Thanks for taking this series!