crypto: Enable EXT4_ENCRYPTION for file based encryption [2/4]

PD#158397: crypto: enable FBE

Encrypto CONFIG_EXT4_ENCRYPTION for file based encryption

Change-Id: Iaad3679bc9ac05eea1d44ad7c6d30a0324e82e89
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>

diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
index 0d2063b..d1ccd22 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi
@@ -1029,7 +1029,7 @@
        aml_dma {
                compatible = "amlogic,aml_gxl_dma";
                reg = <0x0 0xc883e000 0x0 0x28>;
-               interrupts = <0 180 1>;
+               interrupts = <0 188 1>;
 
                aml_aes {
                        compatible = "amlogic,aes_dma";

diff --git a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
index a643a0f..cedbded 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi
@@ -1137,7 +1137,7 @@
        aml_dma {
                compatible = "amlogic,aml_gxl_dma";
                reg = <0x0 0xc883e000 0x0 0x28>;
-               interrupts = <0 180 1>;
+               interrupts = <0 188 1>;
 
                aml_aes {
                        compatible = "amlogic,aes_dma";

diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index a580a9f..467cea1 100644 (file)
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -511,6 +511,7 @@ CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_POSIX_ACL=y
 CONFIG_EXT3_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=y
 CONFIG_FANOTIFY=y
 CONFIG_QUOTA=y
 CONFIG_QUOTA_NETLINK_INTERFACE=y
@@ -557,7 +558,6 @@ CONFIG_FTRACE_SYSCALLS=y
 CONFIG_STACK_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
 CONFIG_AMLOGIC_USER_FAULT=y
-CONFIG_KEYS=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y

diff --git a/drivers/amlogic/crypto/aml-aes-dma.c b/drivers/amlogic/crypto/aml-aes-dma.c
index ee47c9c..3776a62 100644 (file)
--- a/drivers/amlogic/crypto/aml-aes-dma.c
+++ b/drivers/amlogic/crypto/aml-aes-dma.c
@@ -91,6 +91,7 @@ struct aml_aes_dev {
 
        struct ablkcipher_request       *req;
        size_t  total;
+       size_t  fast_total;
 
        struct scatterlist      *in_sg;
        size_t                  in_offset;
@@ -219,6 +220,8 @@ static size_t aml_aes_sg_dma(struct aml_aes_dev *dd, struct dma_dsc *dsc,
                uint32_t *nents, size_t total)
 {
        size_t count = 0;
+       size_t count_total = 0;
+       size_t count_sg = 0;
        uint32_t i = 0;
        int err = 0;
        struct scatterlist *in_sg = dd->in_sg;
@@ -250,15 +253,19 @@ static size_t aml_aes_sg_dma(struct aml_aes_dev *dd, struct dma_dsc *dsc,
 
        in_sg = dd->in_sg;
        out_sg = dd->out_sg;
+       count_total = count;
        for (i = 0; i < *nents; i++) {
+               count_sg = count_total > sg_dma_len(in_sg) ?
+                       sg_dma_len(in_sg) : count_total;
                addr_in = sg_dma_address(in_sg);
                addr_out = sg_dma_address(out_sg);
                dsc[i].src_addr = (uintptr_t)addr_in;
                dsc[i].tgt_addr = (uintptr_t)addr_out;
                dsc[i].dsc_cfg.d32 = 0;
-               dsc[i].dsc_cfg.b.length = sg_dma_len(in_sg);
+               dsc[i].dsc_cfg.b.length = count_sg;
                in_sg = sg_next(in_sg);
                out_sg = sg_next(out_sg);
+               count_total -= count_sg;
        }
        return count;
 }
@@ -358,15 +365,20 @@ static int aml_aes_crypt_dma_start(struct aml_aes_dev *dd)
                dd->fast_nents = 0;
        }
 
+       //fast = 0;
        if (fast)  {
                count = aml_aes_sg_dma(dd, dsc, &dd->fast_nents, dd->total);
                dd->flags |= AES_FLAGS_FAST;
                nents = dd->fast_nents;
+               dd->fast_total = count;
        } else {
                /* slow dma */
                /* use cache buffers */
                count = aml_aes_sg_copy(&dd->in_sg, &dd->in_offset,
-                               dd->buf_in, dd->buflen, dd->total, 0);
+                               dd->buf_in, dd->buflen,
+                               ((dd->total + dd->ctx->block_size - 1)
+                                / dd->ctx->block_size)
+                               * dd->ctx->block_size, 0);
                addr_in = dd->dma_addr_in;
                addr_out = dd->dma_addr_out;
                dd->dma_size = count;
@@ -375,7 +387,8 @@ static int aml_aes_crypt_dma_start(struct aml_aes_dev *dd)
                dsc->src_addr = (uint32_t)addr_in;
                dsc->tgt_addr = (uint32_t)addr_out;
                dsc->dsc_cfg.d32 = 0;
-               dsc->dsc_cfg.b.length = count;
+               dsc->dsc_cfg.b.length = ((count + dd->ctx->block_size - 1)
+                               / dd->ctx->block_size) * dd->ctx->block_size;
                nents = 1;
                dd->flags &= ~AES_FLAGS_FAST;
        }
@@ -465,7 +478,8 @@ static int aml_aes_handle_queue(struct aml_aes_dev *dd,
 
        err = aml_aes_write_ctrl(dd);
        if (!err) {
-               if (dd->total % AML_AES_DMA_THRESHOLD == 0)
+               if (dd->total % AML_AES_DMA_THRESHOLD == 0 ||
+                       (dd->flags & AES_FLAGS_CTR))
                        err = aml_aes_crypt_dma_start(dd);
                else {
                        pr_err("size %zd is not multiple of %d",
@@ -496,6 +510,10 @@ static int aml_aes_crypt_dma_stop(struct aml_aes_dev *dd)
                                        dd->fast_nents, DMA_FROM_DEVICE);
                        dma_unmap_sg(dd->dev, dd->in_sg,
                                        dd->fast_nents, DMA_TO_DEVICE);
+                       if (dd->flags & AES_FLAGS_CBC)
+                               scatterwalk_map_and_copy(dd->req->info,
+                                               dd->out_sg, dd->fast_total - 16,
+                                               16, 0);
                } else {
                        dma_sync_single_for_cpu(dd->dev, dd->dma_addr_out,
                                        dd->dma_size, DMA_FROM_DEVICE);
@@ -508,6 +526,10 @@ static int aml_aes_crypt_dma_stop(struct aml_aes_dev *dd)
                                err = -EINVAL;
                                pr_err("not all data converted: %zu\n", count);
                        }
+                       if (dd->flags & AES_FLAGS_CBC) {
+                               memcpy(dd->req->info, dd->buf_out +
+                                               dd->dma_size - 16, 16);
+                       }
                }
                dd->flags &= ~AES_FLAGS_DMA;
        }
@@ -596,7 +618,8 @@ static int aml_aes_crypt(struct ablkcipher_request *req, unsigned long mode)
        struct aml_aes_reqctx *rctx = ablkcipher_request_ctx(req);
        struct aml_aes_dev *dd;
 
-       if (!IS_ALIGNED(req->nbytes, AES_BLOCK_SIZE)) {
+       if (!IS_ALIGNED(req->nbytes, AES_BLOCK_SIZE) &&
+                       !(mode & AES_FLAGS_CTR)) {
                pr_err("request size is not exact amount of AES blocks\n");
                return -EINVAL;
        }

diff --git a/drivers/amlogic/crypto/aml-tdes-dma.c b/drivers/amlogic/crypto/aml-tdes-dma.c
index 87f6ce1..e0c261a 100644 (file)
--- a/drivers/amlogic/crypto/aml-tdes-dma.c
+++ b/drivers/amlogic/crypto/aml-tdes-dma.c
@@ -127,6 +127,7 @@ static int set_tdes_key_iv(struct aml_tdes_dev *dd,
        uint32_t key_iv[12];
        uint32_t *piv = key_iv + 8;
        uint32_t len = keylen;
+       uint32_t processed = 0;
        dma_addr_t dma_addr_key;
        uint32_t i = 0;
 
@@ -149,15 +150,16 @@ static int set_tdes_key_iv(struct aml_tdes_dev *dd,
        }
 
        while (len > 0) {
+               processed = len > 16 ? 16 : len;
                dsc[i].src_addr = (uint32_t)dma_addr_key + i * 16;
                dsc[i].tgt_addr = i * 16;
                dsc[i].dsc_cfg.d32 = 0;
-               dsc[i].dsc_cfg.b.length = len > 16 ? 16 : len;
+               dsc[i].dsc_cfg.b.length = processed;
                dsc[i].dsc_cfg.b.mode = MODE_KEY;
                dsc[i].dsc_cfg.b.eoc = 0;
                dsc[i].dsc_cfg.b.owner = 1;
                i++;
-               len -= 16;
+               len -= processed;
        }
        dsc[i - 1].dsc_cfg.b.eoc = 1;