| author | Matthew Shyu <matthew.shyu@amlogic.com> | 2018-01-15 09:07:21 (GMT) |
|---|---|---|
| committer | Xindong Xu <xindong.xu@amlogic.com> | 2018-01-30 05:32:17 (GMT) |
| commit | 7092268068d8f6a0cae2ab8d03a974d5e740ede4 (patch) | |
| tree | 9abece765b69c4ad3a2cd9a13389e3d5fd59e85c | |
| parent | 969526426953dcbb1a1f0d0098f3b33cbae615b5 (diff) | |
| download | common-7092268068d8f6a0cae2ab8d03a974d5e740ede4.zip common-7092268068d8f6a0cae2ab8d03a974d5e740ede4.tar.gz common-7092268068d8f6a0cae2ab8d03a974d5e740ede4.tar.bz2 | |
crypto: Enable EXT4_ENCRYPTION for file based encryption for kernel@1227
PD#158397: crypto: enable FBE
1. Encrypto CONFIG_EXT4_ENCRYPTION for file based encryption
2. Disable HW crypto driver for the time being for bug fixing
Change-Id: Id8d8589147ed642dcd535040cbcc10a9b27f054e
Signed-off-by: Matthew Shyu <matthew.shyu@amlogic.com>
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesonaxg.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesongxl.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesongxm.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesontxlx.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/configs/meson64_defconfig | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi index 9d3b953..b365fcc 100644 --- a/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesonaxg.dtsi @@ -723,7 +723,7 @@ aml_aes { compatible = "amlogic,aes_dma"; dev_name = "aml_aes_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 180 1 0 181 1>; reg = <0x0 0xff63e000 0x0 0x48>; }; @@ -731,7 +731,7 @@ aml_sha { compatible = "amlogic,sha_dma"; dev_name = "aml_sha_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 180 1 0 181 1>; reg = <0x0 0xff63e000 0x0 0x48>; }; diff --git a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi index 79a7453..ed6d423 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxl.dtsi @@ -1022,7 +1022,7 @@ aml_aes { compatible = "amlogic,aes_dma"; dev_name = "aml_aes_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; @@ -1030,7 +1030,7 @@ aml_tdes { compatible = "amlogic,des_dma,tdes_dma"; dev_name = "aml_tdes_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; @@ -1038,7 +1038,7 @@ aml_sha { compatible = "amlogic,sha_dma"; dev_name = "aml_sha_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; diff --git a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi index b33ce50..1e31e56 100644 --- a/arch/arm64/boot/dts/amlogic/mesongxm.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesongxm.dtsi @@ -1130,7 +1130,7 @@ aml_aes { compatible = "amlogic,aes_dma"; dev_name = "aml_aes_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; @@ -1138,7 +1138,7 @@ aml_tdes { compatible = "amlogic,des_dma,tdes_dma"; dev_name = "aml_tdes_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; @@ -1146,7 +1146,7 @@ aml_sha { compatible = "amlogic,sha_dma"; dev_name = "aml_sha_dma"; - status = "okay"; + status = "disabled"; interrupts = <0 188 1 0 189 1>; reg = <0x0 0xc883e000 0x0 0x28>; }; diff --git a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi index 4572a8e..a793f6f 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxlx.dtsi @@ -528,19 +528,19 @@ aml_aes { compatible = "amlogic,aes_dma"; dev_name = "aml_aes_dma"; - status = "okay"; + status = "disabled"; }; aml_tdes { compatible = "amlogic,des_dma,tdes_dma"; dev_name = "aml_tdes_dma"; - status = "okay"; + status = "disabled"; }; aml_sha { compatible = "amlogic,sha_dma"; dev_name = "aml_sha_dma"; - status = "okay"; + status = "disabled"; }; }; diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig index 53b8625..a2171ba 100644 --- a/arch/arm64/configs/meson64_defconfig +++ b/arch/arm64/configs/meson64_defconfig @@ -491,6 +491,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 @@ -537,7 +538,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 |