omap-sham off mode and error handling fixes.
Subsystems (5)
cover omap-sham off mode and error handling fixes.
Dmitry Kasatkin (7):
crypto: updates omap sham device related platform code
crypto: omap-sham - omap sha1 & md5 driver
omap-sham: OMAP macros corrected
omap-sham: uses digest buffer in request context
omap-sham: DMA initialization fixes for off mode
omap-sham: error handling improved
omap-sham: removed redundunt locking
PATCH 1/7 crypto: updates omap sham device related platform code
- registration with multi OMAP kernels support
- clocks
--- arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/devices.c | 58 +++++++++++++++++++++++----- arch/arm/plat-omap/include/plat/omap34xx.h | 5 ++ 5 files changed, 56 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/clock2420_data.c +1 -1
@@ -1836,7 +1836,7 @@ static struct omap_clk omap2420_clks[] = {CLK (NULL ,"vlynq_ick" , &vlynq_ick,CK_242X ),CLK (NULL ,"vlynq_fck" , &vlynq_fck,CK_242X ),CLK (NULL ,"des_ick" , &des_ick,CK_242X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_242X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_242X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_242X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_242X ), CLK(NULL, "pka_ick", &pka_ick, CK_242X),
arch/arm/mach-omap2/clock2430_data.c +1 -1
@@ -1924,7 +1924,7 @@ static struct omap_clk omap2430_clks[] = {CLK (NULL ,"sdma_ick" , &sdma_ick,CK_243X ),CLK (NULL ,"sdrc_ick" , &sdrc_ick,CK_243X ),CLK (NULL ,"des_ick" , &des_ick,CK_243X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_243X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_243X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_243X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_243X ), CLK(NULL, "pka_ick", &pka_ick, CK_243X),
arch/arm/mach-omap2/clock3xxx_data.c +1 -1
@@ -3360,7 +3360,7 @@ static struct omap_clk omap3xxx_clks[] = {CLK ("mmci-omap-hs.2" ,"ick" , &mmchs3_ick,CK_3430ES2 |CK_AM35XX ),CLK (NULL ,"icr_ick" , &icr_ick,CK_343X ),CLK (NULL ,"aes2_ick" , &aes2_ick,CK_343X ), -CLK (NULL ,"sha12_ick" , &sha12_ick,CK_343X ), +CLK ("omap-sham" ,"ick" , &sha12_ick,CK_343X ),CLK (NULL ,"des2_ick" , &des2_ick,CK_343X ),CLK ("mmci-omap-hs.1" ,"ick" , &mmchs2_ick,CK_3XXX ), CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
arch/arm/mach-omap2/devices.c +48 -10
89 lines not on this page · raw message
arch/arm/plat-omap/include/plat/omap34xx.h +5 -0
@@ -82,5 +82,10 @@#define OMAP34XX_MAILBOX_BASE (L4_34XX_BASE + 0x94000) +/* Security */ +#define OMAP34XX_SEC_BASE (L4_34XX_BASE + 0xA0000) +#define OMAP34XX_SEC_SHA1MD5_BASE (OMAP34XX_SEC_BASE + 0x23000) +#define OMAP34XX_SEC_AES_BASE (OMAP34XX_SEC_BASE + 0x25000) +#endif /* __ASM_ARCH_OMAP3_H */
Signature · 1 line
1.7.0.4
PATCH 2/7 crypto: omap-sham - omap sha1 & md5 driver
In reply to Dmitry KasatkinEarlier kernel contained omap sha1 and md5 driver, which was not maintained, was not ported to new crypto APIs and removed from the source tree.
- implements async crypto API using dma and cpu.
- supports multiple sham instances if available
- hmac
- concurrent requests
--- drivers/crypto/Kconfig | 9 + drivers/crypto/Makefile | 2 + drivers/crypto/omap-sham.c | 1259 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1270 insertions(+), 0 deletions(-) create mode 100644 drivers/crypto/omap-sham.c
drivers/crypto/Kconfig +9 -0
@@ -222,4 +222,13 @@ config CRYPTO_DEV_PPC4XX help This option allows you to have support for AMCC crypto acceleration. +config CRYPTO_DEV_OMAP_SHAM + tristate "Support for OMAP SHA1/MD5 hw accelerator" + depends on ARCH_OMAP2 || ARCH_OMAP3 + select CRYPTO_SHA1 + select CRYPTO_MD5 + help + OMAP processors have SHA1/MD5 hw accelerator. Select this if you + want to use the OMAP module for SHA1/MD5 algorithms. + endif # CRYPTO_HW
drivers/crypto/Makefile +2 -0
@@ -6,3 +6,5 @@ obj-$(CONFIG_CRYPTO_DEV_MV_CESA) += mv_cesa.o obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o obj-$(CONFIG_CRYPTO_DEV_PPC4XX) += amcc/ +obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o +
drivers/crypto/omap-sham.c new file +1259 -0
1,259 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 3/7 omap-sham: OMAP macros corrected
In reply to Dmitry Kasatkin--- arch/arm/mach-omap2/devices.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/devices.c +2 -2
@@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {} #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE) -#ifdef CONFIG_ARCH_OMAP24XX +#ifdef CONFIG_ARCH_OMAP2 static struct resource omap2_sham_resources[] = { { .start = OMAP24XX_SEC_SHA1MD5_BASE,
@@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);#define omap2_sham_resources_sz 0#endif -#ifdef CONFIG_ARCH_OMAP34XX +#ifdef CONFIG_ARCH_OMAP3 static struct resource omap3_sham_resources[] = { { .start = OMAP34XX_SEC_SHA1MD5_BASE,
Signature · 1 line
1.7.0.4
PATCH 4/7 omap-sham: uses digest buffer in request context
In reply to Dmitry KasatkinCurrently driver storred digest results in req->results provided by the client. But some clients do not set it until final() call. It leads to crash.
Changed to use internal buffer to store temporary digest results.
--- drivers/crypto/omap-sham.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
drivers/crypto/omap-sham.c +8 -3
@@ -97,6 +97,7 @@ struct omap_sham_reqctx {unsigned long flags;unsigned long op; +u8 digest[SHA1_DIGEST_SIZE ];size_t digcnt;u8 *buffer;size_t bufcnt;
@@ -194,7 +195,7 @@ static inline int omap_sham_wait(struct omap_sham_dev *dd, u32 offset, u32 bit)static void omap_sham_copy_hash (struct ahash_request *req,int out) {struct omap_sham_reqctx *ctx =ahash_request_ctx (req); -u32 *hash = (u32 *)req->result; +u32 *hash = (u32 *)ctx->digest;int i;if (likely (ctx->flags &FLAGS_SHA1 )) {
@@ -453,8 +454,11 @@ static void omap_sham_cleanup(struct ahash_request *req) ctx->flags |=FLAGS_CLEAN ;spin_unlock_irqrestore (&dd->lock, flags); -if (ctx->digcnt) +if (ctx->digcnt) {clk_disable (dd->iclk); +memcpy (req->result, ctx->digest, (ctx->flags &FLAGS_SHA1 ) ? +SHA1_DIGEST_SIZE :MD5_DIGEST_SIZE ); + }if (ctx->dma_addr) dma_unmap_single(dd->dev, ctx->dma_addr, ctx->buflen,
@@ -576,6 +580,7 @@ static int omap_sham_final_req(struct omap_sham_dev *dd)static int omap_sham_finish_req_hmac (struct ahash_request *req) { +struct omap_sham_reqctx *ctx =ahash_request_ctx (req);struct omap_sham_ctx *tctx =crypto_tfm_ctx (req->base.tfm);struct omap_sham_hmac_ctx *bctx = tctx->base;int bs =crypto_shash_blocksize (bctx->shash);
@@ -590,7 +595,7 @@ static int omap_sham_finish_req_hmac(struct ahash_request *req)return crypto_shash_init (&desc.shash) ?:crypto_shash_update (&desc.shash, bctx->opad, bs) ?: -crypto_shash_finup (&desc.shash, req->result, ds, req->result); +crypto_shash_finup (&desc.shash, ctx->digest, ds, ctx->digest); }static void omap_sham_finish_req (struct ahash_request *req,int err)
Signature · 1 line
1.7.0.4
PATCH 5/7 omap-sham: DMA initialization fixes for off mode
In reply to Dmitry KasatkinDMA parameters for constant data were initialized during driver probe(). It seems that those settings sometimes are lost when devices goes to off mode. This patch makes DMA initialization just before use.
It solves off mode problems.
--- drivers/crypto/omap-sham.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-)
drivers/crypto/omap-sham.c +10 -9
@@ -318,6 +318,16 @@ static int omap_sham_xmit_dma(struct omap_sham_dev *dd, dma_addr_t dma_addr,omap_set_dma_src_params (dd->dma_lch,0 ,OMAP_DMA_AMODE_POST_INC , dma_addr,0 ,0 ); +omap_set_dma_dest_params (dd->dma_lch,0 , +OMAP_DMA_AMODE_CONSTANT , + dd->phys_base +SHA_REG_DIN (0 ),0 ,16 ); + +omap_set_dma_dest_burst_mode (dd->dma_lch, +OMAP_DMA_DATA_BURST_16 ); + +omap_set_dma_src_burst_mode (dd->dma_lch, +OMAP_DMA_DATA_BURST_4 ); + err =omap_sham_write_ctrl (dd, length, final,1 );if (err)return err;
@@ -1071,15 +1081,6 @@ static int omap_sham_dma_init(struct omap_sham_dev *dd)dev_err (dd->dev,"Unable to request DMA channel\n" );return err; } -omap_set_dma_dest_params (dd->dma_lch,0 , -OMAP_DMA_AMODE_CONSTANT , - dd->phys_base +SHA_REG_DIN (0 ),0 ,16 ); - -omap_set_dma_dest_burst_mode (dd->dma_lch, -OMAP_DMA_DATA_BURST_16 ); - -omap_set_dma_src_burst_mode (dd->dma_lch, -OMAP_DMA_DATA_BURST_4 );return 0 ; }
Signature · 1 line
1.7.0.4
PATCH 6/7 omap-sham: error handling improved
In reply to Dmitry KasatkinIntroduces DMA error handling.
DMA error is returned as a result code of the hash request. Clients needs to handle error codes and may repeat hash calculation attempt.
Also in the case of DMA error, SHAM module is set to be re-initialized again. It significantly improves stability against possible HW failures.
--- drivers/crypto/omap-sham.c | 67 +++++++++++++++++++++++++++++--------------- 1 files changed, 44 insertions(+), 23 deletions(-)
drivers/crypto/omap-sham.c +44 -23
@@ -83,6 +83,7 @@#define FLAGS_INIT 0x0100#define FLAGS_CPU 0x0200#define FLAGS_HMAC 0x0400 +#define FLAGS_ERROR 0x0800/* 3rd byte */ #define FLAGS_BUSY 16
@@ -137,6 +138,7 @@ struct omap_sham_dev {int irq;struct clk *iclk;spinlock_t lock; +int err;int dma;int dma_lch;struct tasklet_struct done_task;
@@ -234,10 +236,12 @@ static int omap_sham_write_ctrl(struct omap_sham_dev *dd, size_t length, SHA_REG_MASK_SOFTRESET, SHA_REG_MASK_SOFTRESET);if (omap_sham_wait (dd,SHA_REG_SYSSTATUS , -SHA_REG_SYSSTATUS_RESETDONE )) +SHA_REG_SYSSTATUS_RESETDONE )) { +clk_disable (dd->iclk);return -ETIMEDOUT ; - + } dd->flags |=FLAGS_INIT ; + dd->err =0 ; } }else {omap_sham_write (dd,SHA_REG_DIGCNT , ctx->digcnt);
@@ -279,11 +283,12 @@ static int omap_sham_xmit_cpu(struct omap_sham_dev *dd, const u8 *buf,if (err)return err; +/* should be non-zero before next lines to disable clocks later */ + ctx->digcnt += length; +if (omap_sham_wait (dd,SHA_REG_CTRL ,SHA_REG_CTRL_INPUT_READY ))return -ETIMEDOUT ; - ctx->digcnt += length; -if (final) ctx->flags |=FLAGS_FINAL ;/* catch last interrupt */
@@ -303,7 +308,6 @@ static int omap_sham_xmit_dma(struct omap_sham_dev *dd, dma_addr_t dma_addr,dev_dbg (dd->dev,"xmit_dma: digcnt: %d, length: %d, final: %d\n" , ctx->digcnt, length, final); -/* flush cache entries related to our page */ if (dma_addr == ctx->dma_addr) dma_sync_single_for_device(dd->dev, dma_addr, length,
@@ -411,6 +415,7 @@ static int omap_sham_update_dma_fast(struct omap_sham_dev *dd) {struct omap_sham_reqctx *ctx =ahash_request_ctx (dd->req);unsigned int length; +int err; ctx->flags |=FLAGS_FAST ;
@@ -424,7 +429,11 @@ static int omap_sham_update_dma_fast(struct omap_sham_dev *dd) ctx->total -= length; -return omap_sham_xmit_dma (dd,sg_dma_address (ctx->sg), length,1 ); + err =omap_sham_xmit_dma (dd,sg_dma_address (ctx->sg), length,1 ); +if (err != -EINPROGRESS ) +dma_unmap_sg (dd->dev, ctx->sg,1 ,DMA_TO_DEVICE ); + +return err; }static int omap_sham_update_cpu (struct omap_sham_dev *dd)
@@ -580,9 +589,6 @@ static int omap_sham_final_req(struct omap_sham_dev *dd) ctx->bufcnt =0 ; -if (err != -EINPROGRESS ) -omap_sham_cleanup (req); -dev_dbg (dd->dev,"final_req: err: %d\n" , err);return err;
@@ -616,9 +622,11 @@ static void omap_sham_finish_req(struct ahash_request *req, int err)omap_sham_copy_hash (ctx->dd->req,1 );if (ctx->flags &FLAGS_HMAC ) err =omap_sham_finish_req_hmac (req); + }else { + ctx->flags |=FLAGS_ERROR ; } -if (ctx->flags &FLAGS_FINAL ) +if ((ctx->flags &FLAGS_FINAL ) || err)omap_sham_cleanup (req);clear_bit (FLAGS_BUSY , &ctx->dd->flags);
@@ -776,12 +784,14 @@ static int omap_sham_final(struct ahash_request *req) ctx->flags |=FLAGS_FINUP ; -/* OMAP HW accel works only with buffers >= 9 */ -/* HMAC is always >= 9 because of ipad */ -if ((ctx->digcnt + ctx->bufcnt) <9 ) - err =omap_sham_final_shash (req); -else if (ctx->bufcnt) -return omap_sham_enqueue (req,OP_FINAL ); +if (!(ctx->flags &FLAGS_ERROR )) { +/* OMAP HW accel works only with buffers >= 9 */ +/* HMAC is always >= 9 because of ipad */ +if ((ctx->digcnt + ctx->bufcnt) <9 ) + err =omap_sham_final_shash (req); +else if (ctx->bufcnt) +return omap_sham_enqueue (req,OP_FINAL ); + }omap_sham_cleanup (req);
@@ -851,6 +861,8 @@ static int omap_sham_cra_init_alg(struct crypto_tfm *tfm, const char *alg_base)struct omap_sham_ctx *tctx =crypto_tfm_ctx (tfm);const char *alg_name =crypto_tfm_alg_name (tfm); +pr_info ("enter\n" ); +/* Allocate a fallback and abort if it failed. */ tctx->fallback =crypto_alloc_shash (alg_name,0 ,CRYPTO_ALG_NEED_FALLBACK );
@@ -1008,7 +1020,7 @@ static void omap_sham_done_task(unsigned long data)struct omap_sham_dev *dd = (struct omap_sham_dev *)data;struct ahash_request *req = dd->req;struct omap_sham_reqctx *ctx =ahash_request_ctx (req); -int ready =1 ; +int ready =0 , err =0 ;if (ctx->flags &FLAGS_OUTPUT_READY ) { ctx->flags &= ~FLAGS_OUTPUT_READY ;
@@ -1018,13 +1030,16 @@ static void omap_sham_done_task(unsigned long data)if (dd->flags &FLAGS_DMA_ACTIVE ) { dd->flags &= ~FLAGS_DMA_ACTIVE ;omap_sham_update_dma_stop (dd); -omap_sham_update_dma_slow (dd); +if (!dd->err) + err =omap_sham_update_dma_slow (dd); } -if (ready && !(dd->flags &FLAGS_DMA_ACTIVE )) { -dev_dbg (dd->dev,"update done\n" ); + err = dd->err ? : err; + +if (err != -EINPROGRESS && (ready || err)) { +dev_dbg (dd->dev,"update done: err: %d\n" , err);/* finish curent request */ -omap_sham_finish_req (req,0 ); +omap_sham_finish_req (req, err);/* start new request */ omap_sham_handle_queue (dd); }
@@ -1056,6 +1071,7 @@ static irqreturn_t omap_sham_irq(int irq, void *dev_id)omap_sham_read (dd,SHA_REG_CTRL ); ctx->flags |=FLAGS_OUTPUT_READY ; + dd->err =0 ;tasklet_schedule (&dd->done_task);return IRQ_HANDLED ;
@@ -1065,8 +1081,13 @@ static void omap_sham_dma_callback(int lch, u16 ch_status, void *data) {struct omap_sham_dev *dd = data; -if (likely (lch == dd->dma_lch)) -tasklet_schedule (&dd->done_task); +if (ch_status !=OMAP_DMA_BLOCK_IRQ ) { +pr_err ("omap-sham DMA error status: 0x%hx\n" , ch_status); + dd->err = -EIO ; + dd->flags &= ~FLAGS_INIT ;/* request to re-initialize */ + } + +tasklet_schedule (&dd->done_task); }static int omap_sham_dma_init (struct omap_sham_dev *dd)
Signature · 1 line
1.7.0.4
PATCH 7/7 omap-sham: removed redundunt locking
In reply to Dmitry KasatkinLocking for queuing and dequeuing is combined. test_and_set_bit() is also replaced with checking under dd->lock.
--- drivers/crypto/omap-sham.c | 47 +++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 26 deletions(-)
drivers/crypto/omap-sham.c +21 -26
@@ -84,9 +84,7 @@#define FLAGS_CPU 0x0200#define FLAGS_HMAC 0x0400#define FLAGS_ERROR 0x0800 - -/* 3rd byte */ -#define FLAGS_BUSY 16 +#define FLAGS_BUSY 0x1000#define OP_UPDATE 1#define OP_FINAL 2
@@ -629,32 +627,37 @@ static void omap_sham_finish_req(struct ahash_request *req, int err)if ((ctx->flags &FLAGS_FINAL ) || err)omap_sham_cleanup (req); -clear_bit (FLAGS_BUSY , &ctx->dd->flags); + ctx->dd->flags &= ~FLAGS_BUSY ;if (req->base.complete) req->base.complete (&req->base, err); } -static int omap_sham_handle_queue (struct omap_sham_dev *dd) +static int omap_sham_handle_queue (struct omap_sham_dev *dd, +struct ahash_request *req) {struct crypto_async_request *async_req, *backlog;struct omap_sham_reqctx *ctx; -struct ahash_request *req, *prev_req; +struct ahash_request *prev_req;unsigned long flags; -int err =0 ; - -if (test_and_set_bit (FLAGS_BUSY , &dd->flags)) -return 0 ; +int err =0 , ret =0 ;spin_lock_irqsave (&dd->lock, flags); - backlog =crypto_get_backlog (&dd->queue); +if (req) + ret =ahash_enqueue_request (&dd->queue, req); +if (dd->flags &FLAGS_BUSY ) { +spin_unlock_irqrestore (&dd->lock, flags); +return ret; + } async_req =crypto_dequeue_request (&dd->queue); -if (!async_req) -clear_bit (FLAGS_BUSY , &dd->flags); +if (async_req) { + dd->flags |=FLAGS_BUSY ; + backlog =crypto_get_backlog (&dd->queue); + }spin_unlock_irqrestore (&dd->lock, flags);if (!async_req) -return 0 ; +return ret;if (backlog) backlog->complete (backlog, -EINPROGRESS );
@@ -690,7 +693,7 @@ static int omap_sham_handle_queue(struct omap_sham_dev *dd)dev_dbg (dd->dev,"exit, err: %d\n" , err); -return err; +return ret; }static int omap_sham_enqueue (struct ahash_request *req,unsigned int op)
@@ -698,18 +701,10 @@ static int omap_sham_enqueue(struct ahash_request *req, unsigned int op)struct omap_sham_reqctx *ctx =ahash_request_ctx (req);struct omap_sham_ctx *tctx =crypto_tfm_ctx (req->base.tfm);struct omap_sham_dev *dd = tctx->dd; -unsigned long flags; -int err; ctx->op = op; -spin_lock_irqsave (&dd->lock, flags); - err =ahash_enqueue_request (&dd->queue, req); -spin_unlock_irqrestore (&dd->lock, flags); - -omap_sham_handle_queue (dd); - -return err; +return omap_sham_handle_queue (dd, req); }static int omap_sham_update (struct ahash_request *req)
@@ -1041,7 +1036,7 @@ static void omap_sham_done_task(unsigned long data)/* finish curent request */ omap_sham_finish_req (req, err);/* start new request */ -omap_sham_handle_queue (dd); +omap_sham_handle_queue (dd,NULL ); } }
@@ -1049,7 +1044,7 @@ static void omap_sham_queue_task(unsigned long data) {struct omap_sham_dev *dd = (struct omap_sham_dev *)data; -omap_sham_handle_queue (dd); +omap_sham_handle_queue (dd,NULL ); }static irqreturn_t omap_sham_irq (int irq,void *dev_id)
Signature · 1 line
1.7.0.4
Tony Lindgren
maintainerRe: [PATCH 1/7] crypto: updates omap sham device related platform code
In reply to Dmitry KasatkinQuoted 43 lines · Dmitry Kasatkin
- registration with multi OMAP kernels support
- clocksSigned-off-by Dmitry Kasatkin <[email protected]>--- arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/devices.c | 58 +++++++++++++++++++++++----- arch/arm/plat-omap/include/plat/omap34xx.h | 5 ++ 5 files changed, 56 insertions(+), 13 deletions(-)arch/arm/mach-omap2/clock2420_data.c +1
-1@@ -1836,7 +1836,7 @@ static struct omap_clk omap2420_clks[] = {CLK (NULL ,"vlynq_ick" , &vlynq_ick,CK_242X ),CLK (NULL ,"vlynq_fck" , &vlynq_fck,CK_242X ),CLK (NULL ,"des_ick" , &des_ick,CK_242X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_242X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_242X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_242X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_242X ), CLK(NULL, "pka_ick", &pka_ick, CK_242X),arch/arm/mach-omap2/clock2430_data.c +1
-1@@ -1924,7 +1924,7 @@ static struct omap_clk omap2430_clks[] = {CLK (NULL ,"sdma_ick" , &sdma_ick,CK_243X ),CLK (NULL ,"sdrc_ick" , &sdrc_ick,CK_243X ),CLK (NULL ,"des_ick" , &des_ick,CK_243X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_243X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_243X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_243X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_243X ), CLK(NULL, "pka_ick", &pka_ick, CK_243X),arch/arm/mach-omap2/clock3xxx_data.c +0
-0
arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3366
Quoted 8 lines
arch/arm/mach-omap2/clock3xxx_data.c +1
-1@@ -3360,7 +3360,7 @@ static struct omap_clk omap3xxx_clks[] = {CLK ("mmci-omap-hs.2" ,"ick" , &mmchs3_ick,CK_3430ES2 |CK_AM35XX ),CLK (NULL ,"icr_ick" , &icr_ick,CK_343X ),CLK (NULL ,"aes2_ick" , &aes2_ick,CK_343X ), -CLK (NULL ,"sha12_ick" , &sha12_ick,CK_343X ), +CLK ("omap-sham" ,"ick" , &sha12_ick,CK_343X ),CLK (NULL ,"des2_ick" , &des2_ick,CK_343X ),CLK ("mmci-omap-hs.1" ,"ick" , &mmchs2_ick,CK_3XXX ), CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),
This looks OK.
Quoted 78 lines
arch/arm/mach-omap2/devices.c +43
-8@@ -26,6 +26,7 @@#include <plat/mux.h> #include <mach/gpio.h> #include <plat/mmc.h> +#include <plat/dma.h> #include "mux.h" @@ -453,8 +454,10 @@ static void omap_init_mcspi(void)static inline void omap_init_mcspi (void ) {}#endif -#ifdef CONFIG_OMAP_SHA1_MD5 -static struct resource sha1_md5_resources[] = { +#if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE) + +#ifdef CONFIG_ARCH_OMAP24XX +static struct resource omap2_sham_resources[] = { { .start = OMAP24XX_SEC_SHA1MD5_BASE, .end = OMAP24XX_SEC_SHA1MD5_BASE + 0x64,@@ -465,20 +468,55 @@ static struct resource sha1_md5_resources[] = { .flags = IORESOURCE_IRQ, } }; +static int omap2_sham_resources_sz =ARRAY_SIZE (omap2_sham_resources); +#else +#define omap2_sham_resources NULL +#define omap2_sham_resources_sz 0 +#endif -static struct platform_device sha1_md5_device = { - .name ="OMAP SHA1/MD5" , +#ifdef CONFIG_ARCH_OMAP34XX +static struct resource omap3_sham_resources[] = { + { + .start =OMAP34XX_SEC_SHA1MD5_BASE , + .end =OMAP34XX_SEC_SHA1MD5_BASE +0x64 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_34XX_SHA1MD52_IRQ , + .flags =IORESOURCE_IRQ , + }, + { + .start =OMAP34XX_DMA_SHA1MD5_RX , + .flags =IORESOURCE_DMA , + } +}; +static int omap3_sham_resources_sz =ARRAY_SIZE (omap3_sham_resources); +#else +#define omap3_sham_resources NULL +#define omap3_sham_resources_sz 0 +#endif + +static struct platform_device sham_device = { + .name ="omap-sham" , .id =-1 , - .num_resources =ARRAY_SIZE (sha1_md5_resources), - .resource = sha1_md5_resources, }; -static void omap_init_sha1_md5 (void ) +static void omap_init_sham (void ) { -platform_device_register (&sha1_md5_device); +if (cpu_is_omap24xx ()) { + sham_device.resource = omap2_sham_resources; + sham_device.num_resources = omap2_sham_resources_sz; + }else if (cpu_is_omap34xx ()) { + sham_device.resource = omap3_sham_resources; + sham_device.num_resources = omap3_sham_resources_sz; + }else { +pr_err ("%s: platform not supported\n" , __func__);
arch/arm/mach-omap2/devices.c static struct resource sha1_md5_resources[] = { · line 522
Quoted 10 lines
arch/arm/mach-omap2/devices.c +4
-1+ return; + } +platform_device_register (&sham_device); }#else -static inline void omap_init_sha1_md5 (void ) { } +static inline void omap_init_sham (void ) { }#endif /*-------------------------------------------------------------------------*/
Here you might want to look into doing this using hwmod, it would clear out a lot of this init code.
Tony
Tony Lindgren
maintainerRe: [PATCH 3/7] omap-sham: OMAP macros corrected
In reply to Dmitry KasatkinQuoted 19 lines · Dmitry Kasatkin
Signed-off-by Dmitry Kasatkin <[email protected]>--- arch/arm/mach-omap2/devices.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)arch/arm/mach-omap2/devices.c +1
-1@@ -456,7 +456,7 @@ static inline void omap_init_mcspi(void) {} #if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE) -#ifdef CONFIG_ARCH_OMAP24XX +#ifdef CONFIG_ARCH_OMAP2 static struct resource omap2_sham_resources[] = { { .start = OMAP24XX_SEC_SHA1MD5_BASE,
arch/arm/mach-omap2/devices.c static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources); · line 480
Quoted 8 lines
arch/arm/mach-omap2/devices.c +1
-1@@ -474,7 +474,7 @@ static int omap2_sham_resources_sz = ARRAY_SIZE(omap2_sham_resources);#define omap2_sham_resources_sz 0#endif -#ifdef CONFIG_ARCH_OMAP34XX +#ifdef CONFIG_ARCH_OMAP3 static struct resource omap3_sham_resources[] = { { .start = OMAP34XX_SEC_SHA1MD5_BASE,
I think we already fixed these a while back..
Tony
Re: [PATCH 1/7] crypto: updates omap sham device related platform code
In reply to Tony LindgrenHi,
This patch was already applied months ago.
It appeared by mistake as "git format-patch" took it somehow.
Please ignore it...
- Dmitry
Quoted 155 lines · ext Tony Lindgren
Quoted 44 lines · Dmitry Kasatkin
- registration with multi OMAP kernels support
- clocksSigned-off-by Dmitry Kasatkin <[email protected]>--- arch/arm/mach-omap2/clock2420_data.c | 2 +- arch/arm/mach-omap2/clock2430_data.c | 2 +- arch/arm/mach-omap2/clock3xxx_data.c | 2 +- arch/arm/mach-omap2/devices.c | 58 +++++++++++++++++++++++----- arch/arm/plat-omap/include/plat/omap34xx.h | 5 ++ 5 files changed, 56 insertions(+), 13 deletions(-)arch/arm/mach-omap2/clock2420_data.c +1
-1@@ -1836,7 +1836,7 @@ static struct omap_clk omap2420_clks[] = {CLK (NULL ,"vlynq_ick" , &vlynq_ick,CK_242X ),CLK (NULL ,"vlynq_fck" , &vlynq_fck,CK_242X ),CLK (NULL ,"des_ick" , &des_ick,CK_242X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_242X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_242X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_242X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_242X ), CLK(NULL, "pka_ick", &pka_ick, CK_242X),arch/arm/mach-omap2/clock2430_data.c +1
-1@@ -1924,7 +1924,7 @@ static struct omap_clk omap2430_clks[] = {CLK (NULL ,"sdma_ick" , &sdma_ick,CK_243X ),CLK (NULL ,"sdrc_ick" , &sdrc_ick,CK_243X ),CLK (NULL ,"des_ick" , &des_ick,CK_243X ), -CLK (NULL ,"sha_ick" , &sha_ick,CK_243X ), +CLK ("omap-sham" ,"ick" , &sha_ick,CK_243X ),CLK ("omap_rng" ,"ick" , &rng_ick,CK_243X ),CLK (NULL ,"aes_ick" , &aes_ick,CK_243X ), CLK(NULL, "pka_ick", &pka_ick, CK_243X),arch/arm/mach-omap2/clock3xxx_data.c +0
-0arch/arm/mach-omap2/clock3xxx_data.c static struct omap_clk omap3xxx_clks[] = { · line 3366
Quoted 8 lines
arch/arm/mach-omap2/clock3xxx_data.c +1
-1@@ -3360,7 +3360,7 @@ static struct omap_clk omap3xxx_clks[] = {CLK ("mmci-omap-hs.2" ,"ick" , &mmchs3_ick,CK_3430ES2 |CK_AM35XX ),CLK (NULL ,"icr_ick" , &icr_ick,CK_343X ),CLK (NULL ,"aes2_ick" , &aes2_ick,CK_343X ), -CLK (NULL ,"sha12_ick" , &sha12_ick,CK_343X ), +CLK ("omap-sham" ,"ick" , &sha12_ick,CK_343X ),CLK (NULL ,"des2_ick" , &des2_ick,CK_343X ),CLK ("mmci-omap-hs.1" ,"ick" , &mmchs2_ick,CK_3XXX ), CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_3XXX),This looks OK.
Quoted 79 lines
arch/arm/mach-omap2/devices.c +43
-8@@ -26,6 +26,7 @@#include <plat/mux.h> #include <mach/gpio.h> #include <plat/mmc.h> +#include <plat/dma.h> #include "mux.h" @@ -453,8 +454,10 @@ static void omap_init_mcspi(void)static inline void omap_init_mcspi (void ) {}#endif -#ifdef CONFIG_OMAP_SHA1_MD5 -static struct resource sha1_md5_resources[] = { +#if defined(CONFIG_CRYPTO_DEV_OMAP_SHAM) || defined(CONFIG_CRYPTO_DEV_OMAP_SHAM_MODULE) + +#ifdef CONFIG_ARCH_OMAP24XX +static struct resource omap2_sham_resources[] = { { .start = OMAP24XX_SEC_SHA1MD5_BASE, .end = OMAP24XX_SEC_SHA1MD5_BASE + 0x64,@@ -465,20 +468,55 @@ static struct resource sha1_md5_resources[] = { .flags = IORESOURCE_IRQ, } }; +static int omap2_sham_resources_sz =ARRAY_SIZE (omap2_sham_resources); +#else +#define omap2_sham_resources NULL +#define omap2_sham_resources_sz 0 +#endif -static struct platform_device sha1_md5_device = { - .name ="OMAP SHA1/MD5" , +#ifdef CONFIG_ARCH_OMAP34XX +static struct resource omap3_sham_resources[] = { + { + .start =OMAP34XX_SEC_SHA1MD5_BASE , + .end =OMAP34XX_SEC_SHA1MD5_BASE +0x64 , + .flags =IORESOURCE_MEM , + }, + { + .start =INT_34XX_SHA1MD52_IRQ , + .flags =IORESOURCE_IRQ , + }, + { + .start =OMAP34XX_DMA_SHA1MD5_RX , + .flags =IORESOURCE_DMA , + } +}; +static int omap3_sham_resources_sz =ARRAY_SIZE (omap3_sham_resources); +#else +#define omap3_sham_resources NULL +#define omap3_sham_resources_sz 0 +#endif + +static struct platform_device sham_device = { + .name ="omap-sham" , .id =-1 , - .num_resources =ARRAY_SIZE (sha1_md5_resources), - .resource = sha1_md5_resources, }; -static void omap_init_sha1_md5 (void ) +static void omap_init_sham (void ) { -platform_device_register (&sha1_md5_device); +if (cpu_is_omap24xx ()) { + sham_device.resource = omap2_sham_resources; + sham_device.num_resources = omap2_sham_resources_sz; + }else if (cpu_is_omap34xx ()) { + sham_device.resource = omap3_sham_resources; + sham_device.num_resources = omap3_sham_resources_sz; + }else { +pr_err ("%s: platform not supported\n" , __func__);arch/arm/mach-omap2/devices.c static struct resource sha1_md5_resources[] = { · line 522
Quoted 10 lines
arch/arm/mach-omap2/devices.c +4
-1+ return; + } +platform_device_register (&sham_device); }#else -static inline void omap_init_sha1_md5 (void ) { } +static inline void omap_init_sham (void ) { }#endif /*-------------------------------------------------------------------------*/ Here you might want to look into doing this using hwmod, it would clear out a lot of this init code.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-crypto" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html