Previous patch Removed 'x-' prefix from 'x-flts' property. Opportunistically, this patch does s/flts/fsts for property name in order to better align with newer spec since revision 3.4 which changed terminology from "First-level" to "First-stage".
Signed-off-by: Zhenzhong Duan <[email protected]> --- docs/devel/vfio-iommufd.rst | 8 ++++---- hw/i386/intel_iommu.c | 10 +++++----- hw/i386/intel_iommu_accel.c | 6 +++--- tests/qtest/intel-iommu-test.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/devel/vfio-iommufd.rst b/docs/devel/vfio-iommufd.rst index 5755532443..d5538461ba 100644 --- a/docs/devel/vfio-iommufd.rst +++ b/docs/devel/vfio-iommufd.rst @@ -153,22 +153,22 @@ RAM discarding for mdev. ``vfio-ap`` and ``vfio-ccw`` devices don't have same issue as their backend devices are always mdev and RAM discarding is force enabled. -Usage with intel_iommu featuring flts=on +Usage with intel_iommu featuring fsts=on ------------------------------------------ Only IOMMUFD backed VFIO device is supported when intel_iommu is configured -with flts=on, for legacy container backed VFIO device, below error shows: +with fsts=on, for legacy container backed VFIO device, below error shows: .. code-block:: none - qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0: vfio 0000:02:00.0: Failed to set vIOMMU: Need IOMMUFD backend when flts=on + qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0: vfio 0000:02:00.0: Failed to set vIOMMU: Need IOMMUFD backend when fsts=on VFIO device under PCI bridge is unsupported, use PCIE bridge if necessary, otherwise below error shows: .. code-block:: none - qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0,bus=bridge1,iommufd=iommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device downstream to a PCI bridge is unsupported when flts=on + qemu-system-x86_64: -device vfio-pci,host=0000:02:00.0,bus=bridge1,iommufd=iommufd0: vfio 0000:02:00.0: Failed to set vIOMMU: Host device downstream to a PCI bridge is unsupported when fsts=on If host IOMMU has ERRATA_772415_SPR17, running guest with "intel_iommu=on,sm_off" is unsupported, kexec or reboot guest from "intel_iommu=on,sm_on" to diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c index fb6bbc3447..282c05ed19 100644 --- a/hw/i386/intel_iommu.c +++ b/hw/i386/intel_iommu.c @@ -4201,7 +4201,7 @@ static const Property vtd_properties[] = { VTD_HOST_ADDRESS_WIDTH), DEFINE_PROP_BOOL("caching-mode", IntelIOMMUState, caching_mode, FALSE), DEFINE_PROP_BOOL("scalable-mode", IntelIOMMUState, scalable_mode, FALSE), - DEFINE_PROP_BOOL("flts", IntelIOMMUState, fsts, FALSE), + DEFINE_PROP_BOOL("fsts", IntelIOMMUState, fsts, FALSE), DEFINE_PROP_BOOL("snoop-control", IntelIOMMUState, snoop_control, false), DEFINE_PROP_BOOL("x-pasid-mode", IntelIOMMUState, pasid, false), DEFINE_PROP_BOOL("svm", IntelIOMMUState, svm, false), @@ -5560,20 +5560,20 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (!s->scalable_mode && s->fsts) { - error_setg(errp, "flts is only available in scalable mode"); + error_setg(errp, "fsts is only available in scalable mode"); return false; } if (!s->fsts && 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", - s->scalable_mode ? "Scalable mode(flts=off)" : "Legacy mode", + s->scalable_mode ? "Scalable mode(fsts=off)" : "Legacy mode", VTD_HOST_AW_39BIT, VTD_HOST_AW_48BIT); return false; } if (s->fsts && s->aw_bits != VTD_HOST_AW_48BIT) { - error_setg(errp, "Scalable mode(flts=on): supported value for " + error_setg(errp, "Scalable mode(fsts=on): supported value for " "aw-bits is: %d", VTD_HOST_AW_48BIT); return false; } @@ -5590,7 +5590,7 @@ static bool vtd_decide_config(IntelIOMMUState *s, Error **errp) } if (!s->fsts) { - error_setg(errp, "Need to set flts for svm"); + error_setg(errp, "Need to set fsts for svm"); return false; } diff --git a/hw/i386/intel_iommu_accel.c b/hw/i386/intel_iommu_accel.c index b28d5eb9fa..43d2993fb3 100644 --- a/hw/i386/intel_iommu_accel.c +++ b/hw/i386/intel_iommu_accel.c @@ -26,7 +26,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMMUDevice *vtd_hiod, PCIDevice *pdev = bus->devices[vtd_hiod->devfn]; if (!object_dynamic_cast(OBJECT(hiod), TYPE_HOST_IOMMU_DEVICE_IOMMUFD)) { - error_setg(errp, "Need IOMMUFD backend when flts=on"); + error_setg(errp, "Need IOMMUFD backend when fsts=on"); return false; } @@ -44,7 +44,7 @@ bool vtd_check_hiod_accel(IntelIOMMUState *s, VTDHostIOMMUDevice *vtd_hiod, if (pci_device_get_iommu_bus_devfn(pdev, &bus, NULL, NULL)) { error_setg(errp, "Host device downstream to a PCI bridge is " - "unsupported when flts=on"); + "unsupported when fsts=on"); return false; } @@ -105,7 +105,7 @@ static bool vtd_device_attach_iommufd(VTDHostIOMMUDevice *vtd_hiod, bool ret; /* - * We can get here only if flts=on, the supported PGTT is FST or PT. + * We can get here only if fsts=on, the supported PGTT is FST or PT. * Catch invalid PGTT when processing invalidation request to avoid * attaching to wrong hwpt. */ diff --git a/tests/qtest/intel-iommu-test.c b/tests/qtest/intel-iommu-test.c index 4f12c56260..30ee6524df 100644 --- a/tests/qtest/intel-iommu-test.c +++ b/tests/qtest/intel-iommu-test.c @@ -29,7 +29,7 @@ static void test_intel_iommu_stage_1(void) uint64_t cap, ecap, tmp; QTestState *s; - s = qtest_init("-M q35 -device intel-iommu,scalable-mode=on,flts=on"); + s = qtest_init("-M q35 -device intel-iommu,scalable-mode=on,fsts=on"); cap = vtd_reg_readq(s, DMAR_CAP_REG); g_assert((cap & CAP_STAGE_1_FIXED1) == CAP_STAGE_1_FIXED1); -- 2.47.3
