]> nv-tegra.nvidia Code Review - linux-3.10.git/blobdiff - drivers/crypto/omap-aes.c
crypto: omap-aes - Use module_platform_driver macro
[linux-3.10.git] / drivers / crypto / omap-aes.c
index 093a8af59cbe46711fd0e750552598eb26f04d85..ee15b0f7849ad567d74cd70a9e125f20fe4f1814 100644 (file)
@@ -5,6 +5,7 @@
  *
  * Copyright (c) 2010 Nokia Corporation
  * Author: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
+ * Copyright (c) 2011 Texas Instruments Incorporated
  *
  * 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
 #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/dmaengine.h>
+#include <linux/omap-dma.h>
+#include <linux/pm_runtime.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/of_address.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>
+#define DST_MAXBURST                   4
+#define DMA_MIN                                (DST_MAXBURST * sizeof(u32))
 
 /* 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_KEY(dd, x)             ((dd)->pdata->key_ofs - \
+                                               ((x ^ 0x01) * 0x04))
+#define AES_REG_IV(dd, x)              ((dd)->pdata->iv_ofs + ((x) * 0x04))
 
-#define AES_REG_CTRL                   0x30
-#define AES_REG_CTRL_CTR_WIDTH         (1 << 7)
+#define AES_REG_CTRL(dd)               ((dd)->pdata->ctrl_ofs)
+#define AES_REG_CTRL_CTR_WIDTH_MASK    (3 << 7)
+#define AES_REG_CTRL_CTR_WIDTH_32              (0 << 7)
+#define AES_REG_CTRL_CTR_WIDTH_64              (1 << 7)
+#define AES_REG_CTRL_CTR_WIDTH_96              (2 << 7)
+#define AES_REG_CTRL_CTR_WIDTH_128             (3 << 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_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_DATA_N(dd, x)          ((dd)->pdata->data_ofs + ((x) * 0x04))
 
-#define AES_REG_REV                    0x44
-#define AES_REG_REV_MAJOR              0xF0
-#define AES_REG_REV_MINOR              0x0F
+#define AES_REG_REV(dd)                        ((dd)->pdata->rev_ofs)
 
-#define AES_REG_MASK                   0x48
+#define AES_REG_MASK(dd)               ((dd)->pdata->mask_ofs)
 #define AES_REG_MASK_SIDLE             (1 << 6)
 #define AES_REG_MASK_START             (1 << 5)
 #define AES_REG_MASK_DMA_OUT_EN                (1 << 3)
@@ -64,8 +72,7 @@
 #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 AES_REG_LENGTH_N(x)            (0x54 + ((x) * 0x04))
 
 #define DEFAULT_TIMEOUT                (5*HZ)
 
@@ -73,6 +80,7 @@
 #define FLAGS_ENCRYPT          BIT(0)
 #define FLAGS_CBC              BIT(1)
 #define FLAGS_GIV              BIT(2)
+#define FLAGS_CTR              BIT(3)
 
 #define FLAGS_INIT             BIT(4)
 #define FLAGS_FAST             BIT(5)
@@ -93,11 +101,39 @@ struct omap_aes_reqctx {
 #define OMAP_AES_QUEUE_LENGTH  1
 #define OMAP_AES_CACHE_SIZE    0
 
+struct omap_aes_algs_info {
+       struct crypto_alg       *algs_list;
+       unsigned int            size;
+       unsigned int            registered;
+};
+
+struct omap_aes_pdata {
+       struct omap_aes_algs_info       *algs_info;
+       unsigned int    algs_info_size;
+
+       void            (*trigger)(struct omap_aes_dev *dd, int length);
+
+       u32             key_ofs;
+       u32             iv_ofs;
+       u32             ctrl_ofs;
+       u32             data_ofs;
+       u32             rev_ofs;
+       u32             mask_ofs;
+
+       u32             dma_enable_in;
+       u32             dma_enable_out;
+       u32             dma_start;
+
+       u32             major_mask;
+       u32             major_shift;
+       u32             minor_mask;
+       u32             minor_shift;
+};
+
 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;
@@ -112,20 +148,24 @@ struct omap_aes_dev {
        struct ablkcipher_request       *req;
        size_t                          total;
        struct scatterlist              *in_sg;
+       struct scatterlist              in_sgl;
        size_t                          in_offset;
        struct scatterlist              *out_sg;
+       struct scatterlist              out_sgl;
        size_t                          out_offset;
 
        size_t                  buflen;
        void                    *buf_in;
        size_t                  dma_size;
        int                     dma_in;
-       int                     dma_lch_in;
+       struct dma_chan         *dma_lch_in;
        dma_addr_t              dma_addr_in;
        void                    *buf_out;
        int                     dma_out;
-       int                     dma_lch_out;
+       struct dma_chan         *dma_lch_out;
        dma_addr_t              dma_addr_out;
+
+       const struct omap_aes_pdata     *pdata;
 };
 
 /* keep registered devices data here */
@@ -161,19 +201,6 @@ static void omap_aes_write_n(struct omap_aes_dev *dd, u32 offset,
                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)
 {
        /*
@@ -181,23 +208,9 @@ static int omap_aes_hw_init(struct omap_aes_dev *dd)
         * It may be long delays between requests.
         * Device might go to off mode to save power.
         */
-       clk_enable(dd->iclk);
+       pm_runtime_get_sync(dd->dev);
 
        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");
-
-               if (omap_aes_wait(dd, AES_REG_SYSSTATUS,
-                               AES_REG_SYSSTATUS_RESETDONE))
-                       return -ETIMEDOUT;
-
                dd->flags |= FLAGS_INIT;
                dd->err = 0;
        }
@@ -209,59 +222,75 @@ static int omap_aes_write_ctrl(struct omap_aes_dev *dd)
 {
        unsigned int key32;
        int i, err;
-       u32 val, mask;
+       u32 val, mask = 0;
 
        err = omap_aes_hw_init(dd);
        if (err)
                return err;
 
-       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);
-
        key32 = dd->ctx->keylen / sizeof(u32);
 
        /* it seems a key should always be set even if it has not changed */
        for (i = 0; i < key32; i++) {
-               omap_aes_write(dd, AES_REG_KEY(i),
+               omap_aes_write(dd, AES_REG_KEY(dd, i),
                        __le32_to_cpu(dd->ctx->key[i]));
        }
 
-       if ((dd->flags & FLAGS_CBC) && dd->req->info)
-               omap_aes_write_n(dd, AES_REG_IV(0), dd->req->info, 4);
+       if ((dd->flags & (FLAGS_CBC | FLAGS_CTR)) && dd->req->info)
+               omap_aes_write_n(dd, AES_REG_IV(dd, 0), dd->req->info, 4);
 
        val = FLD_VAL(((dd->ctx->keylen >> 3) - 1), 4, 3);
        if (dd->flags & FLAGS_CBC)
                val |= AES_REG_CTRL_CBC;
+       if (dd->flags & FLAGS_CTR) {
+               val |= AES_REG_CTRL_CTR | AES_REG_CTRL_CTR_WIDTH_32;
+               mask = AES_REG_CTRL_CTR | AES_REG_CTRL_CTR_WIDTH_MASK;
+       }
        if (dd->flags & FLAGS_ENCRYPT)
                val |= AES_REG_CTRL_DIRECTION;
 
-       mask = AES_REG_CTRL_CBC | AES_REG_CTRL_DIRECTION |
+       mask |= AES_REG_CTRL_CBC | AES_REG_CTRL_DIRECTION |
                        AES_REG_CTRL_KEY_SIZE;
 
-       omap_aes_write_mask(dd, AES_REG_CTRL, val, mask);
+       omap_aes_write_mask(dd, AES_REG_CTRL(dd), val, mask);
 
-       /* IN */
-       omap_set_dma_dest_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_CONSTANT,
-                                dd->phys_base + AES_REG_DATA, 0, 4);
+       return 0;
+}
 
-       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);
+static void omap_aes_dma_trigger_omap2(struct omap_aes_dev *dd, int length)
+{
+       u32 mask, val;
 
-       /* OUT */
-       omap_set_dma_src_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_CONSTANT,
-                               dd->phys_base + AES_REG_DATA, 0, 4);
+       val = dd->pdata->dma_start;
 
-       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);
+       if (dd->dma_lch_out != NULL)
+               val |= dd->pdata->dma_enable_out;
+       if (dd->dma_lch_in != NULL)
+               val |= dd->pdata->dma_enable_in;
 
-       return 0;
+       mask = dd->pdata->dma_enable_out | dd->pdata->dma_enable_in |
+              dd->pdata->dma_start;
+
+       omap_aes_write_mask(dd, AES_REG_MASK(dd), val, mask);
+
+}
+
+static void omap_aes_dma_trigger_omap4(struct omap_aes_dev *dd, int length)
+{
+       omap_aes_write(dd, AES_REG_LENGTH_N(0), length);
+       omap_aes_write(dd, AES_REG_LENGTH_N(1), 0);
+
+       omap_aes_dma_trigger_omap2(dd, length);
+}
+
+static void omap_aes_dma_stop(struct omap_aes_dev *dd)
+{
+       u32 mask;
+
+       mask = dd->pdata->dma_enable_out | dd->pdata->dma_enable_in |
+              dd->pdata->dma_start;
+
+       omap_aes_write_mask(dd, AES_REG_MASK(dd), 0, mask);
 }
 
 static struct omap_aes_dev *omap_aes_find_dev(struct omap_aes_ctx *ctx)
@@ -285,18 +314,10 @@ static struct omap_aes_dev *omap_aes_find_dev(struct omap_aes_ctx *ctx)
        return dd;
 }
 
-static void omap_aes_dma_callback(int lch, u16 ch_status, void *data)
+static void omap_aes_dma_out_callback(void *data)
 {
        struct omap_aes_dev *dd = data;
 
-       if (ch_status != OMAP_DMA_BLOCK_IRQ) {
-               pr_err("omap-aes DMA error status: 0x%hx\n", ch_status);
-               dd->err = -EIO;
-               dd->flags &= ~FLAGS_INIT; /* request to re-initialize */
-       } else if (lch == dd->dma_lch_in) {
-               return;
-       }
-
        /* dma_lch_out - completed */
        tasklet_schedule(&dd->done_task);
 }
@@ -304,9 +325,10 @@ static void omap_aes_dma_callback(int lch, u16 ch_status, void *data)
 static int omap_aes_dma_init(struct omap_aes_dev *dd)
 {
        int err = -ENOMEM;
+       dma_cap_mask_t mask;
 
-       dd->dma_lch_out = -1;
-       dd->dma_lch_in = -1;
+       dd->dma_lch_out = NULL;
+       dd->dma_lch_in = NULL;
 
        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);
@@ -335,23 +357,31 @@ static int omap_aes_dma_init(struct omap_aes_dev *dd)
                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");
+       dma_cap_zero(mask);
+       dma_cap_set(DMA_SLAVE, mask);
+
+       dd->dma_lch_in = dma_request_slave_channel_compat(mask,
+                                                         omap_dma_filter_fn,
+                                                         &dd->dma_in,
+                                                         dd->dev, "rx");
+       if (!dd->dma_lch_in) {
+               dev_err(dd->dev, "Unable to request in 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");
+
+       dd->dma_lch_out = dma_request_slave_channel_compat(mask,
+                                                          omap_dma_filter_fn,
+                                                          &dd->dma_out,
+                                                          dd->dev, "tx");
+       if (!dd->dma_lch_out) {
+               dev_err(dd->dev, "Unable to request out DMA channel\n");
                goto err_dma_out;
        }
 
        return 0;
 
 err_dma_out:
-       omap_free_dma(dd->dma_lch_in);
+       dma_release_channel(dd->dma_lch_in);
 err_dma_in:
        dma_unmap_single(dd->dev, dd->dma_addr_out, dd->buflen,
                         DMA_FROM_DEVICE);
@@ -368,8 +398,8 @@ err_alloc:
 
 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_release_channel(dd->dma_lch_out);
+       dma_release_channel(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);
@@ -427,12 +457,15 @@ static int sg_copy(struct scatterlist **sg, size_t *offset, void *buf,
        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)
+static int omap_aes_crypt_dma(struct crypto_tfm *tfm,
+               struct scatterlist *in_sg, struct scatterlist *out_sg)
 {
        struct omap_aes_ctx *ctx = crypto_tfm_ctx(tfm);
        struct omap_aes_dev *dd = ctx->dd;
-       int len32;
+       struct dma_async_tx_descriptor *tx_in, *tx_out;
+       struct dma_slave_config cfg;
+       dma_addr_t dma_addr_in = sg_dma_address(in_sg);
+       int ret, length = sg_dma_len(in_sg);
 
        pr_debug("len: %d\n", length);
 
@@ -442,30 +475,61 @@ static int omap_aes_crypt_dma(struct crypto_tfm *tfm, dma_addr_t dma_addr_in,
                dma_sync_single_for_device(dd->dev, dma_addr_in, length,
                                           DMA_TO_DEVICE);
 
-       len32 = DIV_ROUND_UP(length, sizeof(u32));
+       memset(&cfg, 0, sizeof(cfg));
+
+       cfg.src_addr = dd->phys_base + AES_REG_DATA_N(dd, 0);
+       cfg.dst_addr = dd->phys_base + AES_REG_DATA_N(dd, 0);
+       cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+       cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
+       cfg.src_maxburst = DST_MAXBURST;
+       cfg.dst_maxburst = DST_MAXBURST;
 
        /* 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);
+       ret = dmaengine_slave_config(dd->dma_lch_in, &cfg);
+       if (ret) {
+               dev_err(dd->dev, "can't configure IN dmaengine slave: %d\n",
+                       ret);
+               return ret;
+       }
+
+       tx_in = dmaengine_prep_slave_sg(dd->dma_lch_in, in_sg, 1,
+                                       DMA_MEM_TO_DEV,
+                                       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+       if (!tx_in) {
+               dev_err(dd->dev, "IN prep_slave_sg() failed\n");
+               return -EINVAL;
+       }
 
-       omap_set_dma_src_params(dd->dma_lch_in, 0, OMAP_DMA_AMODE_POST_INC,
-                               dma_addr_in, 0, 0);
+       /* No callback necessary */
+       tx_in->callback_param = dd;
 
        /* 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);
+       ret = dmaengine_slave_config(dd->dma_lch_out, &cfg);
+       if (ret) {
+               dev_err(dd->dev, "can't configure OUT dmaengine slave: %d\n",
+                       ret);
+               return ret;
+       }
 
-       omap_set_dma_dest_params(dd->dma_lch_out, 0, OMAP_DMA_AMODE_POST_INC,
-                                dma_addr_out, 0, 0);
+       tx_out = dmaengine_prep_slave_sg(dd->dma_lch_out, out_sg, 1,
+                                       DMA_DEV_TO_MEM,
+                                       DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+       if (!tx_out) {
+               dev_err(dd->dev, "OUT prep_slave_sg() failed\n");
+               return -EINVAL;
+       }
 
-       omap_start_dma(dd->dma_lch_in);
-       omap_start_dma(dd->dma_lch_out);
+       tx_out->callback = omap_aes_dma_out_callback;
+       tx_out->callback_param = dd;
 
-       /* start DMA or disable idle mode */
-       omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_START,
-                           AES_REG_MASK_START);
+       dmaengine_submit(tx_in);
+       dmaengine_submit(tx_out);
+
+       dma_async_issue_pending(dd->dma_lch_in);
+       dma_async_issue_pending(dd->dma_lch_out);
+
+       /* start DMA */
+       dd->pdata->trigger(dd, length);
 
        return 0;
 }
@@ -477,6 +541,8 @@ static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
        int err, fast = 0, in, out;
        size_t count;
        dma_addr_t addr_in, addr_out;
+       struct scatterlist *in_sg, *out_sg;
+       int len32;
 
        pr_debug("total: %d\n", dd->total);
 
@@ -515,6 +581,9 @@ static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
                addr_in = sg_dma_address(dd->in_sg);
                addr_out = sg_dma_address(dd->out_sg);
 
+               in_sg = dd->in_sg;
+               out_sg = dd->out_sg;
+
                dd->flags |= FLAGS_FAST;
 
        } else {
@@ -522,6 +591,27 @@ static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
                count = sg_copy(&dd->in_sg, &dd->in_offset, dd->buf_in,
                                 dd->buflen, dd->total, 0);
 
+               len32 = DIV_ROUND_UP(count, DMA_MIN) * DMA_MIN;
+
+               /*
+                * The data going into the AES module has been copied
+                * to a local buffer and the data coming out will go
+                * into a local buffer so set up local SG entries for
+                * both.
+                */
+               sg_init_table(&dd->in_sgl, 1);
+               dd->in_sgl.offset = dd->in_offset;
+               sg_dma_len(&dd->in_sgl) = len32;
+               sg_dma_address(&dd->in_sgl) = dd->dma_addr_in;
+
+               sg_init_table(&dd->out_sgl, 1);
+               dd->out_sgl.offset = dd->out_offset;
+               sg_dma_len(&dd->out_sgl) = len32;
+               sg_dma_address(&dd->out_sgl) = dd->dma_addr_out;
+
+               in_sg = &dd->in_sgl;
+               out_sg = &dd->out_sgl;
+
                addr_in = dd->dma_addr_in;
                addr_out = dd->dma_addr_out;
 
@@ -531,7 +621,7 @@ static int omap_aes_crypt_dma_start(struct omap_aes_dev *dd)
 
        dd->total -= count;
 
-       err = omap_aes_crypt_dma(tfm, addr_in, addr_out, count);
+       err = omap_aes_crypt_dma(tfm, in_sg, out_sg);
        if (err) {
                dma_unmap_sg(dd->dev, dd->in_sg, 1, DMA_TO_DEVICE);
                dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_TO_DEVICE);
@@ -546,7 +636,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err)
 
        pr_debug("err: %d\n", err);
 
-       clk_disable(dd->iclk);
+       pm_runtime_put(dd->dev);
        dd->flags &= ~FLAGS_BUSY;
 
        req->base.complete(&req->base, err);
@@ -559,10 +649,10 @@ static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd)
 
        pr_debug("total: %d\n", dd->total);
 
-       omap_aes_write_mask(dd, AES_REG_MASK, 0, AES_REG_MASK_START);
+       omap_aes_dma_stop(dd);
 
-       omap_stop_dma(dd->dma_lch_in);
-       omap_stop_dma(dd->dma_lch_out);
+       dmaengine_terminate_all(dd->dma_lch_in);
+       dmaengine_terminate_all(dd->dma_lch_out);
 
        if (dd->flags & FLAGS_FAST) {
                dma_unmap_sg(dd->dev, dd->out_sg, 1, DMA_FROM_DEVICE);
@@ -735,6 +825,16 @@ static int omap_aes_cbc_decrypt(struct ablkcipher_request *req)
        return omap_aes_crypt(req, FLAGS_CBC);
 }
 
+static int omap_aes_ctr_encrypt(struct ablkcipher_request *req)
+{
+       return omap_aes_crypt(req, FLAGS_ENCRYPT | FLAGS_CTR);
+}
+
+static int omap_aes_ctr_decrypt(struct ablkcipher_request *req)
+{
+       return omap_aes_crypt(req, FLAGS_CTR);
+}
+
 static int omap_aes_cra_init(struct crypto_tfm *tfm)
 {
        pr_debug("enter\n");
@@ -751,7 +851,7 @@ static void omap_aes_cra_exit(struct crypto_tfm *tfm)
 
 /* ********************** ALGS ************************************ */
 
-static struct crypto_alg algs[] = {
+static struct crypto_alg algs_ecb_cbc[] = {
 {
        .cra_name               = "ecb(aes)",
        .cra_driver_name        = "ecb-aes-omap",
@@ -799,11 +899,213 @@ static struct crypto_alg algs[] = {
 }
 };
 
+static struct crypto_alg algs_ctr[] = {
+{
+       .cra_name               = "ctr(aes)",
+       .cra_driver_name        = "ctr-aes-omap",
+       .cra_priority           = 100,
+       .cra_flags              = CRYPTO_ALG_TYPE_ABLKCIPHER |
+                                 CRYPTO_ALG_KERN_DRIVER_ONLY |
+                                 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,
+               .geniv          = "eseqiv",
+               .ivsize         = AES_BLOCK_SIZE,
+               .setkey         = omap_aes_setkey,
+               .encrypt        = omap_aes_ctr_encrypt,
+               .decrypt        = omap_aes_ctr_decrypt,
+       }
+} ,
+};
+
+static struct omap_aes_algs_info omap_aes_algs_info_ecb_cbc[] = {
+       {
+               .algs_list      = algs_ecb_cbc,
+               .size           = ARRAY_SIZE(algs_ecb_cbc),
+       },
+};
+
+static const struct omap_aes_pdata omap_aes_pdata_omap2 = {
+       .algs_info      = omap_aes_algs_info_ecb_cbc,
+       .algs_info_size = ARRAY_SIZE(omap_aes_algs_info_ecb_cbc),
+       .trigger        = omap_aes_dma_trigger_omap2,
+       .key_ofs        = 0x1c,
+       .iv_ofs         = 0x20,
+       .ctrl_ofs       = 0x30,
+       .data_ofs       = 0x34,
+       .rev_ofs        = 0x44,
+       .mask_ofs       = 0x48,
+       .dma_enable_in  = BIT(2),
+       .dma_enable_out = BIT(3),
+       .dma_start      = BIT(5),
+       .major_mask     = 0xf0,
+       .major_shift    = 4,
+       .minor_mask     = 0x0f,
+       .minor_shift    = 0,
+};
+
+#ifdef CONFIG_OF
+static struct omap_aes_algs_info omap_aes_algs_info_ecb_cbc_ctr[] = {
+       {
+               .algs_list      = algs_ecb_cbc,
+               .size           = ARRAY_SIZE(algs_ecb_cbc),
+       },
+       {
+               .algs_list      = algs_ctr,
+               .size           = ARRAY_SIZE(algs_ctr),
+       },
+};
+
+static const struct omap_aes_pdata omap_aes_pdata_omap3 = {
+       .algs_info      = omap_aes_algs_info_ecb_cbc_ctr,
+       .algs_info_size = ARRAY_SIZE(omap_aes_algs_info_ecb_cbc_ctr),
+       .trigger        = omap_aes_dma_trigger_omap2,
+       .key_ofs        = 0x1c,
+       .iv_ofs         = 0x20,
+       .ctrl_ofs       = 0x30,
+       .data_ofs       = 0x34,
+       .rev_ofs        = 0x44,
+       .mask_ofs       = 0x48,
+       .dma_enable_in  = BIT(2),
+       .dma_enable_out = BIT(3),
+       .dma_start      = BIT(5),
+       .major_mask     = 0xf0,
+       .major_shift    = 4,
+       .minor_mask     = 0x0f,
+       .minor_shift    = 0,
+};
+
+static const struct omap_aes_pdata omap_aes_pdata_omap4 = {
+       .algs_info      = omap_aes_algs_info_ecb_cbc_ctr,
+       .algs_info_size = ARRAY_SIZE(omap_aes_algs_info_ecb_cbc_ctr),
+       .trigger        = omap_aes_dma_trigger_omap4,
+       .key_ofs        = 0x3c,
+       .iv_ofs         = 0x40,
+       .ctrl_ofs       = 0x50,
+       .data_ofs       = 0x60,
+       .rev_ofs        = 0x80,
+       .mask_ofs       = 0x84,
+       .dma_enable_in  = BIT(5),
+       .dma_enable_out = BIT(6),
+       .major_mask     = 0x0700,
+       .major_shift    = 8,
+       .minor_mask     = 0x003f,
+       .minor_shift    = 0,
+};
+
+static const struct of_device_id omap_aes_of_match[] = {
+       {
+               .compatible     = "ti,omap2-aes",
+               .data           = &omap_aes_pdata_omap2,
+       },
+       {
+               .compatible     = "ti,omap3-aes",
+               .data           = &omap_aes_pdata_omap3,
+       },
+       {
+               .compatible     = "ti,omap4-aes",
+               .data           = &omap_aes_pdata_omap4,
+       },
+       {},
+};
+MODULE_DEVICE_TABLE(of, omap_aes_of_match);
+
+static int omap_aes_get_res_of(struct omap_aes_dev *dd,
+               struct device *dev, struct resource *res)
+{
+       struct device_node *node = dev->of_node;
+       const struct of_device_id *match;
+       int err = 0;
+
+       match = of_match_device(of_match_ptr(omap_aes_of_match), dev);
+       if (!match) {
+               dev_err(dev, "no compatible OF match\n");
+               err = -EINVAL;
+               goto err;
+       }
+
+       err = of_address_to_resource(node, 0, res);
+       if (err < 0) {
+               dev_err(dev, "can't translate OF node address\n");
+               err = -EINVAL;
+               goto err;
+       }
+
+       dd->dma_out = -1; /* Dummy value that's unused */
+       dd->dma_in = -1; /* Dummy value that's unused */
+
+       dd->pdata = match->data;
+
+err:
+       return err;
+}
+#else
+static const struct of_device_id omap_aes_of_match[] = {
+       {},
+};
+
+static int omap_aes_get_res_of(struct omap_aes_dev *dd,
+               struct device *dev, struct resource *res)
+{
+       return -EINVAL;
+}
+#endif
+
+static int omap_aes_get_res_pdev(struct omap_aes_dev *dd,
+               struct platform_device *pdev, struct resource *res)
+{
+       struct device *dev = &pdev->dev;
+       struct resource *r;
+       int err = 0;
+
+       /* Get the base address */
+       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       if (!r) {
+               dev_err(dev, "no MEM resource info\n");
+               err = -ENODEV;
+               goto err;
+       }
+       memcpy(res, r, sizeof(*res));
+
+       /* Get the DMA out channel */
+       r = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+       if (!r) {
+               dev_err(dev, "no DMA out resource info\n");
+               err = -ENODEV;
+               goto err;
+       }
+       dd->dma_out = r->start;
+
+       /* Get the DMA in channel */
+       r = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+       if (!r) {
+               dev_err(dev, "no DMA in resource info\n");
+               err = -ENODEV;
+               goto err;
+       }
+       dd->dma_in = r->start;
+
+       /* Only OMAP2/3 can be non-DT */
+       dd->pdata = &omap_aes_pdata_omap2;
+
+err:
+       return err;
+}
+
 static int omap_aes_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct omap_aes_dev *dd;
-       struct resource *res;
+       struct crypto_alg *algp;
+       struct resource res;
        int err = -ENOMEM, i, j;
        u32 reg;
 
@@ -818,49 +1120,31 @@ static int omap_aes_probe(struct platform_device *pdev)
        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 (IS_ERR(dd->iclk)) {
-               dev_err(dev, "clock intialization failed.\n");
-               err = PTR_ERR(dd->iclk);
+       err = (dev->of_node) ? omap_aes_get_res_of(dd, dev, &res) :
+                              omap_aes_get_res_pdev(dd, pdev, &res);
+       if (err)
                goto err_res;
-       }
 
-       dd->io_base = ioremap(dd->phys_base, SZ_4K);
+       dd->io_base = devm_request_and_ioremap(dev, &res);
        if (!dd->io_base) {
                dev_err(dev, "can't ioremap\n");
                err = -ENOMEM;
-               goto err_io;
+               goto err_res;
        }
+       dd->phys_base = res.start;
+
+       pm_runtime_enable(dev);
+       pm_runtime_get_sync(dev);
+
+       omap_aes_dma_stop(dd);
+
+       reg = omap_aes_read(dd, AES_REG_REV(dd));
+
+       pm_runtime_put_sync(dev);
 
-       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);
+                (reg & dd->pdata->major_mask) >> dd->pdata->major_shift,
+                (reg & dd->pdata->minor_mask) >> dd->pdata->minor_shift);
 
        tasklet_init(&dd->done_task, omap_aes_done_task, (unsigned long)dd);
        tasklet_init(&dd->queue_task, omap_aes_queue_task, (unsigned long)dd);
@@ -874,26 +1158,32 @@ static int omap_aes_probe(struct platform_device *pdev)
        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);
-               err = crypto_register_alg(&algs[i]);
-               if (err)
-                       goto err_algs;
-       }
+       for (i = 0; i < dd->pdata->algs_info_size; i++) {
+               for (j = 0; j < dd->pdata->algs_info[i].size; j++) {
+                       algp = &dd->pdata->algs_info[i].algs_list[j];
+
+                       pr_debug("reg alg: %s\n", algp->cra_name);
+                       INIT_LIST_HEAD(&algp->cra_list);
 
-       pr_info("probe() done\n");
+                       err = crypto_register_alg(algp);
+                       if (err)
+                               goto err_algs;
+
+                       dd->pdata->algs_info[i].registered++;
+               }
+       }
 
        return 0;
 err_algs:
-       for (j = 0; j < i; j++)
-               crypto_unregister_alg(&algs[j]);
+       for (i = dd->pdata->algs_info_size - 1; i >= 0; i--)
+               for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
+                       crypto_unregister_alg(
+                                       &dd->pdata->algs_info[i].algs_list[j]);
        omap_aes_dma_cleanup(dd);
 err_dma:
        tasklet_kill(&dd->done_task);
        tasklet_kill(&dd->queue_task);
-       iounmap(dd->io_base);
-err_io:
-       clk_put(dd->iclk);
+       pm_runtime_disable(dev);
 err_res:
        kfree(dd);
        dd = NULL;
@@ -905,7 +1195,7 @@ err_data:
 static int omap_aes_remove(struct platform_device *pdev)
 {
        struct omap_aes_dev *dd = platform_get_drvdata(pdev);
-       int i;
+       int i, j;
 
        if (!dd)
                return -ENODEV;
@@ -914,48 +1204,51 @@ static int omap_aes_remove(struct platform_device *pdev)
        list_del(&dd->list);
        spin_unlock(&list_lock);
 
-       for (i = 0; i < ARRAY_SIZE(algs); i++)
-               crypto_unregister_alg(&algs[i]);
+       for (i = dd->pdata->algs_info_size - 1; i >= 0; i--)
+               for (j = dd->pdata->algs_info[i].registered - 1; j >= 0; j--)
+                       crypto_unregister_alg(
+                                       &dd->pdata->algs_info[i].algs_list[j]);
 
        tasklet_kill(&dd->done_task);
        tasklet_kill(&dd->queue_task);
        omap_aes_dma_cleanup(dd);
-       iounmap(dd->io_base);
-       clk_put(dd->iclk);
+       pm_runtime_disable(dd->dev);
        kfree(dd);
        dd = NULL;
 
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int omap_aes_suspend(struct device *dev)
+{
+       pm_runtime_put_sync(dev);
+       return 0;
+}
+
+static int omap_aes_resume(struct device *dev)
+{
+       pm_runtime_get_sync(dev);
+       return 0;
+}
+#endif
+
+static const struct dev_pm_ops omap_aes_pm_ops = {
+       SET_SYSTEM_SLEEP_PM_OPS(omap_aes_suspend, omap_aes_resume)
+};
+
 static struct platform_driver omap_aes_driver = {
        .probe  = omap_aes_probe,
        .remove = omap_aes_remove,
        .driver = {
                .name   = "omap-aes",
                .owner  = THIS_MODULE,
+               .pm     = &omap_aes_pm_ops,
+               .of_match_table = omap_aes_of_match,
        },
 };
 
-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_platform_driver(omap_aes_driver);
 
 MODULE_DESCRIPTION("OMAP AES hw acceleration support.");
 MODULE_LICENSE("GPL v2");