Commit c39770cd authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Peter Maydell
Browse files

hw/arm: Allow manually specified /psci node 



Change the code to avoid exiting QEMU if user provided DTB contains
manually specified /psci node and skip any /psci related fixups
instead.

Fixes: 4cbca7d9 ("hw/arm: Move virt's PSCI DT fixup code to
arm/boot.c")

Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Reported-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Tested-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Message-id: 20180402205654.14572-1-andrew.smirnov@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent fb4fe32d

hw/arm/boot.c

+10 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ static void fdt_add_psci_node(void *fdt) 
    ARMCPU *armcpu = ARM_CPU(qemu_get_cpu(0));

    const char *psci_method;

    int64_t psci_conduit;

    int rc;



    psci_conduit = object_property_get_int(OBJECT(armcpu),

                                           "psci-conduit",
@@ -439,6 +440,15 @@ static void fdt_add_psci_node(void *fdt) 
        g_assert_not_reached();

    }



    /*

     * If /psci node is present in provided DTB, assume that no fixup

     * is necessary and all PSCI configuration should be taken as-is

     */

    rc = fdt_path_offset(fdt, "/psci");

    if (rc >= 0) {

        return;

    }



    qemu_fdt_add_subnode(fdt, "/psci");

    if (armcpu->psci_version == 2) {

        const char comp[] = "arm,psci-0.2\0arm,psci";