Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshche...@epam.com>
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda...@renesas.com>
---
Changes V1 -> V2:
- add R-b
- add ASSERT() in ipmmu_utlb_disable()
---
xen/drivers/passthrough/arm/ipmmu-vmsa.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
index 649b9f6..1224ea4 100644
--- a/xen/drivers/passthrough/arm/ipmmu-vmsa.c
+++ b/xen/drivers/passthrough/arm/ipmmu-vmsa.c
@@ -127,6 +127,7 @@ struct ipmmu_vmsa_device {
spinlock_t lock; /* Protects ctx and domains[] */
DECLARE_BITMAP(ctx, IPMMU_CTX_MAX);
struct ipmmu_vmsa_domain *domains[IPMMU_CTX_MAX];
+ unsigned int utlb_refcount[IPMMU_UTLB_MAX];
const struct ipmmu_features *features;
};
@@ -467,13 +468,12 @@ static int ipmmu_utlb_enable(struct
ipmmu_vmsa_domain *domain,
}
}
- /*
- * TODO: Reference-count the micro-TLB as several bus masters
can be
- * connected to the same micro-TLB.
- */
- ipmmu_imuasid_write(mmu, utlb, 0);
- ipmmu_imuctr_write(mmu, utlb, imuctr |
- IMUCTR_TTSEL_MMU(domain->context_id) |
IMUCTR_MMUEN);
+ if ( mmu->utlb_refcount[utlb]++ == 0 )
+ {
+ ipmmu_imuasid_write(mmu, utlb, 0);
+ ipmmu_imuctr_write(mmu, utlb, imuctr |
+ IMUCTR_TTSEL_MMU(domain->context_id) | IMUCTR_MMUEN);
+ }
return 0;
}
@@ -484,7 +484,10 @@ static void ipmmu_utlb_disable(struct
ipmmu_vmsa_domain *domain,
{
struct ipmmu_vmsa_device *mmu = domain->mmu;
- ipmmu_imuctr_write(mmu, utlb, 0);
+ ASSERT(mmu->utlb_refcount[utlb] > 0);
+
+ if ( --mmu->utlb_refcount[utlb] == 0 )
+ ipmmu_imuctr_write(mmu, utlb, 0);
}
/* Domain/Context Management */