diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2015-07-06 23:30:17 -0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2015-07-08 12:24:39 -0400 |
| commit | e2f4c2330f08ba73d9a3c919a3d6ca33dce7d2c2 (patch) | |
| tree | 959c14ce9b8e53ca73aba64a8f46f8ccd9965e58 | |
| parent | 5d58c6207c300340151931ad9c2cdea2d1685dc4 (diff) | |
iommu/arm-smmu: Enlarge STRTAB_L1_SZ_SHIFT to support larger sidsize
Because we will choose the minimum value between STRTAB_L1_SZ_SHIFT and
IDR1.SIDSIZE, so enlarge STRTAB_L1_SZ_SHIFT will not impact the platforms
whose IDR1.SIDSIZE is smaller than old STRTAB_L1_SZ_SHIFT value.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
| -rw-r--r-- | drivers/iommu/arm-smmu-v3.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c index 98e987a3ed3a..29cba3280af7 100644 --- a/drivers/iommu/arm-smmu-v3.c +++ b/drivers/iommu/arm-smmu-v3.c | |||
| @@ -199,9 +199,10 @@ | |||
| 199 | * Stream table. | 199 | * Stream table. |
| 200 | * | 200 | * |
| 201 | * Linear: Enough to cover 1 << IDR1.SIDSIZE entries | 201 | * Linear: Enough to cover 1 << IDR1.SIDSIZE entries |
| 202 | * 2lvl: 8k L1 entries, 256 lazy entries per table (each table covers a PCI bus) | 202 | * 2lvl: 128k L1 entries, |
| 203 | * 256 lazy entries per table (each table covers a PCI bus) | ||
| 203 | */ | 204 | */ |
| 204 | #define STRTAB_L1_SZ_SHIFT 16 | 205 | #define STRTAB_L1_SZ_SHIFT 20 |
| 205 | #define STRTAB_SPLIT 8 | 206 | #define STRTAB_SPLIT 8 |
| 206 | 207 | ||
| 207 | #define STRTAB_L1_DESC_DWORDS 1 | 208 | #define STRTAB_L1_DESC_DWORDS 1 |