* [PATCH 0/2] crypto: hisilicon/qm - misc fixes
@ 2020-09-19 11:01 Weili Qian
2020-09-19 11:01 ` [PATCH 1/2] crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata' Weili Qian
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Weili Qian @ 2020-09-19 11:01 UTC (permalink / raw)
To: herbert, davem; +Cc: linux-kernel, linux-crypto, xuzaibo, wangzhou1
This patchset fix some driver bugs
Resend this patch series because it depends on
https://patchwork.kernel.org/cover/11760159/
(crypto: hisilicon/zip - misc clean up).
Now the patch series has been applied.
Weili Qian (1):
crypto: hisilicon/qm - remove the update of flags
Yang Shen (1):
crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata'
drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +--
drivers/crypto/hisilicon/qm.c | 1 -
drivers/crypto/hisilicon/sec2/sec_main.c | 3 +--
drivers/crypto/hisilicon/zip/zip_main.c | 3 +--
4 files changed, 3 insertions(+), 7 deletions(-)
--
2.8.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata'
2020-09-19 11:01 [PATCH 0/2] crypto: hisilicon/qm - misc fixes Weili Qian
@ 2020-09-19 11:01 ` Weili Qian
2020-09-19 11:01 ` [PATCH 2/2] crypto: hisilicon/qm - remove the update of flags Weili Qian
2020-09-25 8:17 ` [PATCH 0/2] crypto: hisilicon/qm - misc fixes Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Weili Qian @ 2020-09-19 11:01 UTC (permalink / raw)
To: herbert, davem; +Cc: linux-kernel, linux-crypto, xuzaibo, wangzhou1
From: Yang Shen <shenyang39@huawei.com>
The parameter type of 'pci_set_drvdata' is 'struct hisi_qm',
so here the return type of 'pci_get_drvdata' should be 'struct hisi_qm'
too.
Signed-off-by: Yang Shen <shenyang39@huawei.com>
Signed-off-by: Weili Qian <qianweili@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
---
drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +--
drivers/crypto/hisilicon/sec2/sec_main.c | 3 +--
drivers/crypto/hisilicon/zip/zip_main.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index cf9169d..a33394d 100644
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -900,8 +900,7 @@ static int hpre_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void hpre_remove(struct pci_dev *pdev)
{
- struct hpre *hpre = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &hpre->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
int ret;
hisi_qm_wait_task_finish(qm, &hpre_devices);
diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index de42264..5488963 100644
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -915,8 +915,7 @@ static int sec_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void sec_remove(struct pci_dev *pdev)
{
- struct sec_dev *sec = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &sec->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
hisi_qm_wait_task_finish(qm, &sec_devices);
hisi_qm_alg_unregister(qm, &sec_devices);
diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index ee5f3d9..bd53ee7 100644
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -844,8 +844,7 @@ static int hisi_zip_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void hisi_zip_remove(struct pci_dev *pdev)
{
- struct hisi_zip *hisi_zip = pci_get_drvdata(pdev);
- struct hisi_qm *qm = &hisi_zip->qm;
+ struct hisi_qm *qm = pci_get_drvdata(pdev);
hisi_qm_wait_task_finish(qm, &zip_devices);
hisi_qm_alg_unregister(qm, &zip_devices);
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] crypto: hisilicon/qm - remove the update of flags
2020-09-19 11:01 [PATCH 0/2] crypto: hisilicon/qm - misc fixes Weili Qian
2020-09-19 11:01 ` [PATCH 1/2] crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata' Weili Qian
@ 2020-09-19 11:01 ` Weili Qian
2020-09-25 8:17 ` [PATCH 0/2] crypto: hisilicon/qm - misc fixes Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Weili Qian @ 2020-09-19 11:01 UTC (permalink / raw)
To: herbert, davem; +Cc: linux-kernel, linux-crypto, xuzaibo, wangzhou1
'qm_init_qp_status' is just a help function to initiate some 'QP' status.
'QP' status should be updated separately.
This patch removes the updating flags in 'QP' status.
Signed-off-by: Weili Qian <qianweili@huawei.com>
Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com>
---
drivers/crypto/hisilicon/qm.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c
index 07efc52..cfd66ee 100644
--- a/drivers/crypto/hisilicon/qm.c
+++ b/drivers/crypto/hisilicon/qm.c
@@ -757,7 +757,6 @@ static void qm_init_qp_status(struct hisi_qp *qp)
qp_status->sq_tail = 0;
qp_status->cq_head = 0;
qp_status->cqc_phase = true;
- atomic_set(&qp_status->flags, 0);
atomic_set(&qp_status->used, 0);
}
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 0/2] crypto: hisilicon/qm - misc fixes
2020-09-19 11:01 [PATCH 0/2] crypto: hisilicon/qm - misc fixes Weili Qian
2020-09-19 11:01 ` [PATCH 1/2] crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata' Weili Qian
2020-09-19 11:01 ` [PATCH 2/2] crypto: hisilicon/qm - remove the update of flags Weili Qian
@ 2020-09-25 8:17 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2020-09-25 8:17 UTC (permalink / raw)
To: Weili Qian; +Cc: davem, linux-kernel, linux-crypto, xuzaibo, wangzhou1
On Sat, Sep 19, 2020 at 07:01:34PM +0800, Weili Qian wrote:
> This patchset fix some driver bugs
>
> Resend this patch series because it depends on
> https://patchwork.kernel.org/cover/11760159/
> (crypto: hisilicon/zip - misc clean up).
> Now the patch series has been applied.
>
> Weili Qian (1):
> crypto: hisilicon/qm - remove the update of flags
>
> Yang Shen (1):
> crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata'
>
> drivers/crypto/hisilicon/hpre/hpre_main.c | 3 +--
> drivers/crypto/hisilicon/qm.c | 1 -
> drivers/crypto/hisilicon/sec2/sec_main.c | 3 +--
> drivers/crypto/hisilicon/zip/zip_main.c | 3 +--
> 4 files changed, 3 insertions(+), 7 deletions(-)
All applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-25 8:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-19 11:01 [PATCH 0/2] crypto: hisilicon/qm - misc fixes Weili Qian
2020-09-19 11:01 ` [PATCH 1/2] crypto: hisilicon/qm - fix wrong return type of 'pci_get_drvdata' Weili Qian
2020-09-19 11:01 ` [PATCH 2/2] crypto: hisilicon/qm - remove the update of flags Weili Qian
2020-09-25 8:17 ` [PATCH 0/2] crypto: hisilicon/qm - misc fixes Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).