ACPI/IORT: Fixup SMMUv3 resource size for Cavium ThunderX2 SMMUv3 model
authorLinu Cherian <linu.cherian@cavium.com>
Thu, 22 Jun 2017 12:05:36 +0000 (17:35 +0530)
committerWill Deacon <will.deacon@arm.com>
Fri, 23 Jun 2017 16:58:03 +0000 (17:58 +0100)
Cavium ThunderX2 implementation doesn't support second page in SMMU
register space. Hence, resource size is set as 64k for this model.

Signed-off-by: Linu Cherian <linu.cherian@cavium.com>
Signed-off-by: Geetha Sowjanya <geethasowjanya.akula@cavium.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
drivers/acpi/arm64/iort.c

index da22571..a8ebda9 100644 (file)
@@ -833,6 +833,18 @@ static int __init arm_smmu_v3_count_resources(struct acpi_iort_node *node)
        return num_res;
 }
 
+static unsigned long arm_smmu_v3_resource_size(struct acpi_iort_smmu_v3 *smmu)
+{
+       /*
+        * Override the size, for Cavium ThunderX2 implementation
+        * which doesn't support the page 1 SMMU register space.
+        */
+       if (smmu->model == ACPI_IORT_SMMU_V3_CAVIUM_CN99XX)
+               return SZ_64K;
+
+       return SZ_128K;
+}
+
 static void __init arm_smmu_v3_init_resources(struct resource *res,
                                              struct acpi_iort_node *node)
 {
@@ -843,7 +855,8 @@ static void __init arm_smmu_v3_init_resources(struct resource *res,
        smmu = (struct acpi_iort_smmu_v3 *)node->node_data;
 
        res[num_res].start = smmu->base_address;
-       res[num_res].end = smmu->base_address + SZ_128K - 1;
+       res[num_res].end = smmu->base_address +
+                               arm_smmu_v3_resource_size(smmu) - 1;
        res[num_res].flags = IORESOURCE_MEM;
 
        num_res++;