diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index a65f1f835e7dd811acd89311f910d06dd9a3422e..d6c04563f60d5871e3efd6603f69c0ca2ad01cb6 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -409,13 +409,16 @@ config VIRTIO_IOMMU
 
 	  Say Y here if you intend to run this kernel as a guest.
 
-config  SMMU_BYPASS_DEV
+config SMMU_BYPASS_DEV
 	bool "SMMU bypass streams for some specific devices"
 	depends on ARM_SMMU_V3=y
 	help
-	  according smmu.bypassdev cmdline, SMMU performs attribute
-	  transformation only,with no address translation.
-	  E.g:SMMU allow iMR3408/3416 Raid bypass at DMA default domain
-	  to support other devices Virtualization through.
+	  Using the smmu.bypassdev cmdline, to collect the devices that SMMU
+	  performs attribute transformation only, with no address translation.
+	  E.g:SMMU allow iMR3408/3416 Raid bypass at DMA default domain to
+	  support other devices to use virtualization such as VFIO.
+
+	  This feature will be replaced by ACPI IORT RMR node, which will be
+	  upstreamed in mainline.
 
 endif # IOMMU_SUPPORT
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c
index e96983dac939cc97f175927977f53fc11c6dd593..1f951070f519018e94bafb735e4212e377ac61d8 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c
@@ -1581,11 +1581,33 @@ static void arm_smmu_get_resv_regions(struct device *dev,
 	iommu_dma_get_resv_regions(dev, head);
 }
 
+#ifdef CONFIG_ARM64
+#include <asm/cputype.h>
+static bool cpu_using_identity_iommu_domain(struct device *dev)
+{
+	u32 midr = read_cpuid_id();
+
+	if (((midr & MIDR_CPU_MODEL_MASK) == MIDR_PHYTIUM_FT2000PLUS)
+		|| ((midr & MIDR_CPU_MODEL_MASK) == MIDR_PHYTIUM_FT2500))
+		return true;
+
+	return false;
+}
+#else
+static bool cpu_using_identity_iommu_domain(struct device *dev)
+{
+	return false;
+}
+#endif
+
 static int arm_smmu_def_domain_type(struct device *dev)
 {
 	struct arm_smmu_master_cfg *cfg = dev_iommu_priv_get(dev);
 	const struct arm_smmu_impl *impl = cfg->smmu->impl;
 
+	if (cpu_using_identity_iommu_domain(dev))
+		return IOMMU_DOMAIN_IDENTITY;
+
 	if (impl && impl->def_domain_type)
 		return impl->def_domain_type(dev);