[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <d5fc1f72-7428-4fef-d868-d06b85add635@huawei.com>
Date: Fri, 4 Aug 2023 17:31:20 +0800
From: zhurui <zhurui3@...wei.com>
To: Will Deacon <will@...nel.org>
CC: <linux-arm-kernel@...ts.infradead.org>, <iommu@...ts.linux.dev>,
<linux-kernel@...r.kernel.org>,
Robin Murphy <robin.murphy@....com>,
Joerg Roedel <joro@...tes.org>,
Lu Baolu <baolu.lu@...ux.intel.com>,
Jason Gunthorpe <jgg@...pe.ca>,
Yicong Yang <yangyicong@...ilicon.com>,
Tomas Krcka <krckatom@...zon.de>,
Jean-Philippe Brucker <jean-philippe@...aro.org>,
Nicolin Chen <nicolinc@...dia.com>
Subject: [PATCH v2 1/1] iommu/arm-smmu-v3: Fix error case of range command
When tg != 0 but ttl, scale, num all 0 in a range tlbi command, it
is reserved and will cause the CERROR_ILL error. This case means
that the size to be invalidated is only one page size, and the
range invalidation is meaningless here. So we set tg to 0 in this
case to do an non-range invalidation instead.
Cc: Will Deacon <will@...nel.org>
Cc: Robin Murphy <robin.murphy@....com>
Cc: Joerg Roedel <joro@...tes.org>
Cc: Lu Baolu <baolu.lu@...ux.intel.com>
Cc: Jason Gunthorpe <jgg@...pe.ca>
Cc: Yicong Yang <yangyicong@...ilicon.com>
Cc: Tomas Krcka <krckatom@...zon.de>
Cc: Jean-Philippe Brucker <jean-philippe@...aro.org>
Cc: Nicolin Chen <nicolinc@...dia.com>
Cc: Rui Zhu <zhurui3@...wei.com>
Signed-off-by: Rui Zhu <zhurui3@...wei.com>
---
ChangeLog:
v1-->v2:
1. Change from "Revert" to modify the problematic case
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 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..5e56c7e85819 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1895,9 +1895,6 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
/* Get the leaf page size */
tg = __ffs(smmu_domain->domain.pgsize_bitmap);
- /* 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,
@@ -1930,6 +1927,12 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
num = (num_pages >> scale) & CMDQ_TLBI_RANGE_NUM_MAX;
cmd->tlbi.num = num - 1;
+ /* Prevent error caused by one page tlbi with leaf 0 */
+ if (scale == 0 && num == 1 && cmd->tlbi.leaf == 0)
+ cmd->tlbi.tg = 0;
+ else /* Convert page size of 12,14,16 (log2) to 1,2,3 */
+ cmd->tlbi.tg = (tg - 10) / 2;
+
/* range is num * 2^scale * pgsize */
inv_range = num << (scale + tg);
--
1.8.3.1
Powered by blists - more mailing lists