* [PATCH 1/4] crypto: ccree: remove useless define
2019-11-27 8:49 [PATCH 0/4] crypto: ccree: fixes Gilad Ben-Yossef
@ 2019-11-27 8:49 ` Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 2/4] crypto: ccree: fix typos in comments Gilad Ben-Yossef
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Gilad Ben-Yossef @ 2019-11-27 8:49 UTC (permalink / raw)
To: Herbert Xu, David S. Miller; +Cc: Ofir Drang, linux-crypto, linux-kernel
The define of CC_DEV_SHA_MAX is not needed since we moved
to runtime detection of capabilities. Remove it.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
drivers/crypto/ccree/cc_driver.h | 1 -
drivers/crypto/ccree/cc_hash.c | 2 --
2 files changed, 3 deletions(-)
diff --git a/drivers/crypto/ccree/cc_driver.h b/drivers/crypto/ccree/cc_driver.h
index ab31d4a68c80..7b6b5d6f1b33 100644
--- a/drivers/crypto/ccree/cc_driver.h
+++ b/drivers/crypto/ccree/cc_driver.h
@@ -28,7 +28,6 @@
/* Registers definitions from shared/hw/ree_include */
#include "cc_host_regs.h"
-#define CC_DEV_SHA_MAX 512
#include "cc_crypto_ctx.h"
#include "cc_hw_queue_defs.h"
#include "cc_sram_mgr.h"
diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c
index bc71bdf44a9f..aee5db5f8538 100644
--- a/drivers/crypto/ccree/cc_hash.c
+++ b/drivers/crypto/ccree/cc_hash.c
@@ -2358,11 +2358,9 @@ cc_digest_len_addr(void *drvdata, u32 mode)
case DRV_HASH_SHA256:
case DRV_HASH_MD5:
return digest_len_addr;
-#if (CC_DEV_SHA_MAX > 256)
case DRV_HASH_SHA384:
case DRV_HASH_SHA512:
return digest_len_addr + sizeof(cc_digest_len_init);
-#endif
default:
return digest_len_addr; /*to avoid kernel crash*/
}
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] crypto: ccree: fix typos in comments
2019-11-27 8:49 [PATCH 0/4] crypto: ccree: fixes Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 1/4] crypto: ccree: remove useless define Gilad Ben-Yossef
@ 2019-11-27 8:49 ` Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 3/4] crypto: ccree: fix typos in error msgs Gilad Ben-Yossef
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Gilad Ben-Yossef @ 2019-11-27 8:49 UTC (permalink / raw)
To: Herbert Xu, David S. Miller
Cc: Ofir Drang, Hadar Gat, linux-crypto, linux-kernel
From: Hadar Gat <hadar.gat@arm.com>
Fix some typos in code comments.
Signed-off-by: Hadar Gat <hadar.gat@arm.com>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
drivers/crypto/ccree/cc_driver.c | 2 +-
drivers/crypto/ccree/cc_fips.c | 2 +-
drivers/crypto/ccree/cc_pm.c | 2 +-
drivers/crypto/ccree/cc_request_mgr.c | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c
index 8b8eee513c27..929ae5b468d8 100644
--- a/drivers/crypto/ccree/cc_driver.c
+++ b/drivers/crypto/ccree/cc_driver.c
@@ -133,7 +133,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id)
u32 imr;
/* STAT_OP_TYPE_GENERIC STAT_PHASE_0: Interrupt */
- /* if driver suspended return, probebly shared interrupt */
+ /* if driver suspended return, probably shared interrupt */
if (cc_pm_is_dev_suspended(dev))
return IRQ_NONE;
diff --git a/drivers/crypto/ccree/cc_fips.c b/drivers/crypto/ccree/cc_fips.c
index 4c8bce33abcf..702aefc21447 100644
--- a/drivers/crypto/ccree/cc_fips.c
+++ b/drivers/crypto/ccree/cc_fips.c
@@ -120,7 +120,7 @@ static void fips_dsr(unsigned long devarg)
cc_tee_handle_fips_error(drvdata);
}
- /* after verifing that there is nothing to do,
+ /* after verifying that there is nothing to do,
* unmask AXI completion interrupt.
*/
val = (CC_REG(HOST_IMR) & ~irq);
diff --git a/drivers/crypto/ccree/cc_pm.c b/drivers/crypto/ccree/cc_pm.c
index dbc508fb719b..c1066f433a28 100644
--- a/drivers/crypto/ccree/cc_pm.c
+++ b/drivers/crypto/ccree/cc_pm.c
@@ -114,7 +114,7 @@ int cc_pm_init(struct cc_drvdata *drvdata)
{
struct device *dev = drvdata_to_dev(drvdata);
- /* must be before the enabling to avoid resdundent suspending */
+ /* must be before the enabling to avoid redundant suspending */
pm_runtime_set_autosuspend_delay(dev, CC_SUSPEND_TIMEOUT);
pm_runtime_use_autosuspend(dev);
/* activate the PM module */
diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c
index a947d5a2cf35..3ed3164820eb 100644
--- a/drivers/crypto/ccree/cc_request_mgr.c
+++ b/drivers/crypto/ccree/cc_request_mgr.c
@@ -230,7 +230,7 @@ static int cc_queues_status(struct cc_drvdata *drvdata,
struct device *dev = drvdata_to_dev(drvdata);
/* SW queue is checked only once as it will not
- * be chaned during the poll because the spinlock_bh
+ * be changed during the poll because the spinlock_bh
* is held by the thread
*/
if (((req_mgr_h->req_queue_head + 1) & (MAX_REQUEST_QUEUE_SIZE - 1)) ==
@@ -303,8 +303,8 @@ static int cc_do_send_request(struct cc_drvdata *drvdata,
/*
* We are about to push command to the HW via the command registers
- * that may refernece hsot memory. We need to issue a memory barrier
- * to make sure there are no outstnading memory writes
+ * that may reference host memory. We need to issue a memory barrier
+ * to make sure there are no outstanding memory writes
*/
wmb();
@@ -532,8 +532,8 @@ int send_request_init(struct cc_drvdata *drvdata, struct cc_hw_desc *desc,
/*
* We are about to push command to the HW via the command registers
- * that may refernece hsot memory. We need to issue a memory barrier
- * to make sure there are no outstnading memory writes
+ * that may reference host memory. We need to issue a memory barrier
+ * to make sure there are no outstanding memory writes
*/
wmb();
enqueue_seq(drvdata, desc, len);
@@ -668,7 +668,7 @@ static void comp_handler(unsigned long devarg)
request_mgr_handle->axi_completed += cc_axi_comp_count(drvdata);
}
- /* after verifing that there is nothing to do,
+ /* after verifying that there is nothing to do,
* unmask AXI completion interrupt
*/
cc_iowrite(drvdata, CC_REG(HOST_IMR),
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] crypto: ccree: fix typos in error msgs
2019-11-27 8:49 [PATCH 0/4] crypto: ccree: fixes Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 1/4] crypto: ccree: remove useless define Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 2/4] crypto: ccree: fix typos in comments Gilad Ben-Yossef
@ 2019-11-27 8:49 ` Gilad Ben-Yossef
2019-11-27 8:49 ` [PATCH 4/4] crypto: ccree: fix backlog memory leak Gilad Ben-Yossef
2019-12-11 9:38 ` [PATCH 0/4] crypto: ccree: fixes Herbert Xu
4 siblings, 0 replies; 6+ messages in thread
From: Gilad Ben-Yossef @ 2019-11-27 8:49 UTC (permalink / raw)
To: Herbert Xu, David S. Miller
Cc: Ofir Drang, Hadar Gat, linux-crypto, linux-kernel
From: Hadar Gat <hadar.gat@arm.com>
Fix some typos in error message text.
Signed-off-by: Hadar Gat <hadar.gat@arm.com>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
---
drivers/crypto/ccree/cc_driver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c
index 929ae5b468d8..1bbe82fce4a5 100644
--- a/drivers/crypto/ccree/cc_driver.c
+++ b/drivers/crypto/ccree/cc_driver.c
@@ -465,7 +465,7 @@ static int init_cc_resources(struct platform_device *plat_dev)
rc = cc_fips_init(new_drvdata);
if (rc) {
- dev_err(dev, "CC_FIPS_INIT failed 0x%x\n", rc);
+ dev_err(dev, "cc_fips_init failed 0x%x\n", rc);
goto post_debugfs_err;
}
rc = cc_sram_mgr_init(new_drvdata);
@@ -490,13 +490,13 @@ static int init_cc_resources(struct platform_device *plat_dev)
rc = cc_buffer_mgr_init(new_drvdata);
if (rc) {
- dev_err(dev, "buffer_mgr_init failed\n");
+ dev_err(dev, "cc_buffer_mgr_init failed\n");
goto post_req_mgr_err;
}
rc = cc_pm_init(new_drvdata);
if (rc) {
- dev_err(dev, "ssi_power_mgr_init failed\n");
+ dev_err(dev, "cc_pm_init failed\n");
goto post_buf_mgr_err;
}
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] crypto: ccree: fix backlog memory leak
2019-11-27 8:49 [PATCH 0/4] crypto: ccree: fixes Gilad Ben-Yossef
` (2 preceding siblings ...)
2019-11-27 8:49 ` [PATCH 3/4] crypto: ccree: fix typos in error msgs Gilad Ben-Yossef
@ 2019-11-27 8:49 ` Gilad Ben-Yossef
2019-12-11 9:38 ` [PATCH 0/4] crypto: ccree: fixes Herbert Xu
4 siblings, 0 replies; 6+ messages in thread
From: Gilad Ben-Yossef @ 2019-11-27 8:49 UTC (permalink / raw)
To: Herbert Xu, David S. Miller
Cc: Ofir Drang, stable, linux-crypto, linux-kernel
Fix brown paper bag bug of not releasing backlog list item buffer
when backlog was consumed causing a memory leak when backlog is
used.
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Cc: stable@vger.kernel.org # v4.19+
---
drivers/crypto/ccree/cc_request_mgr.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/crypto/ccree/cc_request_mgr.c b/drivers/crypto/ccree/cc_request_mgr.c
index 3ed3164820eb..a5606dc04b06 100644
--- a/drivers/crypto/ccree/cc_request_mgr.c
+++ b/drivers/crypto/ccree/cc_request_mgr.c
@@ -404,6 +404,7 @@ static void cc_proc_backlog(struct cc_drvdata *drvdata)
spin_lock(&mgr->bl_lock);
list_del(&bli->list);
--mgr->bl_len;
+ kfree(bli);
}
spin_unlock(&mgr->bl_lock);
--
2.23.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] crypto: ccree: fixes
2019-11-27 8:49 [PATCH 0/4] crypto: ccree: fixes Gilad Ben-Yossef
` (3 preceding siblings ...)
2019-11-27 8:49 ` [PATCH 4/4] crypto: ccree: fix backlog memory leak Gilad Ben-Yossef
@ 2019-12-11 9:38 ` Herbert Xu
4 siblings, 0 replies; 6+ messages in thread
From: Herbert Xu @ 2019-12-11 9:38 UTC (permalink / raw)
To: Gilad Ben-Yossef; +Cc: David S. Miller, Ofir Drang, linux-crypto, linux-kernel
On Wed, Nov 27, 2019 at 10:49:04AM +0200, Gilad Ben-Yossef wrote:
> Assorted fixes for the ccree driver
>
> Gilad Ben-Yossef (2):
> crypto: ccree: remove useless define
> crypto: ccree: fix backlog memory leak
>
> Hadar Gat (2):
> crypto: ccree: fix typos in comments
> crypto: ccree: fix typos in error msgs
>
> drivers/crypto/ccree/cc_driver.c | 8 ++++----
> drivers/crypto/ccree/cc_driver.h | 1 -
> drivers/crypto/ccree/cc_fips.c | 2 +-
> drivers/crypto/ccree/cc_hash.c | 2 --
> drivers/crypto/ccree/cc_pm.c | 2 +-
> drivers/crypto/ccree/cc_request_mgr.c | 13 +++++++------
> 6 files changed, 13 insertions(+), 15 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] 6+ messages in thread