Messages in this thread Patch in this message | | | From | wangwudi <> | Subject | [PATCH 1/1] Revert "iommu/arm-smmu-v3: Set TTL invalidation hint better" | Date | Mon, 31 Jul 2023 14:21:22 +0800 |
| |
From: Rui Zhu <zhurui3@huawei.com>
This reverts commit 6833b8f2e19945a41e4d5efd8c6d9f4cae9a5b7d.
This constraint violates the protocol. When tg is not 0 but ttl, scale, and num are 0, the hardware reports the CERROR_IL gerror. In the protocol, leaf is not a prerequisite for TTL.
Cc: Will Deacon <will@kernel.org> Cc: Robin Murphy <robin.murphy@arm.com> Cc: Joerg Roedel <joro@8bytes.org> Cc: Lu Baolu <baolu.lu@linux.intel.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Yicong Yang <yangyicong@hisilicon.com> Cc: Tomas Krcka <krckatom@amazon.de> Cc: Jean-Philippe Brucker <jean-philippe@linaro.org> Cc: Nicolin Chen <nicolinc@nvidia.com> Cc: Rui Zhu <zhurui3@huawei.com>
Signed-off-by: Rui Zhu <zhurui3@huawei.com> --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c index 9b0dc3505601..098e84cfa82f 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -1898,13 +1898,8 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, /* Convert page size of 12,14,16 (log2) to 1,2,3 */ cmd->tlbi.tg = (tg - 10) / 2; - /* - * Determine what level the granule is at. For non-leaf, io-pgtable - * assumes .tlb_flush_walk can invalidate multiple levels at once, - * so ignore the nominal last-level granule and leave TTL=0. - */ - if (cmd->tlbi.leaf) - cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); + /* Determine what level the granule is at */ + cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3)); num_pages = size >> tg; } -- 1.8.3.1
| |