Commit 5d9c1756 authored by Shannon Zhao's avatar Shannon Zhao Committed by Peter Maydell
Browse files

ARM: ACPI: Fix MPIDR value in ACPI table 



Use mp_affinity of ARMCPU as the CPU MPIDR instead of the CPU index.

Signed-off-by: default avatarShannon Zhao <shannon.zhao@linaro.org>
Message-id: 1446285001-7316-1-git-send-email-zhaoshenglong@huawei.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent f2fbface

hw/arm/virt-acpi-build.c

+3 −1
Original line number Diff line number Diff line
@@ -452,13 +452,15 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info, 
    for (i = 0; i < guest_info->smp_cpus; i++) {

        AcpiMadtGenericInterrupt *gicc = acpi_data_push(table_data,

                                                     sizeof *gicc);

        ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(i));



        gicc->type = ACPI_APIC_GENERIC_INTERRUPT;

        gicc->length = sizeof(*gicc);

        if (guest_info->gic_version == 2) {

            gicc->base_address = memmap[VIRT_GIC_CPU].base;

        }

        gicc->cpu_interface_number = i;

        gicc->arm_mpidr = i;

        gicc->arm_mpidr = armcpu->mp_affinity;

        gicc->uid = i;

        if (test_bit(i, cpuinfo->found_cpus)) {

            gicc->flags = cpu_to_le32(ACPI_GICC_ENABLED);