From patchwork Fri Oct 5 01:15:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 189388 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 23B8F2C0329 for ; Fri, 5 Oct 2012 11:15:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755033Ab2JEBPX (ORCPT ); Thu, 4 Oct 2012 21:15:23 -0400 Received: from ozlabs.org ([203.10.76.45]:46777 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755260Ab2JEBPW (ORCPT ); Thu, 4 Oct 2012 21:15:22 -0400 Received: by ozlabs.org (Postfix, from userid 1034) id 258D82C032D; Fri, 5 Oct 2012 11:15:21 +1000 (EST) From: Michael Ellerman To: Cc: , levinsasha928@gmail.com, , Subject: [PATCH 3/3] kvm tools: Do setup_fdt() later, get powerpc to boot again Date: Fri, 5 Oct 2012 11:15:19 +1000 Message-Id: <1349399719-9317-3-git-send-email-michael@ellerman.id.au> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349399719-9317-1-git-send-email-michael@ellerman.id.au> References: <1349399719-9317-1-git-send-email-michael@ellerman.id.au> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org 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 --- tools/kvm/powerpc/kvm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/kvm/powerpc/kvm.c b/tools/kvm/powerpc/kvm.c index e4f5315..d675265 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; }