From: Michael Ellerman Date: Fri, 5 Oct 2012 01:15:19 +0000 (+1000) Subject: kvm tools: Do setup_fdt() later, get powerpc to boot again X-Git-Tag: next-20121008~7^2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da22ea8144344b57c88ead0075409746ba93e5a0;p=karo-tx-linux.git kvm tools: Do setup_fdt() later, get powerpc to boot again In commit e3d3ced "kernel load/firmware cleanup", the call to kvm__arch_setup_firmware() was moved. Previously more or less at the end of the init sequence, but that commit moved it into kvm__init() which is a core_init() call and so runs quite early. This broke booting powerpc guests, as setup_fdt() needs to be called later in the setup sequence. In particular it looks at kvm->nrcpus, which is uninitialised at that point. In general setup_fdt() needs to run late in the sequence, as it encodes the setup of the machine into the device tree. So move setup_fdt() out of kvm__arch_setup_firmware() and make it a firmware_init() call of its own. With this patch I am able to boot guests again on HV KVM. Signed-off-by: Michael Ellerman Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c index e4f53157e2ef..d675265454af 100644 --- a/tools/kvm/powerpc/kvm.c +++ b/tools/kvm/powerpc/kvm.c @@ -286,7 +286,7 @@ static void generate_segment_page_sizes(struct kvm_ppc_smmu_info *info, struct f * and whilst most PPC targets will require CPU/memory nodes, others like RTAS * should eventually be added separately. */ -static void setup_fdt(struct kvm *kvm) +static int setup_fdt(struct kvm *kvm) { uint64_t mem_reg_property[] = { 0, cpu_to_be64(kvm->ram_size) }; int smp_cpus = kvm->nrcpus; @@ -488,7 +488,10 @@ static void setup_fdt(struct kvm *kvm) _FDT(fdt_pack(fdt_dest)); free(segment_page_sizes.value); + + return 0; } +firmware_init(setup_fdt); /** * kvm__arch_setup_firmware @@ -517,9 +520,6 @@ int kvm__arch_setup_firmware(struct kvm *kvm) /* Load SLOF */ - /* Init FDT */ - setup_fdt(kvm); - return 0; }