Re: [Qemu-devel] [PATCH] hw/intc/arm_gicv3_common: fix aff3 in typer

[Peter Maydell]

On 9 December 2016 at 14:37, Andrew Jones <address@hidden> wrote:
> Signed-off-by: Andrew Jones <address@hidden>
> ---
>  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