* [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver
@ 2010-08-20 13:44 Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 1/2] crypto: updates to enable omap aes Dmitry Kasatkin
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Dmitry Kasatkin @ 2010-08-20 13:44 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, linux-omap
This set of patches provides implementation of the driver for
OMAP2/3 AES hw accelerator.
Dmitry Kasatkin (2):
crypto: updates to enable omap aes
crypto: omap-aes: OMAP2/3 AES hw accelerator driver
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 | 71 +++
drivers/crypto/Kconfig | 8 +
drivers/crypto/Makefile | 1 +
drivers/crypto/omap-aes.c | 948 ++++++++++++++++++++++++++++++++++
7 files changed, 1031 insertions(+), 3 deletions(-)
create mode 100644 drivers/crypto/omap-aes.c
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] crypto: updates to enable omap aes
2010-08-20 13:44 [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver Dmitry Kasatkin
@ 2010-08-20 13:44 ` Dmitry Kasatkin
2010-08-31 8:52 ` Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver Dmitry Kasatkin
2010-09-03 11:15 ` [PATCH 0/2] omap-aes: OMAP2/3 AES HW " Herbert Xu
2 siblings, 1 reply; 7+ messages in thread
From: Dmitry Kasatkin @ 2010-08-20 13:44 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, linux-omap
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
---
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 | 71 ++++++++++++++++++++++++++++++++++
4 files changed, 74 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
index 37d65d6..5f2066a 100644
--- a/arch/arm/mach-omap2/clock2420_data.c
+++ b/arch/arm/mach-omap2/clock2420_data.c
@@ -1838,7 +1838,7 @@ static struct omap_clk omap2420_clks[] = {
CLK(NULL, "des_ick", &des_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("omap-aes", "ick", &aes_ick, CK_242X),
CLK(NULL, "pka_ick", &pka_ick, CK_242X),
CLK(NULL, "usb_fck", &usb_fck, CK_242X),
CLK("musb_hdrc", "fck", &osc_ck, CK_242X),
diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index b33118f..701a171 100644
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1926,7 +1926,7 @@ static struct omap_clk omap2430_clks[] = {
CLK(NULL, "des_ick", &des_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("omap-aes", "ick", &aes_ick, CK_243X),
CLK(NULL, "pka_ick", &pka_ick, CK_243X),
CLK(NULL, "usb_fck", &usb_fck, CK_243X),
CLK("musb_hdrc", "ick", &usbhs_ick, CK_243X),
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index dfdce2d..c73906d 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3288,7 +3288,7 @@ static struct omap_clk omap3xxx_clks[] = {
CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
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("omap-aes", "ick", &aes2_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),
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2dbb265..b27e7cb 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -498,6 +498,76 @@ static void omap_init_sham(void)
static inline void omap_init_sham(void) { }
#endif
+#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)
+
+#ifdef CONFIG_ARCH_OMAP24XX
+static struct resource omap2_aes_resources[] = {
+ {
+ .start = OMAP24XX_SEC_AES_BASE,
+ .end = OMAP24XX_SEC_AES_BASE + 0x4C,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = OMAP24XX_DMA_AES_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .start = OMAP24XX_DMA_AES_RX,
+ .flags = IORESOURCE_DMA,
+ }
+};
+static int omap2_aes_resources_sz = ARRAY_SIZE(omap2_aes_resources);
+#else
+#define omap2_aes_resources NULL
+#define omap2_aes_resources_sz 0
+#endif
+
+#ifdef CONFIG_ARCH_OMAP34XX
+static struct resource omap3_aes_resources[] = {
+ {
+ .start = OMAP34XX_SEC_AES_BASE,
+ .end = OMAP34XX_SEC_AES_BASE + 0x4C,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = OMAP34XX_DMA_AES2_TX,
+ .flags = IORESOURCE_DMA,
+ },
+ {
+ .start = OMAP34XX_DMA_AES2_RX,
+ .flags = IORESOURCE_DMA,
+ }
+};
+static int omap3_aes_resources_sz = ARRAY_SIZE(omap3_aes_resources);
+#else
+#define omap3_aes_resources NULL
+#define omap3_aes_resources_sz 0
+#endif
+
+static struct platform_device aes_device = {
+ .name = "omap-aes",
+ .id = -1,
+};
+
+static void omap_init_aes(void)
+{
+ if (cpu_is_omap24xx()) {
+ aes_device.resource = omap2_aes_resources;
+ aes_device.num_resources = omap2_aes_resources_sz;
+ } else if (cpu_is_omap34xx()) {
+ aes_device.resource = omap3_aes_resources;
+ aes_device.num_resources = omap3_aes_resources_sz;
+ } else {
+ pr_err("%s: platform not supported\n", __func__);
+ return;
+ }
+ platform_device_register(&aes_device);
+}
+
+#else
+static inline void omap_init_aes(void) { }
+#endif
+
/*-------------------------------------------------------------------------*/
#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
@@ -854,6 +924,7 @@ static int __init omap2_init_devices(void)
omap_hdq_init();
omap_init_sti();
omap_init_sham();
+ omap_init_aes();
omap_init_vout();
return 0;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver
2010-08-20 13:44 [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 1/2] crypto: updates to enable omap aes Dmitry Kasatkin
@ 2010-08-20 13:44 ` Dmitry Kasatkin
2010-08-31 9:22 ` Dmitry Kasatkin
2010-09-03 11:15 ` [PATCH 0/2] omap-aes: OMAP2/3 AES HW " Herbert Xu
2 siblings, 1 reply; 7+ messages in thread
From: Dmitry Kasatkin @ 2010-08-20 13:44 UTC (permalink / raw)
To: herbert; +Cc: linux-crypto, linux-omap
Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
---
drivers/crypto/Kconfig | 8 +
drivers/crypto/Makefile | 1 +
drivers/crypto/omap-aes.c | 948 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 957 insertions(+), 0 deletions(-)
create mode 100644 drivers/crypto/omap-aes.c
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index ea0b386..742089b 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -243,4 +243,12 @@ config CRYPTO_DEV_OMAP_SHAM
OMAP processors have SHA1/MD5 hw accelerator. Select this if you
want to use the OMAP module for SHA1/MD5 algorithms.
+config CRYPTO_DEV_OMAP_AES
+ tristate "Support for OMAP AES hw engine"
+ depends on ARCH_OMAP2 || ARCH_OMAP3
+ select CRYPTO_AES
+ help
+ OMAP processors have AES module accelerator. Select this if you
+ want to use the OMAP module for AES algorithms.
+
endif # CRYPTO_HW
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 6dbbe00..64289c6 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -9,4 +9,5 @@ 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
+obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
new file mode 100644
index 0000000..799ca51
--- /dev/null
+++ b/drivers/crypto/omap-aes.c
@@ -0,0 +1,948 @@
+/*
+ * Cryptographic API.
+ *
+ * Support for OMAP AES HW acceleration.
+ *
+ * Copyright (c) 2010 Nokia Corporation
+ * Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+
+#define pr_fmt(fmt) "%s: " fmt, __func__
+
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <linux/scatterlist.h>
+#include <linux/dma-mapping.h>
+#include <linux/io.h>
+#include <linux/crypto.h>
+#include <linux/interrupt.h>
+#include <crypto/scatterwalk.h>
+#include <crypto/aes.h>
+
+#include <plat/cpu.h>
+#include <plat/dma.h>
+
+/* OMAP TRM gives bitfields as start:end, where start is the higher bit
+ number. For example 7:0 */
+#define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))
+#define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
+
+#define AES_REG_KEY(x) (0x1C - ((x ^ 0x01) * 0x04))
+#define AES_REG_IV(x) (0x20 + ((x) * 0x04))
+
+#define AES_REG_CTRL 0x30
+#define AES_REG_CTRL_CTR_WIDTH (1 << 7)
+#define AES_REG_CTRL_CTR (1 << 6)
+#define AES_REG_CTRL_CBC (1 << 5)
+#define AES_REG_CTRL_KEY_SIZE (3 << 3)
+#define AES_REG_CTRL_DIRECTION (1 << 2)
+#define AES_REG_CTRL_INPUT_READY (1 << 1)
+#define AES_REG_CTRL_OUTPUT_READY (1 << 0)
+
+#define AES_REG_DATA 0x34
+#define AES_REG_DATA_N(x) (0x34 + ((x) * 0x04))
+
+#define AES_REG_REV 0x44
+#define AES_REG_REV_MAJOR 0xF0
+#define AES_REG_REV_MINOR 0x0F
+
+#define AES_REG_MASK 0x48
+#define AES_REG_MASK_SIDLE (1 << 6)
+#define AES_REG_MASK_START (1 << 5)
+#define AES_REG_MASK_DMA_OUT_EN (1 << 3)
+#define AES_REG_MASK_DMA_IN_EN (1 << 2)
+#define AES_REG_MASK_SOFTRESET (1 << 1)
+#define AES_REG_AUTOIDLE (1 << 0)
+
+#define AES_REG_SYSSTATUS 0x4C
+#define AES_REG_SYSSTATUS_RESETDONE (1 << 0)
+
+#define DEFAULT_TIMEOUT (5*HZ)
+
+#define FLAGS_MODE_MASK 0x000f
+#define FLAGS_ENCRYPT BIT(0)
+#define FLAGS_CBC BIT(1)
+#define FLAGS_GIV BIT(2)
+
+#define FLAGS_NEW_KEY BIT(4)
+#define FLAGS_NEW_IV BIT(5)
+#define FLAGS_INIT BIT(6)
+#define FLAGS_FAST BIT(7)
+#define FLAGS_BUSY 8
+
+struct omap_aes_ctx {
+ struct omap_aes_dev *dd;
+
+ int keylen;
+ u32 key[AES_KEYSIZE_256 / sizeof(u32)];
+ unsigned long flags;
+};
+
+struct omap_aes_reqctx {
+ unsigned long mode;
+};
+
+#define OMAP_AES_QUEUE_LENGTH 1
+#define OMAP_AES_CACHE_SIZE 0
+
+struct omap_aes_dev {
+ struct list_head list;
+ unsigned long phys_base;
+ void __iomem *io_base;
+ struct clk *iclk;
+ struct omap_aes_ctx *ctx;
+ struct device *dev;
+ unsigned long flags;
+
+ u32 *iv;
+ u32 ctrl;
+
+ spinlock_t lock;
+ struct crypto_queue queue;
+
+ struct tasklet_struct task;
+
+ struct ablkcipher_request *req;
+ size_t total;
+ struct scatterlist *in_sg;
+ size_t in_offset;
+ struct scatterlist *out_sg;
+ size_t out_offset;
+
+ size_t buflen;
+ void *buf_in;
+ size_t dma_size;
+ int dma_in;
+ int dma_lch_in;
+ dma_addr_t dma_addr_in;
+ void *buf_out;
+ int dma_out;
+ int dma_lch_out;
+ dma_addr_t dma_addr_out;
+};
+
+/* keep registered devices data here */
+static LIST_HEAD(dev_list);
+static DEFINE_SPINLOCK(list_lock);
+
+static inline u32 omap_aes_read(struct omap_aes_dev *dd, u32 offset)
+{
+ return __raw_readl(dd->io_base + offset);
+}
+
+static inline void omap_aes_write(struct omap_aes_dev *dd, u32 offset,
+ u32 value)
+{
+ __raw_writel(value, dd->io_base + offset);
+}
+
+static inline void omap_aes_write_mask(struct omap_aes_dev *dd, u32 offset,
+ u32 value, u32 mask)
+{
+ u32 val;
+
+ val = omap_aes_read(dd, offset);
+ val &= ~mask;
+ val |= value;
+ omap_aes_write(dd, offset, val);
+}
+
+static void omap_aes_write_n(struct omap_aes_dev *dd, u32 offset,
+ u32 *value, int count)
+{
+ for (; count--; value++, offset += 4)
+ omap_aes_write(dd, offset, *value);
+}
+
+static int omap_aes_wait(struct omap_aes_dev *dd, u32 offset, u32 bit)
+{
+ unsigned long timeout = jiffies + DEFAULT_TIMEOUT;
+
+ while (!(omap_aes_read(dd, offset) & bit)) {
+ if (time_is_before_jiffies(timeout)) {
+ dev_err(dd->dev, "omap-aes timeout\n");
+ return -ETIMEDOUT;
+ }
+ }
+ return 0;
+}
+
+static int omap_aes_hw_init(struct omap_aes_dev *dd)
+{
+ int err = 0;
+
+ clk_enable(dd->iclk);
+ if (!(dd->flags & FLAGS_INIT)) {
+ /* is it necessary to reset before every operation? */
+ omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_SOFTRESET,
+ AES_REG_MASK_SOFTRESET);
+ /*
+ * prevent OCP bus error (SRESP) in case an access to the module
+ * is performed while the module is coming out of soft reset
+ */
+ __asm__ __volatile__("nop");
+ __asm__ __volatile__("nop");
+
+ err = omap_aes_wait(dd, AES_REG_SYSSTATUS,
+ AES_REG_SYSSTATUS_RESETDONE);
+ if (!err)
+ dd->flags |= FLAGS_INIT;
+ }
+
+ return err;
+}
+
+static void omap_aes_hw_cleanup(struct omap_aes_dev *dd)
+{
+ clk_disable(dd->iclk);
+}
+
+static void omap_aes_write_ctrl(struct omap_aes_dev *dd)
+{
+ unsigned int key32;
+ int i;
+ u32 val, mask;
+
+ val = FLD_VAL(((dd->ctx->keylen >> 3) - 1), 4, 3);
+ if (dd->flags & FLAGS_CBC)
+ val |= AES_REG_CTRL_CBC;
+ if (dd->flags & FLAGS_ENCRYPT)
+ val |= AES_REG_CTRL_DIRECTION;
+
+ if (dd->ctrl == val && !(dd->flags & FLAGS_NEW_IV) &&
+ !(dd->ctx->flags & FLAGS_NEW_KEY))
+ goto out;
+
+ /* only need to write control registers for new settings */
+
+ dd->ctrl = val;
+
+ val = 0;
+ if (dd->dma_lch_out >= 0)
+ val |= AES_REG_MASK_DMA_OUT_EN;
+ if (dd->dma_lch_in >= 0)
+ val |= AES_REG_MASK_DMA_IN_EN;
+
+ mask = AES_REG_MASK_DMA_IN_EN | AES_REG_MASK_DMA_OUT_EN;
+
+ omap_aes_write_mask(dd, AES_REG_MASK, val, mask);
+
+ pr_debug("Set key\n");
+ key32 = dd->ctx->keylen / sizeof(u32);
+ /* set a key */
+ for (i = 0; i < key32; i++) {
+ omap_aes_write(dd, AES_REG_KEY(i),
+ __le32_to_cpu(dd->ctx->key[i]));
+ }
+ dd->ctx->flags &= ~FLAGS_NEW_KEY;
+
+ if (dd->flags & FLAGS_NEW_IV) {
+ pr_debug("Set IV\n");
+ omap_aes_write_n(dd, AES_REG_IV(0), dd->iv, 4);
+ dd->flags &= ~FLAGS_NEW_IV;
+ }
+
+ mask = AES_REG_CTRL_CBC | AES_REG_CTRL_DIRECTION |
+ AES_REG_CTRL_KEY_SIZE;
+
+ omap_aes_write_mask(dd, AES_REG_CTRL, dd->ctrl, mask);
+
+out:
+ /* start DMA or disable idle mode */
+ omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_START,
+ AES_REG_MASK_START);
+}
+
+static struct omap_aes_dev *omap_aes_find_dev(struct omap_aes_ctx *ctx)
+{
+ struct omap_aes_dev *dd = NULL, *tmp;
+
+ spin_lock_bh(&list_lock);
+ if (!ctx->dd) {
+ list_for_each_entry(tmp, &dev_list, list) {
+ /* FIXME: take fist available aes core */
+ dd = tmp;
+ break;
+ }
+ ctx->dd = dd;
+ } else {
+ /* already found before */
+ dd = ctx->dd;
+ }
+ spin_unlock_bh(&list_lock);
+
+ return dd;
+}
+
+static void omap_aes_dma_callback(int lch, u16 ch_status, void *data)
+{
+ struct omap_aes_dev *dd = data;
+
+ if (lch == dd->dma_lch_out)
+ tasklet_schedule(&dd->task);
+}
+
+static int omap_aes_dma_init(struct omap_aes_dev *dd)
+{
+ int err = -ENOMEM;
+
+ dd->dma_lch_out = -1;
+ dd->dma_lch_in = -1;
+
+ dd->buf_in = (void *)__get_free_pages(GFP_KERNEL, OMAP_AES_CACHE_SIZE);
+ dd->buf_out = (void *)__get_free_pages(GFP_KERNEL, OMAP_AES_CACHE_SIZE);
+ dd->buflen = PAGE_SIZE << OMAP_AES_CACHE_SIZE;
+ dd->buflen &= ~(AES_BLOCK_SIZE - 1);
+
+ if (!dd->buf_in || !dd->buf_out) {
+ dev_err(dd->dev, "unable to alloc pages.\n");
+ goto err_alloc;
+ }
+
+ /* MAP here */
+ dd->dma_addr_in = dma_map_single(dd->dev, dd->buf_in, dd->buflen,
+ DMA_TO_DEVICE);
+ if (dma_mapping_error(dd->dev, dd->dma_addr_in)) {
+ dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
+ err = -EINVAL;
+ goto err_map_in;
+ }
+
+ dd->dma_addr_out = dma_map_single(dd->dev, dd->buf_out, dd->buflen,
+ DMA_FROM_DEVICE);
+ if (dma_mapping_error(dd->dev, dd->dma_addr_out)) {
+ dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
+ err = -EINVAL;
+ goto err_map_out;
+ }
+
+ err = omap_request_dma(dd->dma_in, "omap-aes-rx",
+ omap_aes_dma_callback, dd, &dd->dma_lch_in);
+ if (err) {
+ dev_err(dd->dev, "Unable to request DMA channel\n");
+ goto err_dma_in;
+ }
+ err = omap_request_dma(dd->dma_out, "omap-aes-tx",
+ omap_aes_dma_callback, dd, &dd->dma_lch_out);
+ if (err) {
+ dev_err(dd->dev, "Unable to request DMA channel\n");
+ goto err_dma_out;
+ }
+
+ omap_set_dma_dest_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_CONSTANT,
+ dd->phys_base + AES_REG_DATA, 0, 4);
+
+ omap_set_dma_dest_burst_mode(dd->dma_lch_in, OMAP_DMA_DATA_BURST_4);
+ omap_set_dma_src_burst_mode(dd->dma_lch_in, OMAP_DMA_DATA_BURST_4);
+
+ omap_set_dma_src_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_CONSTANT,
+ dd->phys_base + AES_REG_DATA, 0, 4);
+
+ omap_set_dma_src_burst_mode(dd->dma_lch_out, OMAP_DMA_DATA_BURST_4);
+ omap_set_dma_dest_burst_mode(dd->dma_lch_out, OMAP_DMA_DATA_BURST_4);
+
+ return 0;
+
+err_dma_out:
+ omap_free_dma(dd->dma_lch_in);
+err_dma_in:
+ dma_unmap_single(dd->dev, dd->dma_addr_out, dd->buflen,
+ DMA_FROM_DEVICE);
+err_map_out:
+ dma_unmap_single(dd->dev, dd->dma_addr_in, dd->buflen, DMA_TO_DEVICE);
+err_map_in:
+ free_pages((unsigned long)dd->buf_out, OMAP_AES_CACHE_SIZE);
+ free_pages((unsigned long)dd->buf_in, OMAP_AES_CACHE_SIZE);
+err_alloc:
+ if (err)
+ pr_err("error: %d\n", err);
+ return err;
+}
+
+static void omap_aes_dma_cleanup(struct omap_aes_dev *dd)
+{
+ omap_free_dma(dd->dma_lch_out);
+ omap_free_dma(dd->dma_lch_in);
+ dma_unmap_single(dd->dev, dd->dma_addr_out, dd->buflen,
+ DMA_FROM_DEVICE);
+ dma_unmap_single(dd->dev, dd->dma_addr_in, dd->buflen, DMA_TO_DEVICE);
+ free_pages((unsigned long)dd->buf_out, OMAP_AES_CACHE_SIZE);
+ free_pages((unsigned long)dd->buf_in, OMAP_AES_CACHE_SIZE);
+}
+
+static void sg_copy_buf(void *buf, struct scatterlist *sg,
+ unsigned int start, unsigned int nbytes, int out)
+{
+ struct scatter_walk walk;
+
+ if (!nbytes)
+ return;
+
+ scatterwalk_start(&walk, sg);
+ scatterwalk_advance(&walk, start);
+ scatterwalk_copychunks(buf, &walk, nbytes, out);
+ scatterwalk_done(&walk, out, 0);
+}
+
+static int sg_copy(struct scatterlist **sg, size_t *offset, void *buf,
+ size_t buflen, size_t total, int out)
+{
+ unsigned int count, off = 0;
+
+ while (buflen && total) {
+ count = min((*sg)->length - *offset, total);
+ count = min(count, buflen);
+
+ if (!count)
+ return off;
+
+ sg_copy_buf(buf + off, *sg, *offset, count, out);
+
+ off += count;
+ buflen -= count;
+ *offset += count;
+ total -= count;
+
+ if (*offset == (*sg)->length) {
+ *sg = sg_next(*sg);
+ if (*sg)
+ *offset = 0;
+ else
+ total = 0;
+ }
+ }
+
+ return off;
+}
+
+static int omap_aes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in,
+ dma_addr_t dma_addr_out, int length)
+{
+ struct omap_aes_ctx *ctx = crypto_tfm_ctx(tfm);
+ struct omap_aes_dev *dd = ctx->dd;
+ int len32;
+
+ pr_debug("len: %d\n", length);
+
+ dd->dma_size = length;
+
+ if (!(dd->flags & FLAGS_FAST))
+ dma_sync_single_for_device(dd->dev, dma_addr_in, length,
+ DMA_TO_DEVICE);
+
+ len32 = DIV_ROUND_UP(length, sizeof(u32));
+
+ /* IN */
+ omap_set_dma_transfer_params(dd->dma_lch_in, OMAP_DMA_DATA_TYPE_S32,
+ len32, 1, OMAP_DMA_SYNC_PACKET, dd->dma_in,
+ OMAP_DMA_DST_SYNC);
+
+ omap_set_dma_src_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_POST_INC,
+ dma_addr_in, 0, 0);
+
+ /* OUT */
+ omap_set_dma_transfer_params(dd->dma_lch_out, OMAP_DMA_DATA_TYPE_S32,
+ len32, 1, OMAP_DMA_SYNC_PACKET,
+ dd->dma_out, OMAP_DMA_SRC_SYNC);
+
+ omap_set_dma_dest_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_POST_INC,
+ dma_addr_out, 0, 0);
+
+ omap_start_dma(dd->dma_lch_in);
+ omap_start_dma(dd->dma_lch_out);
+
+ omap_aes_write_ctrl(dd);
+
+ return 0;
+}
+
+static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
+{
+ struct crypto_tfm *tfm = crypto_ablkcipher_tfm(
+ crypto_ablkcipher_reqtfm(dd->req));
+ int err, fast = 0, in, out;
+ size_t count;
+ dma_addr_t addr_in, addr_out;
+
+ pr_debug("total: %d\n", dd->total);
+
+ if (sg_is_last(dd->in_sg) && sg_is_last(dd->out_sg)) {
+ /* check for alignment */
+ in = IS_ALIGNED((u32)dd->in_sg->offset, sizeof(u32));
+ out = IS_ALIGNED((u32)dd->out_sg->offset, sizeof(u32));
+
+ fast = in && out;
+ }
+
+ if (fast) {
+ count = min(dd->total, sg_dma_len(dd->in_sg));
+ count = min(count, sg_dma_len(dd->out_sg));
+
+ if (count != dd->total)
+ return -EINVAL;
+
+ pr_debug("fast\n");
+
+ err = dma_map_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
+ if (!err) {
+ dev_err(dd->dev, "dma_map_sg() error\n");
+ return -EINVAL;
+ }
+
+ err = dma_map_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
+ if (!err) {
+ dev_err(dd->dev, "dma_map_sg() error\n");
+ dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
+ return -EINVAL;
+ }
+
+ addr_in = sg_dma_address(dd->in_sg);
+ addr_out = sg_dma_address(dd->out_sg);
+
+ dd->flags |= FLAGS_FAST;
+
+ } else {
+ /* use cache buffers */
+ count = sg_copy(&dd->in_sg, &dd->in_offset, dd->buf_in,
+ dd->buflen, dd->total, 0);
+
+ addr_in = dd->dma_addr_in;
+ addr_out = dd->dma_addr_out;
+
+ dd->flags &= ~FLAGS_FAST;
+
+ }
+
+ dd->total -= count;
+
+ err = omap_aes_hw_init(dd);
+
+ err = omap_aes_crypt_dma(tfm, addr_in, addr_out, count);
+
+ return err;
+}
+
+static void omap_aes_finish_req(struct omap_aes_dev *dd, int err)
+{
+ struct omap_aes_ctx *ctx;
+
+ pr_debug("err: %d\n", err);
+
+ ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(dd->req));
+
+ if (!dd->total)
+ dd->req->base.complete(&dd->req->base, err);
+}
+
+static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd)
+{
+ int err = 0;
+ size_t count;
+
+ pr_debug("total: %d\n", dd->total);
+
+ omap_aes_write_mask(dd, AES_REG_MASK, 0, AES_REG_MASK_START);
+
+ omap_aes_hw_cleanup(dd);
+
+ omap_stop_dma(dd->dma_lch_in);
+ omap_stop_dma(dd->dma_lch_out);
+
+ if (dd->flags & FLAGS_FAST) {
+ dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
+ dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
+ } else {
+ dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
+ dd->dma_size, DMA_FROM_DEVICE);
+
+ /* copy data */
+ count = sg_copy(&dd->out_sg, &dd->out_offset, dd->buf_out,
+ dd->buflen, dd->dma_size, 1);
+ if (count != dd->dma_size) {
+ err = -EINVAL;
+ pr_err("not all data converted: %u\n", count);
+ }
+ }
+
+ if (err || !dd->total)
+ omap_aes_finish_req(dd, err);
+
+ return err;
+}
+
+static int omap_aes_handle_req(struct omap_aes_dev *dd)
+{
+ struct crypto_async_request *async_req, *backlog;
+ struct omap_aes_ctx *ctx;
+ struct omap_aes_reqctx *rctx;
+ struct ablkcipher_request *req;
+ unsigned long flags;
+
+ if (dd->total)
+ goto start;
+
+ spin_lock_irqsave(&dd->lock, flags);
+ backlog = crypto_get_backlog(&dd->queue);
+ async_req = crypto_dequeue_request(&dd->queue);
+ if (!async_req)
+ clear_bit(FLAGS_BUSY, &dd->flags);
+ spin_unlock_irqrestore(&dd->lock, flags);
+
+ if (!async_req)
+ return 0;
+
+ if (backlog)
+ backlog->complete(backlog, -EINPROGRESS);
+
+ req = ablkcipher_request_cast(async_req);
+
+ pr_debug("get new req\n");
+
+ /* assign new request to device */
+ dd->req = req;
+ dd->total = req->nbytes;
+ dd->in_offset = 0;
+ dd->in_sg = req->src;
+ dd->out_offset = 0;
+ dd->out_sg = req->dst;
+
+ rctx = ablkcipher_request_ctx(req);
+ ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));
+ rctx->mode &= FLAGS_MODE_MASK;
+ dd->flags = (dd->flags & ~FLAGS_MODE_MASK) | rctx->mode;
+
+ dd->iv = req->info;
+ if ((dd->flags & FLAGS_CBC) && dd->iv)
+ dd->flags |= FLAGS_NEW_IV;
+ else
+ dd->flags &= ~FLAGS_NEW_IV;
+
+ ctx->dd = dd;
+ if (dd->ctx != ctx) {
+ /* assign new context to device */
+ dd->ctx = ctx;
+ ctx->flags |= FLAGS_NEW_KEY;
+ }
+
+ if (!IS_ALIGNED(req->nbytes, AES_BLOCK_SIZE))
+ pr_err("request size is not exact amount of AES blocks\n");
+
+start:
+ return omap_aes_crypt_dma_start(dd);
+}
+
+static void omap_aes_task(unsigned long data)
+{
+ struct omap_aes_dev *dd = (struct omap_aes_dev *)data;
+ int err;
+
+ pr_debug("enter\n");
+
+ err = omap_aes_crypt_dma_stop(dd);
+
+ err = omap_aes_handle_req(dd);
+
+ pr_debug("exit\n");
+}
+
+static int omap_aes_crypt(struct ablkcipher_request *req, unsigned long mode)
+{
+ struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(
+ crypto_ablkcipher_reqtfm(req));
+ struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);
+ struct omap_aes_dev *dd;
+ unsigned long flags;
+ int err;
+
+ pr_debug("nbytes: %d, enc: %d, cbc: %d\n", req->nbytes,
+ !!(mode & FLAGS_ENCRYPT),
+ !!(mode & FLAGS_CBC));
+
+ dd = omap_aes_find_dev(ctx);
+ if (!dd)
+ return -ENODEV;
+
+ rctx->mode = mode;
+
+ spin_lock_irqsave(&dd->lock, flags);
+ err = ablkcipher_enqueue_request(&dd->queue, req);
+ spin_unlock_irqrestore(&dd->lock, flags);
+
+ if (!test_and_set_bit(FLAGS_BUSY, &dd->flags))
+ omap_aes_handle_req(dd);
+
+ pr_debug("exit\n");
+
+ return err;
+}
+
+/* ********************** ALG API ************************************ */
+
+static int omap_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
+ unsigned int keylen)
+{
+ struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(tfm);
+
+ if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 &&
+ keylen != AES_KEYSIZE_256)
+ return -EINVAL;
+
+ pr_debug("enter, keylen: %d\n", keylen);
+
+ memcpy(ctx->key, key, keylen);
+ ctx->keylen = keylen;
+ ctx->flags |= FLAGS_NEW_KEY;
+
+ return 0;
+}
+
+static int omap_aes_ecb_encrypt(struct ablkcipher_request *req)
+{
+ return omap_aes_crypt(req, FLAGS_ENCRYPT);
+}
+
+static int omap_aes_ecb_decrypt(struct ablkcipher_request *req)
+{
+ return omap_aes_crypt(req, 0);
+}
+
+static int omap_aes_cbc_encrypt(struct ablkcipher_request *req)
+{
+ return omap_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_CBC);
+}
+
+static int omap_aes_cbc_decrypt(struct ablkcipher_request *req)
+{
+ return omap_aes_crypt(req, FLAGS_CBC);
+}
+
+static int omap_aes_cra_init(struct crypto_tfm *tfm)
+{
+ pr_debug("enter\n");
+
+ tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);
+
+ return 0;
+}
+
+static void omap_aes_cra_exit(struct crypto_tfm *tfm)
+{
+ pr_debug("enter\n");
+}
+
+/* ********************** ALGS ************************************ */
+
+static struct crypto_alg algs[] = {
+{
+ .cra_name = "ecb(aes)",
+ .cra_driver_name = "ecb-aes-omap",
+ .cra_priority = 100,
+ .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+ .cra_blocksize = AES_BLOCK_SIZE,
+ .cra_ctxsize = sizeof(struct omap_aes_ctx),
+ .cra_alignmask = 0,
+ .cra_type = &crypto_ablkcipher_type,
+ .cra_module = THIS_MODULE,
+ .cra_init = omap_aes_cra_init,
+ .cra_exit = omap_aes_cra_exit,
+ .cra_u.ablkcipher = {
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .setkey = omap_aes_setkey,
+ .encrypt = omap_aes_ecb_encrypt,
+ .decrypt = omap_aes_ecb_decrypt,
+ }
+},
+{
+ .cra_name = "cbc(aes)",
+ .cra_driver_name = "cbc-aes-omap",
+ .cra_priority = 100,
+ .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
+ .cra_blocksize = AES_BLOCK_SIZE,
+ .cra_ctxsize = sizeof(struct omap_aes_ctx),
+ .cra_alignmask = 0,
+ .cra_type = &crypto_ablkcipher_type,
+ .cra_module = THIS_MODULE,
+ .cra_init = omap_aes_cra_init,
+ .cra_exit = omap_aes_cra_exit,
+ .cra_u.ablkcipher = {
+ .min_keysize = AES_MIN_KEY_SIZE,
+ .max_keysize = AES_MAX_KEY_SIZE,
+ .ivsize = AES_BLOCK_SIZE,
+ .setkey = omap_aes_setkey,
+ .encrypt = omap_aes_cbc_encrypt,
+ .decrypt = omap_aes_cbc_decrypt,
+ }
+}
+};
+
+static int omap_aes_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct omap_aes_dev *dd;
+ struct resource *res;
+ int err = -ENOMEM, i, j;
+ u32 reg;
+
+ dd = kzalloc(sizeof(struct omap_aes_dev), GFP_KERNEL);
+ if (dd == NULL) {
+ dev_err(dev, "unable to alloc data struct.\n");
+ goto err_data;
+ }
+ dd->dev = dev;
+ platform_set_drvdata(pdev, dd);
+
+ spin_lock_init(&dd->lock);
+ crypto_init_queue(&dd->queue, OMAP_AES_QUEUE_LENGTH);
+
+ /* Get the base address */
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(dev, "invalid resource type\n");
+ err = -ENODEV;
+ goto err_res;
+ }
+ dd->phys_base = res->start;
+
+ /* Get the DMA */
+ res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+ if (!res)
+ dev_info(dev, "no DMA info\n");
+ else
+ dd->dma_out = res->start;
+
+ /* Get the DMA */
+ res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+ if (!res)
+ dev_info(dev, "no DMA info\n");
+ else
+ dd->dma_in = res->start;
+
+ /* Initializing the clock */
+ dd->iclk = clk_get(dev, "ick");
+ if (!dd->iclk) {
+ dev_err(dev, "clock intialization failed.\n");
+ err = -ENODEV;
+ goto err_res;
+ }
+
+ dd->io_base = ioremap(dd->phys_base, SZ_4K);
+ if (!dd->io_base) {
+ dev_err(dev, "can't ioremap\n");
+ err = -ENOMEM;
+ goto err_io;
+ }
+
+ clk_enable(dd->iclk);
+ reg = omap_aes_read(dd, AES_REG_REV);
+ dev_info(dev, "OMAP AES hw accel rev: %u.%u\n",
+ (reg & AES_REG_REV_MAJOR) >> 4, reg & AES_REG_REV_MINOR);
+ clk_disable(dd->iclk);
+
+ tasklet_init(&dd->task, omap_aes_task, (unsigned long)dd);
+
+ err = omap_aes_dma_init(dd);
+ if (err)
+ goto err_dma;
+
+ INIT_LIST_HEAD(&dd->list);
+ spin_lock(&list_lock);
+ list_add_tail(&dd->list, &dev_list);
+ spin_unlock(&list_lock);
+
+ for (i = 0; i < ARRAY_SIZE(algs); i++) {
+ pr_debug("i: %d\n", i);
+ INIT_LIST_HEAD(&algs[i].cra_list);
+ err = crypto_register_alg(&algs[i]);
+ if (err)
+ goto err_algs;
+ }
+
+ pr_info("probe() done\n");
+
+ return 0;
+err_algs:
+ for (j = 0; j < i; j++)
+ crypto_unregister_alg(&algs[j]);
+ omap_aes_dma_cleanup(dd);
+err_dma:
+ tasklet_kill(&dd->task);
+ iounmap(dd->io_base);
+err_io:
+ clk_put(dd->iclk);
+err_res:
+ kfree(dd);
+ dd = NULL;
+err_data:
+ dev_err(dev, "initialization failed.\n");
+ return err;
+}
+
+static int omap_aes_remove(struct platform_device *pdev)
+{
+ struct omap_aes_dev *dd = platform_get_drvdata(pdev);
+ int i;
+
+ if (!dd)
+ return -ENODEV;
+
+ spin_lock(&list_lock);
+ list_del(&dd->list);
+ spin_unlock(&list_lock);
+
+ for (i = 0; i < ARRAY_SIZE(algs); i++)
+ crypto_unregister_alg(&algs[i]);
+
+ tasklet_kill(&dd->task);
+ omap_aes_dma_cleanup(dd);
+ iounmap(dd->io_base);
+ clk_put(dd->iclk);
+ kfree(dd);
+ dd = NULL;
+
+ return 0;
+}
+
+static struct platform_driver omap_aes_driver = {
+ .probe = omap_aes_probe,
+ .remove = omap_aes_remove,
+ .driver = {
+ .name = "omap-aes",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init omap_aes_mod_init(void)
+{
+ pr_info("loading %s driver\n", "omap-aes");
+
+ if (!cpu_class_is_omap2() || omap_type() != OMAP2_DEVICE_TYPE_SEC) {
+ pr_err("Unsupported cpu\n");
+ return -ENODEV;
+ }
+
+ return platform_driver_register(&omap_aes_driver);
+}
+
+static void __exit omap_aes_mod_exit(void)
+{
+ platform_driver_unregister(&omap_aes_driver);
+}
+
+module_init(omap_aes_mod_init);
+module_exit(omap_aes_mod_exit);
+
+MODULE_DESCRIPTION("OMAP AES hw acceleration support.");
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Dmitry Kasatkin");
+
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] crypto: updates to enable omap aes
2010-08-20 13:44 ` [PATCH 1/2] crypto: updates to enable omap aes Dmitry Kasatkin
@ 2010-08-31 8:52 ` Dmitry Kasatkin
2010-08-31 12:38 ` Herbert Xu
0 siblings, 1 reply; 7+ messages in thread
From: Dmitry Kasatkin @ 2010-08-31 8:52 UTC (permalink / raw)
To: herbert@gondor.hengli.com.au
Cc: Kasatkin Dmitry (Nokia-MS/Helsinki), linux-crypto@vger.kernel.org,
linux-omap@vger.kernel.org, ext Tony Lindgren
Hi,
Does anyone want to comment on this?
Thanks,
Dmitry
On 20/08/10 16:44, Kasatkin Dmitry (Nokia-MS/Helsinki) wrote:
> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> ---
> 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 | 71 ++++++++++++++++++++++++++++++++++
> 4 files changed, 74 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock2420_data.c b/arch/arm/mach-omap2/clock2420_data.c
> index 37d65d6..5f2066a 100644
> --- a/arch/arm/mach-omap2/clock2420_data.c
> +++ b/arch/arm/mach-omap2/clock2420_data.c
> @@ -1838,7 +1838,7 @@ static struct omap_clk omap2420_clks[] = {
> CLK(NULL, "des_ick", &des_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("omap-aes", "ick", &aes_ick, CK_242X),
> CLK(NULL, "pka_ick", &pka_ick, CK_242X),
> CLK(NULL, "usb_fck", &usb_fck, CK_242X),
> CLK("musb_hdrc", "fck", &osc_ck, CK_242X),
> diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
> index b33118f..701a171 100644
> --- a/arch/arm/mach-omap2/clock2430_data.c
> +++ b/arch/arm/mach-omap2/clock2430_data.c
> @@ -1926,7 +1926,7 @@ static struct omap_clk omap2430_clks[] = {
> CLK(NULL, "des_ick", &des_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("omap-aes", "ick", &aes_ick, CK_243X),
> CLK(NULL, "pka_ick", &pka_ick, CK_243X),
> CLK(NULL, "usb_fck", &usb_fck, CK_243X),
> CLK("musb_hdrc", "ick", &usbhs_ick, CK_243X),
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> index dfdce2d..c73906d 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3288,7 +3288,7 @@ static struct omap_clk omap3xxx_clks[] = {
> CLK(NULL, "usbtll_ick", &usbtll_ick, CK_3430ES2 | CK_AM35XX),
> 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("omap-aes", "ick", &aes2_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),
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index 2dbb265..b27e7cb 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -498,6 +498,76 @@ static void omap_init_sham(void)
> static inline void omap_init_sham(void) { }
> #endif
>
> +#if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)
> +
> +#ifdef CONFIG_ARCH_OMAP24XX
> +static struct resource omap2_aes_resources[] = {
> + {
> + .start = OMAP24XX_SEC_AES_BASE,
> + .end = OMAP24XX_SEC_AES_BASE + 0x4C,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = OMAP24XX_DMA_AES_TX,
> + .flags = IORESOURCE_DMA,
> + },
> + {
> + .start = OMAP24XX_DMA_AES_RX,
> + .flags = IORESOURCE_DMA,
> + }
> +};
> +static int omap2_aes_resources_sz = ARRAY_SIZE(omap2_aes_resources);
> +#else
> +#define omap2_aes_resources NULL
> +#define omap2_aes_resources_sz 0
> +#endif
> +
> +#ifdef CONFIG_ARCH_OMAP34XX
> +static struct resource omap3_aes_resources[] = {
> + {
> + .start = OMAP34XX_SEC_AES_BASE,
> + .end = OMAP34XX_SEC_AES_BASE + 0x4C,
> + .flags = IORESOURCE_MEM,
> + },
> + {
> + .start = OMAP34XX_DMA_AES2_TX,
> + .flags = IORESOURCE_DMA,
> + },
> + {
> + .start = OMAP34XX_DMA_AES2_RX,
> + .flags = IORESOURCE_DMA,
> + }
> +};
> +static int omap3_aes_resources_sz = ARRAY_SIZE(omap3_aes_resources);
> +#else
> +#define omap3_aes_resources NULL
> +#define omap3_aes_resources_sz 0
> +#endif
> +
> +static struct platform_device aes_device = {
> + .name = "omap-aes",
> + .id = -1,
> +};
> +
> +static void omap_init_aes(void)
> +{
> + if (cpu_is_omap24xx()) {
> + aes_device.resource = omap2_aes_resources;
> + aes_device.num_resources = omap2_aes_resources_sz;
> + } else if (cpu_is_omap34xx()) {
> + aes_device.resource = omap3_aes_resources;
> + aes_device.num_resources = omap3_aes_resources_sz;
> + } else {
> + pr_err("%s: platform not supported\n", __func__);
> + return;
> + }
> + platform_device_register(&aes_device);
> +}
> +
> +#else
> +static inline void omap_init_aes(void) { }
> +#endif
> +
> /*-------------------------------------------------------------------------*/
>
> #if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
> @@ -854,6 +924,7 @@ static int __init omap2_init_devices(void)
> omap_hdq_init();
> omap_init_sti();
> omap_init_sham();
> + omap_init_aes();
> omap_init_vout();
>
> return 0;
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver
2010-08-20 13:44 ` [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver Dmitry Kasatkin
@ 2010-08-31 9:22 ` Dmitry Kasatkin
0 siblings, 0 replies; 7+ messages in thread
From: Dmitry Kasatkin @ 2010-08-31 9:22 UTC (permalink / raw)
To: herbert@gondor.hengli.com.au
Cc: Kasatkin Dmitry (Nokia-MS/Helsinki), linux-crypto@vger.kernel.org,
linux-omap@vger.kernel.org, ext Tony Lindgren
To this actually.
Thanks
On 20/08/10 16:44, Kasatkin Dmitry (Nokia-MS/Helsinki) wrote:
> Signed-off-by: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> ---
> drivers/crypto/Kconfig | 8 +
> drivers/crypto/Makefile | 1 +
> drivers/crypto/omap-aes.c | 948 +++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 957 insertions(+), 0 deletions(-)
> create mode 100644 drivers/crypto/omap-aes.c
>
> diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
> index ea0b386..742089b 100644
> --- a/drivers/crypto/Kconfig
> +++ b/drivers/crypto/Kconfig
> @@ -243,4 +243,12 @@ config CRYPTO_DEV_OMAP_SHAM
> OMAP processors have SHA1/MD5 hw accelerator. Select this if you
> want to use the OMAP module for SHA1/MD5 algorithms.
>
> +config CRYPTO_DEV_OMAP_AES
> + tristate "Support for OMAP AES hw engine"
> + depends on ARCH_OMAP2 || ARCH_OMAP3
> + select CRYPTO_AES
> + help
> + OMAP processors have AES module accelerator. Select this if you
> + want to use the OMAP module for AES algorithms.
> +
> endif # CRYPTO_HW
> diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
> index 6dbbe00..64289c6 100644
> --- a/drivers/crypto/Makefile
> +++ b/drivers/crypto/Makefile
> @@ -9,4 +9,5 @@ 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
> +obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
>
> diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
> new file mode 100644
> index 0000000..799ca51
> --- /dev/null
> +++ b/drivers/crypto/omap-aes.c
> @@ -0,0 +1,948 @@
> +/*
> + * Cryptographic API.
> + *
> + * Support for OMAP AES HW acceleration.
> + *
> + * Copyright (c) 2010 Nokia Corporation
> + * Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as published
> + * by the Free Software Foundation.
> + *
> + */
> +
> +#define pr_fmt(fmt) "%s: " fmt, __func__
> +
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/errno.h>
> +#include <linux/kernel.h>
> +#include <linux/clk.h>
> +#include <linux/platform_device.h>
> +#include <linux/scatterlist.h>
> +#include <linux/dma-mapping.h>
> +#include <linux/io.h>
> +#include <linux/crypto.h>
> +#include <linux/interrupt.h>
> +#include <crypto/scatterwalk.h>
> +#include <crypto/aes.h>
> +
> +#include <plat/cpu.h>
> +#include <plat/dma.h>
> +
> +/* OMAP TRM gives bitfields as start:end, where start is the higher bit
> + number. For example 7:0 */
> +#define FLD_MASK(start, end) (((1 << ((start) - (end) + 1)) - 1) << (end))
> +#define FLD_VAL(val, start, end) (((val) << (end)) & FLD_MASK(start, end))
> +
> +#define AES_REG_KEY(x) (0x1C - ((x ^ 0x01) * 0x04))
> +#define AES_REG_IV(x) (0x20 + ((x) * 0x04))
> +
> +#define AES_REG_CTRL 0x30
> +#define AES_REG_CTRL_CTR_WIDTH (1 << 7)
> +#define AES_REG_CTRL_CTR (1 << 6)
> +#define AES_REG_CTRL_CBC (1 << 5)
> +#define AES_REG_CTRL_KEY_SIZE (3 << 3)
> +#define AES_REG_CTRL_DIRECTION (1 << 2)
> +#define AES_REG_CTRL_INPUT_READY (1 << 1)
> +#define AES_REG_CTRL_OUTPUT_READY (1 << 0)
> +
> +#define AES_REG_DATA 0x34
> +#define AES_REG_DATA_N(x) (0x34 + ((x) * 0x04))
> +
> +#define AES_REG_REV 0x44
> +#define AES_REG_REV_MAJOR 0xF0
> +#define AES_REG_REV_MINOR 0x0F
> +
> +#define AES_REG_MASK 0x48
> +#define AES_REG_MASK_SIDLE (1 << 6)
> +#define AES_REG_MASK_START (1 << 5)
> +#define AES_REG_MASK_DMA_OUT_EN (1 << 3)
> +#define AES_REG_MASK_DMA_IN_EN (1 << 2)
> +#define AES_REG_MASK_SOFTRESET (1 << 1)
> +#define AES_REG_AUTOIDLE (1 << 0)
> +
> +#define AES_REG_SYSSTATUS 0x4C
> +#define AES_REG_SYSSTATUS_RESETDONE (1 << 0)
> +
> +#define DEFAULT_TIMEOUT (5*HZ)
> +
> +#define FLAGS_MODE_MASK 0x000f
> +#define FLAGS_ENCRYPT BIT(0)
> +#define FLAGS_CBC BIT(1)
> +#define FLAGS_GIV BIT(2)
> +
> +#define FLAGS_NEW_KEY BIT(4)
> +#define FLAGS_NEW_IV BIT(5)
> +#define FLAGS_INIT BIT(6)
> +#define FLAGS_FAST BIT(7)
> +#define FLAGS_BUSY 8
> +
> +struct omap_aes_ctx {
> + struct omap_aes_dev *dd;
> +
> + int keylen;
> + u32 key[AES_KEYSIZE_256 / sizeof(u32)];
> + unsigned long flags;
> +};
> +
> +struct omap_aes_reqctx {
> + unsigned long mode;
> +};
> +
> +#define OMAP_AES_QUEUE_LENGTH 1
> +#define OMAP_AES_CACHE_SIZE 0
> +
> +struct omap_aes_dev {
> + struct list_head list;
> + unsigned long phys_base;
> + void __iomem *io_base;
> + struct clk *iclk;
> + struct omap_aes_ctx *ctx;
> + struct device *dev;
> + unsigned long flags;
> +
> + u32 *iv;
> + u32 ctrl;
> +
> + spinlock_t lock;
> + struct crypto_queue queue;
> +
> + struct tasklet_struct task;
> +
> + struct ablkcipher_request *req;
> + size_t total;
> + struct scatterlist *in_sg;
> + size_t in_offset;
> + struct scatterlist *out_sg;
> + size_t out_offset;
> +
> + size_t buflen;
> + void *buf_in;
> + size_t dma_size;
> + int dma_in;
> + int dma_lch_in;
> + dma_addr_t dma_addr_in;
> + void *buf_out;
> + int dma_out;
> + int dma_lch_out;
> + dma_addr_t dma_addr_out;
> +};
> +
> +/* keep registered devices data here */
> +static LIST_HEAD(dev_list);
> +static DEFINE_SPINLOCK(list_lock);
> +
> +static inline u32 omap_aes_read(struct omap_aes_dev *dd, u32 offset)
> +{
> + return __raw_readl(dd->io_base + offset);
> +}
> +
> +static inline void omap_aes_write(struct omap_aes_dev *dd, u32 offset,
> + u32 value)
> +{
> + __raw_writel(value, dd->io_base + offset);
> +}
> +
> +static inline void omap_aes_write_mask(struct omap_aes_dev *dd, u32 offset,
> + u32 value, u32 mask)
> +{
> + u32 val;
> +
> + val = omap_aes_read(dd, offset);
> + val &= ~mask;
> + val |= value;
> + omap_aes_write(dd, offset, val);
> +}
> +
> +static void omap_aes_write_n(struct omap_aes_dev *dd, u32 offset,
> + u32 *value, int count)
> +{
> + for (; count--; value++, offset += 4)
> + omap_aes_write(dd, offset, *value);
> +}
> +
> +static int omap_aes_wait(struct omap_aes_dev *dd, u32 offset, u32 bit)
> +{
> + unsigned long timeout = jiffies + DEFAULT_TIMEOUT;
> +
> + while (!(omap_aes_read(dd, offset) & bit)) {
> + if (time_is_before_jiffies(timeout)) {
> + dev_err(dd->dev, "omap-aes timeout\n");
> + return -ETIMEDOUT;
> + }
> + }
> + return 0;
> +}
> +
> +static int omap_aes_hw_init(struct omap_aes_dev *dd)
> +{
> + int err = 0;
> +
> + clk_enable(dd->iclk);
> + if (!(dd->flags & FLAGS_INIT)) {
> + /* is it necessary to reset before every operation? */
> + omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_SOFTRESET,
> + AES_REG_MASK_SOFTRESET);
> + /*
> + * prevent OCP bus error (SRESP) in case an access to the module
> + * is performed while the module is coming out of soft reset
> + */
> + __asm__ __volatile__("nop");
> + __asm__ __volatile__("nop");
> +
> + err = omap_aes_wait(dd, AES_REG_SYSSTATUS,
> + AES_REG_SYSSTATUS_RESETDONE);
> + if (!err)
> + dd->flags |= FLAGS_INIT;
> + }
> +
> + return err;
> +}
> +
> +static void omap_aes_hw_cleanup(struct omap_aes_dev *dd)
> +{
> + clk_disable(dd->iclk);
> +}
> +
> +static void omap_aes_write_ctrl(struct omap_aes_dev *dd)
> +{
> + unsigned int key32;
> + int i;
> + u32 val, mask;
> +
> + val = FLD_VAL(((dd->ctx->keylen >> 3) - 1), 4, 3);
> + if (dd->flags & FLAGS_CBC)
> + val |= AES_REG_CTRL_CBC;
> + if (dd->flags & FLAGS_ENCRYPT)
> + val |= AES_REG_CTRL_DIRECTION;
> +
> + if (dd->ctrl == val && !(dd->flags & FLAGS_NEW_IV) &&
> + !(dd->ctx->flags & FLAGS_NEW_KEY))
> + goto out;
> +
> + /* only need to write control registers for new settings */
> +
> + dd->ctrl = val;
> +
> + val = 0;
> + if (dd->dma_lch_out >= 0)
> + val |= AES_REG_MASK_DMA_OUT_EN;
> + if (dd->dma_lch_in >= 0)
> + val |= AES_REG_MASK_DMA_IN_EN;
> +
> + mask = AES_REG_MASK_DMA_IN_EN | AES_REG_MASK_DMA_OUT_EN;
> +
> + omap_aes_write_mask(dd, AES_REG_MASK, val, mask);
> +
> + pr_debug("Set key\n");
> + key32 = dd->ctx->keylen / sizeof(u32);
> + /* set a key */
> + for (i = 0; i < key32; i++) {
> + omap_aes_write(dd, AES_REG_KEY(i),
> + __le32_to_cpu(dd->ctx->key[i]));
> + }
> + dd->ctx->flags &= ~FLAGS_NEW_KEY;
> +
> + if (dd->flags & FLAGS_NEW_IV) {
> + pr_debug("Set IV\n");
> + omap_aes_write_n(dd, AES_REG_IV(0), dd->iv, 4);
> + dd->flags &= ~FLAGS_NEW_IV;
> + }
> +
> + mask = AES_REG_CTRL_CBC | AES_REG_CTRL_DIRECTION |
> + AES_REG_CTRL_KEY_SIZE;
> +
> + omap_aes_write_mask(dd, AES_REG_CTRL, dd->ctrl, mask);
> +
> +out:
> + /* start DMA or disable idle mode */
> + omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_START,
> + AES_REG_MASK_START);
> +}
> +
> +static struct omap_aes_dev *omap_aes_find_dev(struct omap_aes_ctx *ctx)
> +{
> + struct omap_aes_dev *dd = NULL, *tmp;
> +
> + spin_lock_bh(&list_lock);
> + if (!ctx->dd) {
> + list_for_each_entry(tmp, &dev_list, list) {
> + /* FIXME: take fist available aes core */
> + dd = tmp;
> + break;
> + }
> + ctx->dd = dd;
> + } else {
> + /* already found before */
> + dd = ctx->dd;
> + }
> + spin_unlock_bh(&list_lock);
> +
> + return dd;
> +}
> +
> +static void omap_aes_dma_callback(int lch, u16 ch_status, void *data)
> +{
> + struct omap_aes_dev *dd = data;
> +
> + if (lch == dd->dma_lch_out)
> + tasklet_schedule(&dd->task);
> +}
> +
> +static int omap_aes_dma_init(struct omap_aes_dev *dd)
> +{
> + int err = -ENOMEM;
> +
> + dd->dma_lch_out = -1;
> + dd->dma_lch_in = -1;
> +
> + dd->buf_in = (void *)__get_free_pages(GFP_KERNEL, OMAP_AES_CACHE_SIZE);
> + dd->buf_out = (void *)__get_free_pages(GFP_KERNEL, OMAP_AES_CACHE_SIZE);
> + dd->buflen = PAGE_SIZE << OMAP_AES_CACHE_SIZE;
> + dd->buflen &= ~(AES_BLOCK_SIZE - 1);
> +
> + if (!dd->buf_in || !dd->buf_out) {
> + dev_err(dd->dev, "unable to alloc pages.\n");
> + goto err_alloc;
> + }
> +
> + /* MAP here */
> + dd->dma_addr_in = dma_map_single(dd->dev, dd->buf_in, dd->buflen,
> + DMA_TO_DEVICE);
> + if (dma_mapping_error(dd->dev, dd->dma_addr_in)) {
> + dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
> + err = -EINVAL;
> + goto err_map_in;
> + }
> +
> + dd->dma_addr_out = dma_map_single(dd->dev, dd->buf_out, dd->buflen,
> + DMA_FROM_DEVICE);
> + if (dma_mapping_error(dd->dev, dd->dma_addr_out)) {
> + dev_err(dd->dev, "dma %d bytes error\n", dd->buflen);
> + err = -EINVAL;
> + goto err_map_out;
> + }
> +
> + err = omap_request_dma(dd->dma_in, "omap-aes-rx",
> + omap_aes_dma_callback, dd, &dd->dma_lch_in);
> + if (err) {
> + dev_err(dd->dev, "Unable to request DMA channel\n");
> + goto err_dma_in;
> + }
> + err = omap_request_dma(dd->dma_out, "omap-aes-tx",
> + omap_aes_dma_callback, dd, &dd->dma_lch_out);
> + if (err) {
> + dev_err(dd->dev, "Unable to request DMA channel\n");
> + goto err_dma_out;
> + }
> +
> + omap_set_dma_dest_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_CONSTANT,
> + dd->phys_base + AES_REG_DATA, 0, 4);
> +
> + omap_set_dma_dest_burst_mode(dd->dma_lch_in, OMAP_DMA_DATA_BURST_4);
> + omap_set_dma_src_burst_mode(dd->dma_lch_in, OMAP_DMA_DATA_BURST_4);
> +
> + omap_set_dma_src_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_CONSTANT,
> + dd->phys_base + AES_REG_DATA, 0, 4);
> +
> + omap_set_dma_src_burst_mode(dd->dma_lch_out, OMAP_DMA_DATA_BURST_4);
> + omap_set_dma_dest_burst_mode(dd->dma_lch_out, OMAP_DMA_DATA_BURST_4);
> +
> + return 0;
> +
> +err_dma_out:
> + omap_free_dma(dd->dma_lch_in);
> +err_dma_in:
> + dma_unmap_single(dd->dev, dd->dma_addr_out, dd->buflen,
> + DMA_FROM_DEVICE);
> +err_map_out:
> + dma_unmap_single(dd->dev, dd->dma_addr_in, dd->buflen, DMA_TO_DEVICE);
> +err_map_in:
> + free_pages((unsigned long)dd->buf_out, OMAP_AES_CACHE_SIZE);
> + free_pages((unsigned long)dd->buf_in, OMAP_AES_CACHE_SIZE);
> +err_alloc:
> + if (err)
> + pr_err("error: %d\n", err);
> + return err;
> +}
> +
> +static void omap_aes_dma_cleanup(struct omap_aes_dev *dd)
> +{
> + omap_free_dma(dd->dma_lch_out);
> + omap_free_dma(dd->dma_lch_in);
> + dma_unmap_single(dd->dev, dd->dma_addr_out, dd->buflen,
> + DMA_FROM_DEVICE);
> + dma_unmap_single(dd->dev, dd->dma_addr_in, dd->buflen, DMA_TO_DEVICE);
> + free_pages((unsigned long)dd->buf_out, OMAP_AES_CACHE_SIZE);
> + free_pages((unsigned long)dd->buf_in, OMAP_AES_CACHE_SIZE);
> +}
> +
> +static void sg_copy_buf(void *buf, struct scatterlist *sg,
> + unsigned int start, unsigned int nbytes, int out)
> +{
> + struct scatter_walk walk;
> +
> + if (!nbytes)
> + return;
> +
> + scatterwalk_start(&walk, sg);
> + scatterwalk_advance(&walk, start);
> + scatterwalk_copychunks(buf, &walk, nbytes, out);
> + scatterwalk_done(&walk, out, 0);
> +}
> +
> +static int sg_copy(struct scatterlist **sg, size_t *offset, void *buf,
> + size_t buflen, size_t total, int out)
> +{
> + unsigned int count, off = 0;
> +
> + while (buflen && total) {
> + count = min((*sg)->length - *offset, total);
> + count = min(count, buflen);
> +
> + if (!count)
> + return off;
> +
> + sg_copy_buf(buf + off, *sg, *offset, count, out);
> +
> + off += count;
> + buflen -= count;
> + *offset += count;
> + total -= count;
> +
> + if (*offset == (*sg)->length) {
> + *sg = sg_next(*sg);
> + if (*sg)
> + *offset = 0;
> + else
> + total = 0;
> + }
> + }
> +
> + return off;
> +}
> +
> +static int omap_aes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in,
> + dma_addr_t dma_addr_out, int length)
> +{
> + struct omap_aes_ctx *ctx = crypto_tfm_ctx(tfm);
> + struct omap_aes_dev *dd = ctx->dd;
> + int len32;
> +
> + pr_debug("len: %d\n", length);
> +
> + dd->dma_size = length;
> +
> + if (!(dd->flags & FLAGS_FAST))
> + dma_sync_single_for_device(dd->dev, dma_addr_in, length,
> + DMA_TO_DEVICE);
> +
> + len32 = DIV_ROUND_UP(length, sizeof(u32));
> +
> + /* IN */
> + omap_set_dma_transfer_params(dd->dma_lch_in, OMAP_DMA_DATA_TYPE_S32,
> + len32, 1, OMAP_DMA_SYNC_PACKET, dd->dma_in,
> + OMAP_DMA_DST_SYNC);
> +
> + omap_set_dma_src_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_POST_INC,
> + dma_addr_in, 0, 0);
> +
> + /* OUT */
> + omap_set_dma_transfer_params(dd->dma_lch_out, OMAP_DMA_DATA_TYPE_S32,
> + len32, 1, OMAP_DMA_SYNC_PACKET,
> + dd->dma_out, OMAP_DMA_SRC_SYNC);
> +
> + omap_set_dma_dest_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_POST_INC,
> + dma_addr_out, 0, 0);
> +
> + omap_start_dma(dd->dma_lch_in);
> + omap_start_dma(dd->dma_lch_out);
> +
> + omap_aes_write_ctrl(dd);
> +
> + return 0;
> +}
> +
> +static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
> +{
> + struct crypto_tfm *tfm = crypto_ablkcipher_tfm(
> + crypto_ablkcipher_reqtfm(dd->req));
> + int err, fast = 0, in, out;
> + size_t count;
> + dma_addr_t addr_in, addr_out;
> +
> + pr_debug("total: %d\n", dd->total);
> +
> + if (sg_is_last(dd->in_sg) && sg_is_last(dd->out_sg)) {
> + /* check for alignment */
> + in = IS_ALIGNED((u32)dd->in_sg->offset, sizeof(u32));
> + out = IS_ALIGNED((u32)dd->out_sg->offset, sizeof(u32));
> +
> + fast = in && out;
> + }
> +
> + if (fast) {
> + count = min(dd->total, sg_dma_len(dd->in_sg));
> + count = min(count, sg_dma_len(dd->out_sg));
> +
> + if (count != dd->total)
> + return -EINVAL;
> +
> + pr_debug("fast\n");
> +
> + err = dma_map_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
> + if (!err) {
> + dev_err(dd->dev, "dma_map_sg() error\n");
> + return -EINVAL;
> + }
> +
> + err = dma_map_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
> + if (!err) {
> + dev_err(dd->dev, "dma_map_sg() error\n");
> + dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
> + return -EINVAL;
> + }
> +
> + addr_in = sg_dma_address(dd->in_sg);
> + addr_out = sg_dma_address(dd->out_sg);
> +
> + dd->flags |= FLAGS_FAST;
> +
> + } else {
> + /* use cache buffers */
> + count = sg_copy(&dd->in_sg, &dd->in_offset, dd->buf_in,
> + dd->buflen, dd->total, 0);
> +
> + addr_in = dd->dma_addr_in;
> + addr_out = dd->dma_addr_out;
> +
> + dd->flags &= ~FLAGS_FAST;
> +
> + }
> +
> + dd->total -= count;
> +
> + err = omap_aes_hw_init(dd);
> +
> + err = omap_aes_crypt_dma(tfm, addr_in, addr_out, count);
> +
> + return err;
> +}
> +
> +static void omap_aes_finish_req(struct omap_aes_dev *dd, int err)
> +{
> + struct omap_aes_ctx *ctx;
> +
> + pr_debug("err: %d\n", err);
> +
> + ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(dd->req));
> +
> + if (!dd->total)
> + dd->req->base.complete(&dd->req->base, err);
> +}
> +
> +static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd)
> +{
> + int err = 0;
> + size_t count;
> +
> + pr_debug("total: %d\n", dd->total);
> +
> + omap_aes_write_mask(dd, AES_REG_MASK, 0, AES_REG_MASK_START);
> +
> + omap_aes_hw_cleanup(dd);
> +
> + omap_stop_dma(dd->dma_lch_in);
> + omap_stop_dma(dd->dma_lch_out);
> +
> + if (dd->flags & FLAGS_FAST) {
> + dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
> + dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
> + } else {
> + dma_sync_single_for_device(dd->dev, dd->dma_addr_out,
> + dd->dma_size, DMA_FROM_DEVICE);
> +
> + /* copy data */
> + count = sg_copy(&dd->out_sg, &dd->out_offset, dd->buf_out,
> + dd->buflen, dd->dma_size, 1);
> + if (count != dd->dma_size) {
> + err = -EINVAL;
> + pr_err("not all data converted: %u\n", count);
> + }
> + }
> +
> + if (err || !dd->total)
> + omap_aes_finish_req(dd, err);
> +
> + return err;
> +}
> +
> +static int omap_aes_handle_req(struct omap_aes_dev *dd)
> +{
> + struct crypto_async_request *async_req, *backlog;
> + struct omap_aes_ctx *ctx;
> + struct omap_aes_reqctx *rctx;
> + struct ablkcipher_request *req;
> + unsigned long flags;
> +
> + if (dd->total)
> + goto start;
> +
> + spin_lock_irqsave(&dd->lock, flags);
> + backlog = crypto_get_backlog(&dd->queue);
> + async_req = crypto_dequeue_request(&dd->queue);
> + if (!async_req)
> + clear_bit(FLAGS_BUSY, &dd->flags);
> + spin_unlock_irqrestore(&dd->lock, flags);
> +
> + if (!async_req)
> + return 0;
> +
> + if (backlog)
> + backlog->complete(backlog, -EINPROGRESS);
> +
> + req = ablkcipher_request_cast(async_req);
> +
> + pr_debug("get new req\n");
> +
> + /* assign new request to device */
> + dd->req = req;
> + dd->total = req->nbytes;
> + dd->in_offset = 0;
> + dd->in_sg = req->src;
> + dd->out_offset = 0;
> + dd->out_sg = req->dst;
> +
> + rctx = ablkcipher_request_ctx(req);
> + ctx = crypto_ablkcipher_ctx(crypto_ablkcipher_reqtfm(req));
> + rctx->mode &= FLAGS_MODE_MASK;
> + dd->flags = (dd->flags & ~FLAGS_MODE_MASK) | rctx->mode;
> +
> + dd->iv = req->info;
> + if ((dd->flags & FLAGS_CBC) && dd->iv)
> + dd->flags |= FLAGS_NEW_IV;
> + else
> + dd->flags &= ~FLAGS_NEW_IV;
> +
> + ctx->dd = dd;
> + if (dd->ctx != ctx) {
> + /* assign new context to device */
> + dd->ctx = ctx;
> + ctx->flags |= FLAGS_NEW_KEY;
> + }
> +
> + if (!IS_ALIGNED(req->nbytes, AES_BLOCK_SIZE))
> + pr_err("request size is not exact amount of AES blocks\n");
> +
> +start:
> + return omap_aes_crypt_dma_start(dd);
> +}
> +
> +static void omap_aes_task(unsigned long data)
> +{
> + struct omap_aes_dev *dd = (struct omap_aes_dev *)data;
> + int err;
> +
> + pr_debug("enter\n");
> +
> + err = omap_aes_crypt_dma_stop(dd);
> +
> + err = omap_aes_handle_req(dd);
> +
> + pr_debug("exit\n");
> +}
> +
> +static int omap_aes_crypt(struct ablkcipher_request *req, unsigned long mode)
> +{
> + struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(
> + crypto_ablkcipher_reqtfm(req));
> + struct omap_aes_reqctx *rctx = ablkcipher_request_ctx(req);
> + struct omap_aes_dev *dd;
> + unsigned long flags;
> + int err;
> +
> + pr_debug("nbytes: %d, enc: %d, cbc: %d\n", req->nbytes,
> + !!(mode & FLAGS_ENCRYPT),
> + !!(mode & FLAGS_CBC));
> +
> + dd = omap_aes_find_dev(ctx);
> + if (!dd)
> + return -ENODEV;
> +
> + rctx->mode = mode;
> +
> + spin_lock_irqsave(&dd->lock, flags);
> + err = ablkcipher_enqueue_request(&dd->queue, req);
> + spin_unlock_irqrestore(&dd->lock, flags);
> +
> + if (!test_and_set_bit(FLAGS_BUSY, &dd->flags))
> + omap_aes_handle_req(dd);
> +
> + pr_debug("exit\n");
> +
> + return err;
> +}
> +
> +/* ********************** ALG API ************************************ */
> +
> +static int omap_aes_setkey(struct crypto_ablkcipher *tfm, const u8 *key,
> + unsigned int keylen)
> +{
> + struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx(tfm);
> +
> + if (keylen != AES_KEYSIZE_128 && keylen != AES_KEYSIZE_192 &&
> + keylen != AES_KEYSIZE_256)
> + return -EINVAL;
> +
> + pr_debug("enter, keylen: %d\n", keylen);
> +
> + memcpy(ctx->key, key, keylen);
> + ctx->keylen = keylen;
> + ctx->flags |= FLAGS_NEW_KEY;
> +
> + return 0;
> +}
> +
> +static int omap_aes_ecb_encrypt(struct ablkcipher_request *req)
> +{
> + return omap_aes_crypt(req, FLAGS_ENCRYPT);
> +}
> +
> +static int omap_aes_ecb_decrypt(struct ablkcipher_request *req)
> +{
> + return omap_aes_crypt(req, 0);
> +}
> +
> +static int omap_aes_cbc_encrypt(struct ablkcipher_request *req)
> +{
> + return omap_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_CBC);
> +}
> +
> +static int omap_aes_cbc_decrypt(struct ablkcipher_request *req)
> +{
> + return omap_aes_crypt(req, FLAGS_CBC);
> +}
> +
> +static int omap_aes_cra_init(struct crypto_tfm *tfm)
> +{
> + pr_debug("enter\n");
> +
> + tfm->crt_ablkcipher.reqsize = sizeof(struct omap_aes_reqctx);
> +
> + return 0;
> +}
> +
> +static void omap_aes_cra_exit(struct crypto_tfm *tfm)
> +{
> + pr_debug("enter\n");
> +}
> +
> +/* ********************** ALGS ************************************ */
> +
> +static struct crypto_alg algs[] = {
> +{
> + .cra_name = "ecb(aes)",
> + .cra_driver_name = "ecb-aes-omap",
> + .cra_priority = 100,
> + .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
> + .cra_blocksize = AES_BLOCK_SIZE,
> + .cra_ctxsize = sizeof(struct omap_aes_ctx),
> + .cra_alignmask = 0,
> + .cra_type = &crypto_ablkcipher_type,
> + .cra_module = THIS_MODULE,
> + .cra_init = omap_aes_cra_init,
> + .cra_exit = omap_aes_cra_exit,
> + .cra_u.ablkcipher = {
> + .min_keysize = AES_MIN_KEY_SIZE,
> + .max_keysize = AES_MAX_KEY_SIZE,
> + .setkey = omap_aes_setkey,
> + .encrypt = omap_aes_ecb_encrypt,
> + .decrypt = omap_aes_ecb_decrypt,
> + }
> +},
> +{
> + .cra_name = "cbc(aes)",
> + .cra_driver_name = "cbc-aes-omap",
> + .cra_priority = 100,
> + .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER | CRYPTO_ALG_ASYNC,
> + .cra_blocksize = AES_BLOCK_SIZE,
> + .cra_ctxsize = sizeof(struct omap_aes_ctx),
> + .cra_alignmask = 0,
> + .cra_type = &crypto_ablkcipher_type,
> + .cra_module = THIS_MODULE,
> + .cra_init = omap_aes_cra_init,
> + .cra_exit = omap_aes_cra_exit,
> + .cra_u.ablkcipher = {
> + .min_keysize = AES_MIN_KEY_SIZE,
> + .max_keysize = AES_MAX_KEY_SIZE,
> + .ivsize = AES_BLOCK_SIZE,
> + .setkey = omap_aes_setkey,
> + .encrypt = omap_aes_cbc_encrypt,
> + .decrypt = omap_aes_cbc_decrypt,
> + }
> +}
> +};
> +
> +static int omap_aes_probe(struct platform_device *pdev)
> +{
> + struct device *dev = &pdev->dev;
> + struct omap_aes_dev *dd;
> + struct resource *res;
> + int err = -ENOMEM, i, j;
> + u32 reg;
> +
> + dd = kzalloc(sizeof(struct omap_aes_dev), GFP_KERNEL);
> + if (dd == NULL) {
> + dev_err(dev, "unable to alloc data struct.\n");
> + goto err_data;
> + }
> + dd->dev = dev;
> + platform_set_drvdata(pdev, dd);
> +
> + spin_lock_init(&dd->lock);
> + crypto_init_queue(&dd->queue, OMAP_AES_QUEUE_LENGTH);
> +
> + /* Get the base address */
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + if (!res) {
> + dev_err(dev, "invalid resource type\n");
> + err = -ENODEV;
> + goto err_res;
> + }
> + dd->phys_base = res->start;
> +
> + /* Get the DMA */
> + res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
> + if (!res)
> + dev_info(dev, "no DMA info\n");
> + else
> + dd->dma_out = res->start;
> +
> + /* Get the DMA */
> + res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
> + if (!res)
> + dev_info(dev, "no DMA info\n");
> + else
> + dd->dma_in = res->start;
> +
> + /* Initializing the clock */
> + dd->iclk = clk_get(dev, "ick");
> + if (!dd->iclk) {
> + dev_err(dev, "clock intialization failed.\n");
> + err = -ENODEV;
> + goto err_res;
> + }
> +
> + dd->io_base = ioremap(dd->phys_base, SZ_4K);
> + if (!dd->io_base) {
> + dev_err(dev, "can't ioremap\n");
> + err = -ENOMEM;
> + goto err_io;
> + }
> +
> + clk_enable(dd->iclk);
> + reg = omap_aes_read(dd, AES_REG_REV);
> + dev_info(dev, "OMAP AES hw accel rev: %u.%u\n",
> + (reg & AES_REG_REV_MAJOR) >> 4, reg & AES_REG_REV_MINOR);
> + clk_disable(dd->iclk);
> +
> + tasklet_init(&dd->task, omap_aes_task, (unsigned long)dd);
> +
> + err = omap_aes_dma_init(dd);
> + if (err)
> + goto err_dma;
> +
> + INIT_LIST_HEAD(&dd->list);
> + spin_lock(&list_lock);
> + list_add_tail(&dd->list, &dev_list);
> + spin_unlock(&list_lock);
> +
> + for (i = 0; i < ARRAY_SIZE(algs); i++) {
> + pr_debug("i: %d\n", i);
> + INIT_LIST_HEAD(&algs[i].cra_list);
> + err = crypto_register_alg(&algs[i]);
> + if (err)
> + goto err_algs;
> + }
> +
> + pr_info("probe() done\n");
> +
> + return 0;
> +err_algs:
> + for (j = 0; j < i; j++)
> + crypto_unregister_alg(&algs[j]);
> + omap_aes_dma_cleanup(dd);
> +err_dma:
> + tasklet_kill(&dd->task);
> + iounmap(dd->io_base);
> +err_io:
> + clk_put(dd->iclk);
> +err_res:
> + kfree(dd);
> + dd = NULL;
> +err_data:
> + dev_err(dev, "initialization failed.\n");
> + return err;
> +}
> +
> +static int omap_aes_remove(struct platform_device *pdev)
> +{
> + struct omap_aes_dev *dd = platform_get_drvdata(pdev);
> + int i;
> +
> + if (!dd)
> + return -ENODEV;
> +
> + spin_lock(&list_lock);
> + list_del(&dd->list);
> + spin_unlock(&list_lock);
> +
> + for (i = 0; i < ARRAY_SIZE(algs); i++)
> + crypto_unregister_alg(&algs[i]);
> +
> + tasklet_kill(&dd->task);
> + omap_aes_dma_cleanup(dd);
> + iounmap(dd->io_base);
> + clk_put(dd->iclk);
> + kfree(dd);
> + dd = NULL;
> +
> + return 0;
> +}
> +
> +static struct platform_driver omap_aes_driver = {
> + .probe = omap_aes_probe,
> + .remove = omap_aes_remove,
> + .driver = {
> + .name = "omap-aes",
> + .owner = THIS_MODULE,
> + },
> +};
> +
> +static int __init omap_aes_mod_init(void)
> +{
> + pr_info("loading %s driver\n", "omap-aes");
> +
> + if (!cpu_class_is_omap2() || omap_type() != OMAP2_DEVICE_TYPE_SEC) {
> + pr_err("Unsupported cpu\n");
> + return -ENODEV;
> + }
> +
> + return platform_driver_register(&omap_aes_driver);
> +}
> +
> +static void __exit omap_aes_mod_exit(void)
> +{
> + platform_driver_unregister(&omap_aes_driver);
> +}
> +
> +module_init(omap_aes_mod_init);
> +module_exit(omap_aes_mod_exit);
> +
> +MODULE_DESCRIPTION("OMAP AES hw acceleration support.");
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Dmitry Kasatkin");
> +
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-crypto" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] crypto: updates to enable omap aes
2010-08-31 8:52 ` Dmitry Kasatkin
@ 2010-08-31 12:38 ` Herbert Xu
0 siblings, 0 replies; 7+ messages in thread
From: Herbert Xu @ 2010-08-31 12:38 UTC (permalink / raw)
To: Dmitry Kasatkin
Cc: linux-crypto@vger.kernel.org, linux-omap@vger.kernel.org,
ext Tony Lindgren
On Tue, Aug 31, 2010 at 11:52:27AM +0300, Dmitry Kasatkin wrote:
> Hi,
>
> Does anyone want to comment on this?
Please be patient. Your patches are still in my queue. Resending
them is only going to slow them down.
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] 7+ messages in thread
* Re: [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver
2010-08-20 13:44 [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 1/2] crypto: updates to enable omap aes Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver Dmitry Kasatkin
@ 2010-09-03 11:15 ` Herbert Xu
2 siblings, 0 replies; 7+ messages in thread
From: Herbert Xu @ 2010-09-03 11:15 UTC (permalink / raw)
To: Dmitry Kasatkin; +Cc: linux-crypto, linux-omap
On Fri, Aug 20, 2010 at 04:44:45PM +0300, Dmitry Kasatkin wrote:
> This set of patches provides implementation of the driver for
> OMAP2/3 AES hw accelerator.
>
Both patches 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] 7+ messages in thread
end of thread, other threads:[~2010-09-03 11:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-20 13:44 [PATCH 0/2] omap-aes: OMAP2/3 AES HW accelerator driver Dmitry Kasatkin
2010-08-20 13:44 ` [PATCH 1/2] crypto: updates to enable omap aes Dmitry Kasatkin
2010-08-31 8:52 ` Dmitry Kasatkin
2010-08-31 12:38 ` Herbert Xu
2010-08-20 13:44 ` [PATCH 2/2] crypto: omap-aes: OMAP2/3 AES hw accelerator driver Dmitry Kasatkin
2010-08-31 9:22 ` Dmitry Kasatkin
2010-09-03 11:15 ` [PATCH 0/2] omap-aes: OMAP2/3 AES HW " 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).