From c3f76fb7fd391d18938226d4d823b3f8f0c5cef6 Mon Sep 17 00:00:00 2001 From: Fang Lijun Date: Sat, 18 May 2019 22:10:00 +0800 Subject: [PATCH] Enable SMMU SVA frature config for hulk_defconfig and syzkaller_defconfig hulk inclusion category: feature bugzilla: 14369 CVE: NA ------------------- Enable following config: CONFIG_IOMMU_PASID_TABLE CONFIG_ARM_SMMU_V3_CONTEXT CONFIG_IOMMU_SVA CONFIG_IOMMU_PAGE_FAULT Signed-off-by: Fang Lijun Reviewed-by: Hanjun Guo Reviewed-by: Zhen Lei Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 8 ++++++++ arch/arm64/configs/syzkaller_defconfig | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 0cd60e984c63..f3d83ee6f6fd 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -4566,11 +4566,19 @@ CONFIG_IOMMU_IO_PGTABLE=y CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set + +# +# Generic PASID table support +# +CONFIG_IOMMU_PASID_TABLE=y +CONFIG_ARM_SMMU_V3_CONTEXT=y # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_IOVA=y CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y +CONFIG_IOMMU_SVA=y +CONFIG_IOMMU_PAGE_FAULT=y CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU_V3=y # CONFIG_QCOM_IOMMU is not set diff --git a/arch/arm64/configs/syzkaller_defconfig b/arch/arm64/configs/syzkaller_defconfig index 369ef8f78702..917e07840016 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -4543,11 +4543,19 @@ CONFIG_IOMMU_IO_PGTABLE=y CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set + +# +# Generic PASID table support +# +CONFIG_IOMMU_PASID_TABLE=y +CONFIG_ARM_SMMU_V3_CONTEXT=y # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_IOVA=y CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y +CONFIG_IOMMU_SVA=y +CONFIG_IOMMU_PAGE_FAULT=y CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU_V3=y # CONFIG_QCOM_IOMMU is not set -- GitLab