| Message ID | 20161209143703.29457-1-drjones@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 9 December 2016 at 14:37, Andrew Jones <drjones@redhat.com> wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> > --- > hw/intc/arm_gicv3_common.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c > index 0f8c4b86e023..0aa9b9ca6655 100644 > --- a/hw/intc/arm_gicv3_common.c > +++ b/hw/intc/arm_gicv3_common.c > @@ -204,7 +204,8 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp) > /* The CPU mp-affinity property is in MPIDR register format; squash > * the affinity bytes into 32 bits as the GICR_TYPER has them. > */ > - cpu_affid = (cpu_affid & 0xFF00000000ULL >> 8) | (cpu_affid & 0xFFFFFF); > + cpu_affid = ((cpu_affid & 0xFF00000000ULL) >> 8) | > + (cpu_affid & 0xFFFFFF); > s->cpu[i].gicr_typer = (cpu_affid << 32) | > (1 << 24) | > (i << 8) | Oops :-) Applied to target-arm.next for 2.9, thanks. -- PMM
diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c index 0f8c4b86e023..0aa9b9ca6655 100644 --- a/hw/intc/arm_gicv3_common.c +++ b/hw/intc/arm_gicv3_common.c @@ -204,7 +204,8 @@ static void arm_gicv3_common_realize(DeviceState *dev, Error **errp) /* The CPU mp-affinity property is in MPIDR register format; squash * the affinity bytes into 32 bits as the GICR_TYPER has them. */ - cpu_affid = (cpu_affid & 0xFF00000000ULL >> 8) | (cpu_affid & 0xFFFFFF); + cpu_affid = ((cpu_affid & 0xFF00000000ULL) >> 8) | + (cpu_affid & 0xFFFFFF); s->cpu[i].gicr_typer = (cpu_affid << 32) | (1 << 24) | (i << 8) |
Signed-off-by: Andrew Jones <drjones@redhat.com> --- hw/intc/arm_gicv3_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)