From nobody Tue Nov 11 14:21:19 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1563586209; cv=none; d=zoho.com; s=zohoarc; b=nTN0ZLqnuDiX6eRXQBwZntxg8sAG9kt9+Z/xlMh6TvBnnjeiLhxoGYeecNzkMOhrk7EXShHv0Yz/t5rMoxnBuz0J4F7npedOMYLnz2RBmcppP450QuQcdVuC9je1XgmZ9m18TfU3+IFN+SljRNFwYXpcB9nIMw9JhsEAz0kdmxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563586209; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=V3MbdJlGq7FJAcpQiDhNO3E31aQ8A12o/jjTmcfBtCo=; b=mgX8T192hFkCDG+bRITHwbeUcq2lJtE9Z00MJn9XIOjikIB3lEauXQxSBYB1jH/DSdzdwPRHqXAOhLlHonKpfhTxerERkTtLXLDYsA4ZIb46VWcPkHpsbM5ovuLgR1r5Yfr5tqVGzlaE0x1pdjR2EJYDfg4FQxcx7NbfJSPVYns= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563586209781730.4226804721029; Fri, 19 Jul 2019 18:30:09 -0700 (PDT) Received: from localhost ([::1]:49130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoeCO-0003Qw-QO for importer@patchew.org; Fri, 19 Jul 2019 21:30:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43973) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hoeBo-00010o-6r for qemu-devel@nongnu.org; Fri, 19 Jul 2019 21:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hoeBn-0003Xu-43 for qemu-devel@nongnu.org; Fri, 19 Jul 2019 21:29:32 -0400 Received: from ozlabs.ru ([107.173.13.209]:59116) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hoeBm-0003XN-TR; Fri, 19 Jul 2019 21:29:31 -0400 Received: from fstn1-p1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 7CF3AAE807E6; Fri, 19 Jul 2019 21:28:53 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Sat, 20 Jul 2019 11:28:47 +1000 Message-Id: <20190720012850.14369-2-aik@ozlabs.ru> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190720012850.14369-1-aik@ozlabs.ru> References: <20190720012850.14369-1-aik@ozlabs.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 107.173.13.209 Subject: [Qemu-devel] [PATCH qemu RFC 1/4] spapr: Allow changing kernel loading address X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Mackerras , Michael Ellerman , qemu-ppc@nongnu.org, Alexey Kardashevskiy , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Useful for the debugging purposes. Signed-off-by: Alexey Kardashevskiy --- include/hw/ppc/spapr.h | 1 + hw/ppc/spapr.c | 33 +++++++++++++++++++++++++++------ 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 74e427b588fc..ff82bb8554e1 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -159,6 +159,7 @@ struct SpaprMachineState { void *fdt_blob; long kernel_size; bool kernel_le; + uint64_t kernel_addr; uint32_t initrd_base; long initrd_size; uint64_t rtc_offset; /* Now used only during incoming migration */ diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 7fad42350538..6d13d65d8996 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1179,7 +1179,7 @@ static void spapr_dt_chosen(SpaprMachineState *spapr,= void *fdt) spapr->initrd_base + spapr->initrd_size)); =20 if (spapr->kernel_size) { - uint64_t kprop[2] =3D { cpu_to_be64(KERNEL_LOAD_ADDR), + uint64_t kprop[2] =3D { cpu_to_be64(spapr->kernel_addr), cpu_to_be64(spapr->kernel_size) }; =20 _FDT(fdt_setprop(fdt, chosen, "qemu,boot-kernel", @@ -1365,7 +1365,7 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) =20 /* Build memory reserve map */ if (spapr->kernel_size) { - _FDT((fdt_add_mem_rsv(fdt, KERNEL_LOAD_ADDR, spapr->kernel_size))); + _FDT((fdt_add_mem_rsv(fdt, spapr->kernel_addr, spapr->kernel_size)= )); } if (spapr->initrd_size) { _FDT((fdt_add_mem_rsv(fdt, spapr->initrd_base, spapr->initrd_size)= )); @@ -1391,7 +1391,8 @@ static void *spapr_build_fdt(SpaprMachineState *spapr) =20 static uint64_t translate_kernel_address(void *opaque, uint64_t addr) { - return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; + SpaprMachineState *spapr =3D opaque; + return (addr & 0x0fffffff) + spapr->kernel_addr; } =20 static void emulate_spapr_hypercall(PPCVirtualHypervisor *vhyp, @@ -2995,12 +2996,12 @@ static void spapr_machine_init(MachineState *machin= e) uint64_t lowaddr =3D 0; =20 spapr->kernel_size =3D load_elf(kernel_filename, NULL, - translate_kernel_address, NULL, + translate_kernel_address, spapr, NULL, &lowaddr, NULL, 1, PPC_ELF_MACHINE, 0, 0); if (spapr->kernel_size =3D=3D ELF_LOAD_WRONG_ENDIAN) { spapr->kernel_size =3D load_elf(kernel_filename, NULL, - translate_kernel_address, NULL, = NULL, + translate_kernel_address, spapr,= NULL, &lowaddr, NULL, 0, PPC_ELF_MACHI= NE, 0, 0); spapr->kernel_le =3D spapr->kernel_size > 0; @@ -3016,7 +3017,7 @@ static void spapr_machine_init(MachineState *machine) /* Try to locate the initrd in the gap between the kernel * and the firmware. Add a bit of space just in case */ - spapr->initrd_base =3D (KERNEL_LOAD_ADDR + spapr->kernel_size + spapr->initrd_base =3D (spapr->kernel_addr + spapr->kernel_size + 0x1ffff) & ~0xffff; spapr->initrd_size =3D load_image_targphys(initrd_filename, spapr->initrd_base, @@ -3253,6 +3254,18 @@ static void spapr_set_vsmt(Object *obj, Visitor *v, = const char *name, visit_type_uint32(v, name, (uint32_t *)opaque, errp); } =20 +static void spapr_get_kernel_addr(Object *obj, Visitor *v, const char *nam= e, + void *opaque, Error **errp) +{ + visit_type_uint64(v, name, (uint64_t *)opaque, errp); +} + +static void spapr_set_kernel_addr(Object *obj, Visitor *v, const char *nam= e, + void *opaque, Error **errp) +{ + visit_type_uint64(v, name, (uint64_t *)opaque, errp); +} + static char *spapr_get_ic_mode(Object *obj, Error **errp) { SpaprMachineState *spapr =3D SPAPR_MACHINE(obj); @@ -3358,6 +3371,14 @@ static void spapr_instance_init(Object *obj) object_property_add_bool(obj, "vfio-no-msix-emulation", spapr_get_msix_emulation, NULL, NULL); =20 + object_property_add(obj, "kernel-addr", "uint64", spapr_get_kernel_add= r, + spapr_set_kernel_addr, NULL, &spapr->kernel_addr, + &error_abort); + object_property_set_description(obj, "kernel-addr", + stringify(KERNEL_LOAD_ADDR) + " for -kernel is the default", + NULL); + spapr->kernel_addr =3D KERNEL_LOAD_ADDR; /* The machine class defines the default interrupt controller mode */ spapr->irq =3D smc->irq; object_property_add_str(obj, "ic-mode", spapr_get_ic_mode, --=20 2.17.1