hw/arm/smmu: Introduce smmu_get_iotlb_key()
Introduce the smmu_get_iotlb_key() helper and the SMMU_IOTLB_ASID() macro. Also move smmu_get_iotlb_key and smmu_iotlb_key_hash in the IOTLB related code section. Signed-off-by: Eric Auger <eric.auger@redhat.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 20200728150815.11446-4-eric.auger@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
6808bca939
commit
60a61f1b31
|
@ -32,10 +32,42 @@
|
||||||
|
|
||||||
/* IOTLB Management */
|
/* IOTLB Management */
|
||||||
|
|
||||||
|
static guint smmu_iotlb_key_hash(gconstpointer v)
|
||||||
|
{
|
||||||
|
SMMUIOTLBKey *key = (SMMUIOTLBKey *)v;
|
||||||
|
uint32_t a, b, c;
|
||||||
|
|
||||||
|
/* Jenkins hash */
|
||||||
|
a = b = c = JHASH_INITVAL + sizeof(*key);
|
||||||
|
a += key->asid;
|
||||||
|
b += extract64(key->iova, 0, 32);
|
||||||
|
c += extract64(key->iova, 32, 32);
|
||||||
|
|
||||||
|
__jhash_mix(a, b, c);
|
||||||
|
__jhash_final(a, b, c);
|
||||||
|
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
static gboolean smmu_iotlb_key_equal(gconstpointer v1, gconstpointer v2)
|
||||||
|
{
|
||||||
|
const SMMUIOTLBKey *k1 = v1;
|
||||||
|
const SMMUIOTLBKey *k2 = v2;
|
||||||
|
|
||||||
|
return (k1->asid == k2->asid) && (k1->iova == k2->iova);
|
||||||
|
}
|
||||||
|
|
||||||
|
SMMUIOTLBKey smmu_get_iotlb_key(uint16_t asid, uint64_t iova)
|
||||||
|
{
|
||||||
|
SMMUIOTLBKey key = {.asid = asid, .iova = iova};
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
|
||||||
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg,
|
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg,
|
||||||
hwaddr iova)
|
hwaddr iova)
|
||||||
{
|
{
|
||||||
SMMUIOTLBKey key = {.asid = cfg->asid, .iova = iova};
|
SMMUIOTLBKey key = smmu_get_iotlb_key(cfg->asid, iova);
|
||||||
IOMMUTLBEntry *entry = g_hash_table_lookup(bs->iotlb, &key);
|
IOMMUTLBEntry *entry = g_hash_table_lookup(bs->iotlb, &key);
|
||||||
|
|
||||||
if (entry) {
|
if (entry) {
|
||||||
|
@ -62,8 +94,7 @@ void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, IOMMUTLBEntry *entry)
|
||||||
smmu_iotlb_inv_all(bs);
|
smmu_iotlb_inv_all(bs);
|
||||||
}
|
}
|
||||||
|
|
||||||
key->asid = cfg->asid;
|
*key = smmu_get_iotlb_key(cfg->asid, entry->iova);
|
||||||
key->iova = entry->iova;
|
|
||||||
trace_smmu_iotlb_insert(cfg->asid, entry->iova);
|
trace_smmu_iotlb_insert(cfg->asid, entry->iova);
|
||||||
g_hash_table_insert(bs->iotlb, key, entry);
|
g_hash_table_insert(bs->iotlb, key, entry);
|
||||||
}
|
}
|
||||||
|
@ -80,12 +111,12 @@ static gboolean smmu_hash_remove_by_asid(gpointer key, gpointer value,
|
||||||
uint16_t asid = *(uint16_t *)user_data;
|
uint16_t asid = *(uint16_t *)user_data;
|
||||||
SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key;
|
SMMUIOTLBKey *iotlb_key = (SMMUIOTLBKey *)key;
|
||||||
|
|
||||||
return iotlb_key->asid == asid;
|
return SMMU_IOTLB_ASID(*iotlb_key) == asid;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova)
|
inline void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova)
|
||||||
{
|
{
|
||||||
SMMUIOTLBKey key = {.asid = asid, .iova = iova};
|
SMMUIOTLBKey key = smmu_get_iotlb_key(asid, iova);
|
||||||
|
|
||||||
trace_smmu_iotlb_inv_iova(asid, iova);
|
trace_smmu_iotlb_inv_iova(asid, iova);
|
||||||
g_hash_table_remove(s->iotlb, &key);
|
g_hash_table_remove(s->iotlb, &key);
|
||||||
|
@ -383,31 +414,6 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static guint smmu_iotlb_key_hash(gconstpointer v)
|
|
||||||
{
|
|
||||||
SMMUIOTLBKey *key = (SMMUIOTLBKey *)v;
|
|
||||||
uint32_t a, b, c;
|
|
||||||
|
|
||||||
/* Jenkins hash */
|
|
||||||
a = b = c = JHASH_INITVAL + sizeof(*key);
|
|
||||||
a += key->asid;
|
|
||||||
b += extract64(key->iova, 0, 32);
|
|
||||||
c += extract64(key->iova, 32, 32);
|
|
||||||
|
|
||||||
__jhash_mix(a, b, c);
|
|
||||||
__jhash_final(a, b, c);
|
|
||||||
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
static gboolean smmu_iotlb_key_equal(gconstpointer v1, gconstpointer v2)
|
|
||||||
{
|
|
||||||
const SMMUIOTLBKey *k1 = v1;
|
|
||||||
const SMMUIOTLBKey *k2 = v2;
|
|
||||||
|
|
||||||
return (k1->asid == k2->asid) && (k1->iova == k2->iova);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Unmap the whole notifier's range */
|
/* Unmap the whole notifier's range */
|
||||||
static void smmu_unmap_notifier_range(IOMMUNotifier *n)
|
static void smmu_unmap_notifier_range(IOMMUNotifier *n)
|
||||||
{
|
{
|
||||||
|
|
|
@ -96,4 +96,5 @@ uint64_t iova_level_offset(uint64_t iova, int inputsize,
|
||||||
MAKE_64BIT_MASK(0, gsz - 3);
|
MAKE_64BIT_MASK(0, gsz - 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#define SMMU_IOTLB_ASID(key) ((key).asid)
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -155,6 +155,7 @@ IOMMUMemoryRegion *smmu_iommu_mr(SMMUState *s, uint32_t sid);
|
||||||
|
|
||||||
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, hwaddr iova);
|
IOMMUTLBEntry *smmu_iotlb_lookup(SMMUState *bs, SMMUTransCfg *cfg, hwaddr iova);
|
||||||
void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, IOMMUTLBEntry *entry);
|
void smmu_iotlb_insert(SMMUState *bs, SMMUTransCfg *cfg, IOMMUTLBEntry *entry);
|
||||||
|
SMMUIOTLBKey smmu_get_iotlb_key(uint16_t asid, uint64_t iova);
|
||||||
void smmu_iotlb_inv_all(SMMUState *s);
|
void smmu_iotlb_inv_all(SMMUState *s);
|
||||||
void smmu_iotlb_inv_asid(SMMUState *s, uint16_t asid);
|
void smmu_iotlb_inv_asid(SMMUState *s, uint16_t asid);
|
||||||
void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova);
|
void smmu_iotlb_inv_iova(SMMUState *s, uint16_t asid, dma_addr_t iova);
|
||||||
|
|
Loading…
Reference in a new issue