On 4/22/26 10:43 PM, Nathan Chen wrote: > 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. > > 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 b42d189d29..98c2cdcb5e 100644 > --- a/hw/arm/smmuv3-accel.c > +++ b/hw/arm/smmuv3-accel.c > @@ -57,6 +57,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; > } > > @@ -968,7 +973,8 @@ void smmuv3_accel_init(SMMUv3State *s) > 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 5671649fee..b7aa4122eb 100644 > --- a/hw/arm/smmuv3.c > +++ b/hw/arm/smmuv3.c > @@ -1972,10 +1972,6 @@ static bool smmu_validate_property(SMMUv3State *s, > Error **errp) > } > #endif > > - 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; > @@ -2168,8 +2164,10 @@ static void smmuv3_class_init(ObjectClass *klass, > const void *data) > "Enable SMMUv3 accelerator support. Allows host SMMUv3 to be " > "configured in nested mode for vfio-pci dev assignment"); > 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. " > + "Please enable if host platform supports RIL, and disable if " suggest: any attempt to turn it 'on' while the host does not support it would fail Reviewed-by: Eric Auger <[email protected]> Eric > + "host platform does not support RIL."); > object_class_property_set_description(klass, "ats", > "Enable/disable ATS support (for accel=on). " > "Valid values are on, off, and auto. Defaults to off. "
