From c8c9b36a1b7ddcfa05fb721c253cdb639e4d4011 Mon Sep 17 00:00:00 2001
From: Yang Yingliang <yangyingliang@huawei.com>
Date: Wed, 30 Jan 2019 17:38:08 +0800
Subject: [PATCH] Revert "config: disable CONFIG_SMMU_V3 temporary"

euler inclusion
category: bugfix
bugzilla: 5452
CVE: NA

021e3b3 iommu/arm-smmu-v3: workaround for STE abort in kdump kernel
7a7f137 iommu/arm-smmu-v3: make smmu can be enabled in kdump kernel
2886b40 iommu/arm-smmu-v3: make sure the stale caching of L1STD are invalid

With this patchset, SMMUv3 can be enabled.

-------------------------------------------

This reverts commit 2f8319f2ea358ecf6ab2e4fa9f01277732237071.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 arch/arm64/configs/hulk_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig
index 73a08158fb3a..7bd7d13943f9 100644
--- a/arch/arm64/configs/hulk_defconfig
+++ b/arch/arm64/configs/hulk_defconfig
@@ -5945,7 +5945,7 @@ CONFIG_IOMMU_IOVA=y
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
 # CONFIG_ARM_SMMU is not set
-# CONFIG_ARM_SMMU_V3 is not set
+CONFIG_ARM_SMMU_V3=y
 # CONFIG_MTK_IOMMU is not set
 # CONFIG_QCOM_IOMMU is not set
 
-- 
GitLab