iommu/tegra-smmu: Fix TLB line for Tegra210
cover iommu/tegra-smmu: Fix TLB line for Tegra210
These two patches fix ACTIVE_TLB_LINES field setting in tegra-smmu driver for Tegra210 platforms.
This resend in series groups two previous seperate changes that're corelated, being pointed out by Thierry. Also adding his Acked-by.
Nicolin Chen (2):
iommu/tegra-smmu: Fix tlb_mask
memory: tegra: Correct num_tlb_lines for tegra210
drivers/iommu/tegra-smmu.c | 2 +- drivers/memory/tegra/tegra210.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH RESEND 1/2 iommu/tegra-smmu: Fix tlb_mask
The "num_tlb_lines" might not be a power-of-2 value, being 48 on Tegra210 for example. So the current way of calculating tlb_mask using the num_tlb_lines is not correct: tlb_mask=0x5f in case of num_tlb_lines=48, which will trim a setting of 0x30 (48) to 0x10.
--- drivers/iommu/tegra-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/tegra-smmu.c +1 -1
@@ -1120,7 +1120,7 @@ struct tegra_smmu *tegra_smmu_probe(struct device *dev,BIT_MASK (mc->soc->num_address_bits -SMMU_PTE_SHIFT ) -1 ;dev_dbg (dev,"address bits: %u, PFN mask: %#lx\n" , mc->soc->num_address_bits, smmu->pfn_mask); - smmu->tlb_mask = (smmu->soc->num_tlb_lines <<1 ) -1 ; + smmu->tlb_mask = (1 <<fls (smmu->soc->num_tlb_lines)) -1 ;dev_dbg (dev,"TLB lines: %u, mask: %#lx\n" , smmu->soc->num_tlb_lines, smmu->tlb_mask);
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH RESEND 2/2 memory: tegra: Correct num_tlb_lines for tegra210
In reply to Nicolin ChenAccording to Tegra210 TRM, the default value of TLB_ACTIVE_LINES field of register MC_SMMU_TLB_CONFIG_0 is 0x30. So num_tlb_lines should be 48 (0x30) rather than 32 (0x20).
--- drivers/memory/tegra/tegra210.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/memory/tegra/tegra210.c +1 -1
@@ -1074,7 +1074,7 @@ static const struct tegra_smmu_soc tegra210_smmu_soc = { .num_groups = ARRAY_SIZE(tegra210_groups), .supports_round_robin_arbitration = true, .supports_request_limit = true, - .num_tlb_lines = 32, + .num_tlb_lines = 48, .num_asids = 128, };
Signature · 6 lines
2.17.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 6 lines · Nicolin Chen
These two patches fix
ACTIVE_TLB_LINESfield setting in tegra-smmu driver for Tegra210 platforms.This resend in series groups two previous seperate changes that're corelated, being pointed out by Thierry. Also adding his Acked-by.
Quoted 7 lines
Nicolin Chen (2):
iommu/tegra-smmu: Fixtlb_mask
memory: tegra: Correctnum_tlb_linesfor tegra210drivers/iommu/tegra-smmu.c | 2 +- drivers/memory/tegra/tegra210.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Applied, thanks.