From 8a83780a187ba1961380814eaf9c503043345d12 Mon Sep 17 00:00:00 2001 From: Ian Wisbon Date: Mon, 14 Feb 2011 16:41:03 -0500 Subject: Digi Release Code from del-5.6/main --- drivers/crypto/Kconfig | 2 +- drivers/crypto/dcp.c | 102 +++++-------------------------------------- drivers/crypto/padlock-aes.c | 4 +- 3 files changed, 15 insertions(+), 93 deletions(-) (limited to 'drivers/crypto') diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 5057cb958230..9c2919a431a8 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -211,7 +211,7 @@ config CRYPTO_DEV_PPC4XX config CRYPTO_DEV_DCP tristate "Support for the DCP engine" - depends on ARCH_MX28 || ARCH_MX23 || ARCH_MX50 + depends on ARCH_MX28 || ARCH_MX23 select CRYPTO_ALGAPI select CRYPTO_BLKCIPHER help diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c index eb7a83d276b7..8b54b127d6d0 100644 --- a/drivers/crypto/dcp.c +++ b/drivers/crypto/dcp.c @@ -36,7 +36,7 @@ #include #include #include -#include + #include #include @@ -60,8 +60,6 @@ struct dcp { int dcp_vmi_irq; int dcp_irq; u32 dcp_regs_base; - ulong clock_state; - bool chan_in_use[DCP_NUM_CHANNELS]; /* Following buffers used in hashing to meet 64-byte len alignment */ char *buf1; @@ -97,10 +95,6 @@ struct dcp { #define DCP_FILL 0x5000 #define DCP_MODE_MASK 0xf000 -/* clock defines */ -#define CLOCK_ON 1 -#define CLOCK_OFF 0 - struct dcp_op { unsigned int flags; @@ -183,45 +177,6 @@ struct dcp_hash_op { /* only one */ static struct dcp *global_sdcp; -static void dcp_clock(struct dcp *sdcp, ulong state, bool force) -{ - u32 chan; - struct clk *clk = clk_get(sdcp->dev, "dcp_clk"); - - /* unless force is true (used during suspend/resume), if any - * channel is running, then clk is already on, and must stay on */ - if (!force) - for (chan = 0; chan < DCP_NUM_CHANNELS; chan++) - if (sdcp->chan_in_use[chan]) - goto exit; - - if (state == CLOCK_OFF) { - /* gate at clock source */ - if (!IS_ERR(clk)) - clk_disable(clk); - /* gate at DCP */ - else - __raw_writel(BM_DCP_CTRL_CLKGATE, - sdcp->dcp_regs_base + HW_DCP_CTRL_SET); - - sdcp->clock_state = CLOCK_OFF; - - } else { - /* ungate at clock source */ - if (!IS_ERR(clk)) - clk_enable(clk); - /* ungate at DCP */ - else - __raw_writel(BM_DCP_CTRL_CLKGATE, - sdcp->dcp_regs_base + HW_DCP_CTRL_CLR); - - sdcp->clock_state = CLOCK_ON; - } - -exit: - return; -} - static void dcp_perform_op(struct dcp_op *op) { struct dcp *sdcp = global_sdcp; @@ -307,8 +262,6 @@ static void dcp_perform_op(struct dcp_op *op) /* submit the work */ mutex_lock(mutex); - dcp_clock(sdcp, CLOCK_ON, false); - sdcp->chan_in_use[chan] = true; __raw_writel(-1, sdcp->dcp_regs_base + HW_DCP_CHnSTAT_CLR(chan)); @@ -337,9 +290,8 @@ static void dcp_perform_op(struct dcp_op *op) __raw_readl(sdcp->dcp_regs_base + HW_DCP_CHnSTAT(chan)) & 0xff); out: - sdcp->chan_in_use[chan] = false; - dcp_clock(sdcp, CLOCK_OFF, false); mutex_unlock(mutex); + dma_unmap_single(sdcp->dev, pkt_phys, sizeof(*pkt), DMA_TO_DEVICE); } @@ -1109,8 +1061,6 @@ static int dcp_sha_init(struct shash_desc *desc) struct mutex *mutex = &sdcp->op_mutex[HASH_CHAN]; mutex_lock(mutex); - dcp_clock(sdcp, CLOCK_ON, false); - sdcp->chan_in_use[HASH_CHAN] = true; op->length = 0; @@ -1240,8 +1190,6 @@ static int dcp_sha_final(struct shash_desc *desc, u8 *out) for (i = 0; i < digest_len; i++) *out++ = *--digest; - sdcp->chan_in_use[HASH_CHAN] = false; - dcp_clock(sdcp, CLOCK_OFF, false); mutex_unlock(mutex); return ret; @@ -1340,8 +1288,6 @@ static int dcp_bootstream_ioctl(struct inode *inode, struct file *file, mutex = &sdcp->op_mutex[chan]; mutex_lock(mutex); - dcp_clock(sdcp, CLOCK_ON, false); - sdcp->chan_in_use[chan] = true; __raw_writel(-1, sdcp->dcp_regs_base + HW_DCP_CHnSTAT_CLR(ROM_DCP_CHAN)); @@ -1402,8 +1348,6 @@ static int dcp_bootstream_ioctl(struct inode *inode, struct file *file, retVal = 0; exit: - sdcp->chan_in_use[chan] = false; - dcp_clock(sdcp, CLOCK_OFF, false); mutex_unlock(mutex); return retVal; } @@ -1446,7 +1390,6 @@ static int dcp_probe(struct platform_device *pdev) for (i = 0; i < DCP_NUM_CHANNELS; i++) { mutex_init(&sdcp->op_mutex[i]); init_completion(&sdcp->op_wait[i]); - sdcp->chan_in_use[i] = false; } platform_set_drvdata(pdev, sdcp); @@ -1457,8 +1400,7 @@ static int dcp_probe(struct platform_device *pdev) ret = -ENXIO; goto err_kfree; } - sdcp->dcp_regs_base = (u32) ioremap(r->start, r->end - r->start + 1); - dcp_clock(sdcp, CLOCK_ON, true); + sdcp->dcp_regs_base = (u32) IO_ADDRESS(r->start); /* Soft reset and remove the clock gate */ __raw_writel(BM_DCP_CTRL_SFTRST, sdcp->dcp_regs_base + HW_DCP_CTRL_SET); @@ -1494,14 +1436,14 @@ static int dcp_probe(struct platform_device *pdev) if (!r) { dev_err(&pdev->dev, "can't get IRQ resource (0)\n"); ret = -EIO; - goto err_gate_clk; + goto err_kfree; } sdcp->dcp_vmi_irq = r->start; ret = request_irq(sdcp->dcp_vmi_irq, dcp_vmi_irq, 0, "dcp", sdcp); if (ret != 0) { dev_err(&pdev->dev, "can't request_irq (0)\n"); - goto err_gate_clk; + goto err_kfree; } r = platform_get_resource(pdev, IORESOURCE_IRQ, 1); @@ -1522,7 +1464,7 @@ static int dcp_probe(struct platform_device *pdev) ret = crypto_register_alg(&dcp_aes_alg); if (ret != 0) { dev_err(&pdev->dev, "Failed to register aes crypto\n"); - goto err_free_irq1; + goto err_kfree; } ret = crypto_register_alg(&dcp_aes_ecb_alg); @@ -1633,7 +1575,6 @@ static int dcp_probe(struct platform_device *pdev) goto err_dereg; } - dcp_clock(sdcp, CLOCK_OFF, false); dev_notice(&pdev->dev, "DCP crypto enabled.!\n"); return 0; @@ -1647,12 +1588,8 @@ err_unregister_aes_ecb: crypto_unregister_alg(&dcp_aes_ecb_alg); err_unregister_aes: crypto_unregister_alg(&dcp_aes_alg); -err_free_irq1: - free_irq(sdcp->dcp_irq, sdcp); err_free_irq0: free_irq(sdcp->dcp_vmi_irq, sdcp); -err_gate_clk: - dcp_clock(sdcp, CLOCK_OFF, false); err_kfree: kfree(sdcp); err: @@ -1667,8 +1604,6 @@ static int dcp_remove(struct platform_device *pdev) sdcp = platform_get_drvdata(pdev); platform_set_drvdata(pdev, NULL); - dcp_clock(sdcp, CLOCK_ON, false); - free_irq(sdcp->dcp_irq, sdcp); free_irq(sdcp->dcp_vmi_irq, sdcp); @@ -1707,41 +1642,28 @@ static int dcp_remove(struct platform_device *pdev) crypto_unregister_alg(&dcp_aes_cbc_alg); crypto_unregister_alg(&dcp_aes_ecb_alg); crypto_unregister_alg(&dcp_aes_alg); - - dcp_clock(sdcp, CLOCK_OFF, true); - iounmap((void *) sdcp->dcp_regs_base); kfree(sdcp); global_sdcp = NULL; return 0; } + +#ifdef CONFIG_PM static int dcp_suspend(struct platform_device *pdev, pm_message_t state) { -#ifdef CONFIG_PM - struct dcp *sdcp = platform_get_drvdata(pdev); - - if (sdcp->clock_state == CLOCK_ON) { - dcp_clock(sdcp, CLOCK_OFF, true); - /* indicate that clock needs to be turned on upon resume */ - sdcp->clock_state = CLOCK_ON; - } -#endif return 0; } static int dcp_resume(struct platform_device *pdev) { -#ifdef CONFIG_PM - struct dcp *sdcp = platform_get_drvdata(pdev); - - /* if clock was on prior to suspend, turn it back on */ - if (sdcp->clock_state == CLOCK_ON) - dcp_clock(sdcp, CLOCK_ON, true); -#endif return 0; } +#else +#define dcp_suspend NULL +#define dcp_resume NULL +#endif static struct platform_driver dcp_driver = { .probe = dcp_probe, diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index a9952b1236b0..84c51e177269 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -236,7 +236,7 @@ static inline void ecb_crypt(const u8 *in, u8 *out, u32 *key, /* Padlock in ECB mode fetches at least ecb_fetch_bytes of data. * We could avoid some copying here but it's probably not worth it. */ - if (unlikely(((unsigned long)in & PAGE_SIZE) + ecb_fetch_bytes > PAGE_SIZE)) { + if (unlikely(((unsigned long)in & ~PAGE_MASK) + ecb_fetch_bytes > PAGE_SIZE)) { ecb_crypt_copy(in, out, key, cword, count); return; } @@ -248,7 +248,7 @@ static inline u8 *cbc_crypt(const u8 *in, u8 *out, u32 *key, u8 *iv, struct cword *cword, int count) { /* Padlock in CBC mode fetches at least cbc_fetch_bytes of data. */ - if (unlikely(((unsigned long)in & PAGE_SIZE) + cbc_fetch_bytes > PAGE_SIZE)) + if (unlikely(((unsigned long)in & ~PAGE_MASK) + cbc_fetch_bytes > PAGE_SIZE)) return cbc_crypt_copy(in, out, key, iv, cword, count); return rep_xcrypt_cbc(in, out, key, iv, cword, count); -- cgit v1.2.3