summaryrefslogtreecommitdiffstats
path: root/drivers/iommu/arm-smmu-v3.c
diff options
context:
space:
mode:
authorshameer <shameerali.kolothum.thodi@huawei.com>2017-05-17 10:12:05 +0100
committerWill Deacon <will.deacon@arm.com>2017-06-23 17:58:04 +0100
commit99caf177f6fd3e67575f6ce05b36e8e041bcef60 (patch)
tree1e0df3e173263c726b8883b452505fde07b8ed4f /drivers/iommu/arm-smmu-v3.c
parente5b829de053d9994dfc8652ce558e90e3406c578 (diff)
downloadop-kernel-dev-99caf177f6fd3e67575f6ce05b36e8e041bcef60.zip
op-kernel-dev-99caf177f6fd3e67575f6ce05b36e8e041bcef60.tar.gz
iommu/arm-smmu-v3: Enable ACPI based HiSilicon CMD_PREFETCH quirk(erratum 161010701)
HiSilicon SMMUv3 on Hip06/Hip07 platforms doesn't support CMD_PREFETCH command. The dt based support for this quirk is already present in the driver(hisilicon,broken-prefetch-cmd). This adds ACPI support for the quirk using the IORT smmu model number. Signed-off-by: shameer <shameerali.kolothum.thodi@huawei.com> Signed-off-by: hanjun <guohanjun@huawei.com> [will: rewrote patch] Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu-v3.c')
-rw-r--r--drivers/iommu/arm-smmu-v3.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index 2d5b48b..81fc1b5 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -414,6 +414,10 @@
#define MSI_IOVA_LENGTH 0x100000
/* Until ACPICA headers cover IORT rev. C */
+#ifndef ACPI_IORT_SMMU_HISILICON_HI161X
+#define ACPI_IORT_SMMU_HISILICON_HI161X 0x1
+#endif
+
#ifndef ACPI_IORT_SMMU_V3_CAVIUM_CN99XX
#define ACPI_IORT_SMMU_V3_CAVIUM_CN99XX 0x2
#endif
@@ -2616,8 +2620,14 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)
#ifdef CONFIG_ACPI
static void acpi_smmu_get_options(u32 model, struct arm_smmu_device *smmu)
{
- if (model == ACPI_IORT_SMMU_V3_CAVIUM_CN99XX)
+ switch (model) {
+ case ACPI_IORT_SMMU_V3_CAVIUM_CN99XX:
smmu->options |= ARM_SMMU_OPT_PAGE0_REGS_ONLY;
+ break;
+ case ACPI_IORT_SMMU_HISILICON_HI161X:
+ smmu->options |= ARM_SMMU_OPT_SKIP_PREFETCH;
+ break;
+ }
dev_notice(smmu->dev, "option mask 0x%x\n", smmu->options);
}
OpenPOWER on IntegriCloud