|
@@ -803,16 +803,18 @@ static inline bool vtd_is_fl_level_supported(IntelIOMMUState *s, uint32_t level)
|
|
|
}
|
|
|
|
|
|
/* Return true if check passed, otherwise false */
|
|
|
-static inline bool vtd_pe_type_check(X86IOMMUState *x86_iommu,
|
|
|
- VTDPASIDEntry *pe)
|
|
|
+static inline bool vtd_pe_type_check(IntelIOMMUState *s, VTDPASIDEntry *pe)
|
|
|
{
|
|
|
switch (VTD_PE_GET_TYPE(pe)) {
|
|
|
- case VTD_SM_PASID_ENTRY_SLT:
|
|
|
- return true;
|
|
|
- case VTD_SM_PASID_ENTRY_PT:
|
|
|
- return x86_iommu->pt_supported;
|
|
|
case VTD_SM_PASID_ENTRY_FLT:
|
|
|
+ return !!(s->ecap & VTD_ECAP_FLTS);
|
|
|
+ case VTD_SM_PASID_ENTRY_SLT:
|
|
|
+ return !!(s->ecap & VTD_ECAP_SLTS);
|
|
|
case VTD_SM_PASID_ENTRY_NESTED:
|
|
|
+ /* Not support NESTED page table type yet */
|
|
|
+ return false;
|
|
|
+ case VTD_SM_PASID_ENTRY_PT:
|
|
|
+ return !!(s->ecap & VTD_ECAP_PT);
|
|
|
default:
|
|
|
/* Unknown type */
|
|
|
return false;
|
|
@@ -861,7 +863,6 @@ static int vtd_get_pe_in_pasid_leaf_table(IntelIOMMUState *s,
|
|
|
uint8_t pgtt;
|
|
|
uint32_t index;
|
|
|
dma_addr_t entry_size;
|
|
|
- X86IOMMUState *x86_iommu = X86_IOMMU_DEVICE(s);
|
|
|
|
|
|
index = VTD_PASID_TABLE_INDEX(pasid);
|
|
|
entry_size = VTD_PASID_ENTRY_SIZE;
|
|
@@ -875,7 +876,7 @@ static int vtd_get_pe_in_pasid_leaf_table(IntelIOMMUState *s,
|
|
|
}
|
|
|
|
|
|
/* Do translation type check */
|
|
|
- if (!vtd_pe_type_check(x86_iommu, pe)) {
|
|
|
+ if (!vtd_pe_type_check(s, pe)) {
|
|
|
return -VTD_FR_PASID_TABLE_ENTRY_INV;
|
|
|
}
|
|
|
|
|
@@ -3827,6 +3828,7 @@ static const Property vtd_properties[] = {
|
|
|
VTD_HOST_ADDRESS_WIDTH),
|
|
|
DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE),
|
|
|
DEFINE_PROP_BOOL("x-scalable-mode", IntelIOMMUState, scalable_mode, FALSE),
|
|
|
+ DEFINE_PROP_BOOL("x-flts", IntelIOMMUState, flts, FALSE),
|
|
|
DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false),
|
|
|
DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false),
|
|
|
DEFINE_PROP_BOOL("dma-drain", IntelIOMMUState, dma_drain, true),
|
|
@@ -4557,7 +4559,10 @@ static void vtd_cap_init(IntelIOMMUState *s)
|
|
|
}
|
|
|
|
|
|
/* TODO: read cap/ecap from host to decide which cap to be exposed. */
|
|
|
- if (s->scalable_mode) {
|
|
|
+ if (s->flts) {
|
|
|
+ s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_FLTS;
|
|
|
+ s->cap |= VTD_CAP_FS1GP;
|
|
|
+ } else if (s->scalable_mode) {
|
|
|
s->ecap |= VTD_ECAP_SMTS | VTD_ECAP_SRS | VTD_ECAP_SLTS;
|
|
|
}
|
|
|
|
|
@@ -4736,6 +4741,11 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp)
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ if (!s->scalable_mode && s->flts) {
|
|
|
+ error_setg(errp, "x-flts is only available in scalable mode");
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
if (!s->flts && s->aw_bits != VTD_HOST_AW_39BIT &&
|
|
|
s->aw_bits != VTD_HOST_AW_48BIT) {
|
|
|
error_setg(errp, "%s: supported values for aw-bits are: %d, %d",
|