From: Nathan Chen <[email protected]> Allow accelerated SMMUv3 Range Invalidation support property to be derived from host IOMMU capabilities. Derive host values using IOMMU_GET_HW_INFO, retrieving RIL capability from IDR3.
Reviewed-by: Eric Auger <[email protected]> Reviewed-by: Shameer Kolothum <[email protected]> Signed-off-by: Nathan Chen <[email protected]> --- hw/arm/smmuv3-accel.c | 8 +++++++- hw/arm/smmuv3.c | 10 ++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/hw/arm/smmuv3-accel.c b/hw/arm/smmuv3-accel.c index 4c2acbbedf..25699a1317 100644 --- a/hw/arm/smmuv3-accel.c +++ b/hw/arm/smmuv3-accel.c @@ -58,6 +58,11 @@ static void smmuv3_accel_auto_finalise(SMMUv3State *s, FIELD_EX32(info->idr[0], IDR0, ATS)); } + if (s->ril == ON_OFF_AUTO_AUTO) { + s->idr[3] = FIELD_DP32(s->idr[3], IDR3, RIL, + FIELD_EX32(info->idr[3], IDR3, RIL)); + } + accel->auto_finalised = true; } @@ -966,7 +971,8 @@ bool smmuv3_accel_init(SMMUv3State *s, Error **errp) bs->iommu_ops = &smmuv3_accel_ops; smmuv3_accel_as_init(s); - if (s->ats == ON_OFF_AUTO_AUTO) { + if (s->ats == ON_OFF_AUTO_AUTO || + s->ril == ON_OFF_AUTO_AUTO) { s->s_accel->auto_mode = true; } diff --git a/hw/arm/smmuv3.c b/hw/arm/smmuv3.c index 436155d883..c183964b2e 100644 --- a/hw/arm/smmuv3.c +++ b/hw/arm/smmuv3.c @@ -1965,10 +1965,6 @@ static void smmu_reset_exit(Object *obj, ResetType type) static bool smmu_validate_property(SMMUv3State *s, Error **errp) { - if (s->ril == ON_OFF_AUTO_AUTO) { - error_setg(errp, "ril auto mode is not supported"); - return false; - } if (s->ssidsize == SSID_SIZE_MODE_AUTO) { error_setg(errp, "ssidsize auto mode is not supported"); return false; @@ -2165,8 +2161,10 @@ static void smmuv3_class_init(ObjectClass *klass, const void *data) "ensure the host SMMUv3 supports nested translation before " "enabling."); object_class_property_set_description(klass, "ril", - "Disable range invalidation support (for accel=on). ril=auto " - "is not supported."); + "Enable/disable range invalidation support (for accel=on). " + "Valid values are on, off, and auto. Defaults to on. " + "Any attempt to turn it 'on' while the host does not support " + "it would fail."); object_class_property_set_description(klass, "ats", "Enable/disable ATS support (for accel=on). " "Valid values are on, off, and auto. Defaults to off. " -- 2.43.0
