On Sun, 24 Jan 2021 at 02:53, Leif Lindholm <l...@nuviainc.com> wrote: > > As a first step towards GICv4 compatibility, add support for gic revision 4 > to GICv3 driver (i.e. don't bail out if revision 4 is encountered). > > Signed-off-by: Leif Lindholm <l...@nuviainc.com> > --- > hw/intc/arm_gicv3_common.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c > index 58ef65f589..7365d24873 100644 > --- a/hw/intc/arm_gicv3_common.c > +++ b/hw/intc/arm_gicv3_common.c > @@ -315,7 +315,7 @@ static void arm_gicv3_common_realize(DeviceState *dev, > Error **errp) > * conditions. However, in future it could be used, for example, if we > * implement GICv4. > */ > - if (s->revision != 3) { > + if (s->revision != 3 && s->revision != 4) { > error_setg(errp, "unsupported GIC revision %d", s->revision); > return; > }
This change is obviously not-for-upstream; we can't allow the GIC to be configured to a revision that we don't actually implement correctly. thanks -- PMM