diff options
| author | Linu Cherian | 2017-06-22 14:05:36 +0200 |
|---|---|---|
| committer | Will Deacon | 2017-06-23 18:58:03 +0200 |
| commit | 403e8c7c5bcaff3291a2c7012fe80f707a854d10 (patch) | |
| tree | 4cfc2419cf14a9d509200c73632ce9369f4a9abd /drivers/acpi/arm64 | |
| parent | iommu/arm-smmu-v3, acpi: Add temporary Cavium SMMU-V3 IORT model number defin... (diff) | |
| download | kernel-qcow2-linux-403e8c7c5bcaff3291a2c7012fe80f707a854d10.tar.gz kernel-qcow2-linux-403e8c7c5bcaff3291a2c7012fe80f707a854d10.tar.xz kernel-qcow2-linux-403e8c7c5bcaff3291a2c7012fe80f707a854d10.zip | |
ACPI/IORT: Fixup SMMUv3 resource size for Cavium ThunderX2 SMMUv3 model
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>
Diffstat (limited to 'drivers/acpi/arm64')
| -rw-r--r-- | drivers/acpi/arm64/iort.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index da225710b009..a8ebda9f7e97 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -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++; |