74 lines
2.8 KiB
Diff
74 lines
2.8 KiB
Diff
From 62e581d9c6adfa3aebcefa8c5270aa6fc38ed541 Mon Sep 17 00:00:00 2001
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
Date: Fri, 18 Nov 2022 15:22:32 +0800
|
|
Subject: [PATCH 14/36] Revert "hw/arm/smmuv3: Fill the IOTLBEntry leaf field
|
|
on NH_VA invalidation"
|
|
|
|
This reverts commit c219274b7b6a472d7340a4f72a052ba33ed19659.
|
|
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
---
|
|
hw/arm/smmuv3.c | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c
|
|
index cceb3794d4..3751fb3ea8 100644
|
|
--- a/hw/arm/smmuv3.c
|
|
+++ b/hw/arm/smmuv3.c
|
|
@@ -804,7 +804,7 @@ epilogue:
|
|
static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
|
|
IOMMUNotifier *n,
|
|
int asid, dma_addr_t iova,
|
|
- uint8_t tg, uint64_t num_pages, bool leaf)
|
|
+ uint8_t tg, uint64_t num_pages)
|
|
{
|
|
SMMUDevice *sdev = container_of(mr, SMMUDevice, iommu);
|
|
IOMMUTLBEvent event = {};
|
|
@@ -839,7 +839,6 @@ static void smmuv3_notify_iova(IOMMUMemoryRegion *mr,
|
|
event.entry.perm = IOMMU_NONE;
|
|
event.entry.flags = IOMMU_INV_FLAGS_ARCHID;
|
|
event.entry.arch_id = asid;
|
|
- event.entry.leaf = leaf;
|
|
|
|
memory_region_notify_iommu_one(n, &event);
|
|
}
|
|
@@ -871,7 +870,7 @@ static void smmuv3_notify_asid(IOMMUMemoryRegion *mr,
|
|
|
|
/* invalidate an asid/iova range tuple in all mr's */
|
|
static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, dma_addr_t iova,
|
|
- uint8_t tg, uint64_t num_pages, bool leaf)
|
|
+ uint8_t tg, uint64_t num_pages)
|
|
{
|
|
SMMUDevice *sdev;
|
|
|
|
@@ -883,7 +882,7 @@ static void smmuv3_inv_notifiers_iova(SMMUState *s, int asid, dma_addr_t iova,
|
|
tg, num_pages);
|
|
|
|
IOMMU_NOTIFIER_FOREACH(n, mr) {
|
|
- smmuv3_notify_iova(mr, n, asid, iova, tg, num_pages, leaf);
|
|
+ smmuv3_notify_iova(mr, n, asid, iova, tg, num_pages);
|
|
}
|
|
}
|
|
}
|
|
@@ -908,7 +907,7 @@ static void smmuv3_s1_range_inval(SMMUState *s, Cmd *cmd)
|
|
|
|
if (!tg) {
|
|
trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, 1, ttl, leaf);
|
|
- smmuv3_inv_notifiers_iova(s, asid, addr, tg, 1, leaf);
|
|
+ smmuv3_inv_notifiers_iova(s, asid, addr, tg, 1);
|
|
smmu_iotlb_inv_iova(s, asid, addr, tg, 1, ttl);
|
|
return;
|
|
}
|
|
@@ -926,7 +925,7 @@ static void smmuv3_s1_range_inval(SMMUState *s, Cmd *cmd)
|
|
|
|
num_pages = (mask + 1) >> granule;
|
|
trace_smmuv3_s1_range_inval(vmid, asid, addr, tg, num_pages, ttl, leaf);
|
|
- smmuv3_inv_notifiers_iova(s, asid, addr, tg, num_pages, leaf);
|
|
+ smmuv3_inv_notifiers_iova(s, asid, addr, tg, num_pages);
|
|
smmu_iotlb_inv_iova(s, asid, addr, tg, num_pages, ttl);
|
|
addr += mask + 1;
|
|
}
|
|
--
|
|
2.27.0
|
|
|