mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm: Convert TYPE_ARM_SMMU to 3-phase reset

Browse Source 
Convert the TYPE_ARM_SMMU device to 3-phase reset.  The legacy method
doesn't do anything that's invalid in the hold phase, so the
conversion is simple and not a behaviour change.

Note that we must convert this base class before we can convert the
TYPE_ARM_SMMUV3 subclass -- transitional support in Resettable
handles "chain to parent class reset" when the base class is 3-phase
and the subclass is still using legacy reset, but not the other way
around.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Message-id: 20221109161444.3397405-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2022-12-14 14:27:10 +00:00
parent 41654f120f
commit 3c1a7c4197
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/arm/smmu-common.c
View File

@ -526,9 +526,9 @@ static void smmu_base_realize(DeviceState *dev, Error **errp)
} }
} }
static void smmu_base_reset(DeviceState *dev) static void smmu_base_reset_hold(Object *obj)
{ {
SMMUState *s = ARM_SMMU(dev); SMMUState *s = ARM_SMMU(obj);
g_hash_table_remove_all(s->configs); g_hash_table_remove_all(s->configs);
g_hash_table_remove_all(s->iotlb); g_hash_table_remove_all(s->iotlb);
@ -543,12 +543,13 @@ static Property smmu_dev_properties[] = {
static void smmu_base_class_init(ObjectClass *klass, void *data) static void smmu_base_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ResettableClass *rc = RESETTABLE_CLASS(klass);
SMMUBaseClass *sbc = ARM_SMMU_CLASS(klass); SMMUBaseClass *sbc = ARM_SMMU_CLASS(klass);
device_class_set_props(dc, smmu_dev_properties); device_class_set_props(dc, smmu_dev_properties);
device_class_set_parent_realize(dc, smmu_base_realize, device_class_set_parent_realize(dc, smmu_base_realize,
&sbc->parent_realize); &sbc->parent_realize);
dc->reset = smmu_base_reset; rc->phases.hold = smmu_base_reset_hold;
} }
static const TypeInfo smmu_base_info = { static const TypeInfo smmu_base_info = {