From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57573) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byT1n-0007nO-JT for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byT1k-0005Ge-7R for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:11 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:45574 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1byT1k-0005Fq-0k for qemu-devel@nongnu.org; Sun, 23 Oct 2016 20:22:08 -0400 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9O0Idtd049381 for ; Sun, 23 Oct 2016 20:22:07 -0400 Received: from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153]) by mx0a-001b2d01.pphosted.com with ESMTP id 2692a9s44k-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Sun, 23 Oct 2016 20:22:07 -0400 Received: from localhost by e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 23 Oct 2016 18:22:06 -0600 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1477018600-6881-6-git-send-email-david@gibson.dropbear.id.au> References: <1477018600-6881-1-git-send-email-david@gibson.dropbear.id.au> <1477018600-6881-6-git-send-email-david@gibson.dropbear.id.au> Date: Sun, 23 Oct 2016 18:25:49 -0500 Message-Id: <20161023232549.17113.97670@loki> Subject: Re: [Qemu-devel] [PATCHv2 05/12] pseries: Consolidate RTAS loading List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson , aik@ozlabs.ru, groug@kaod.org Cc: agraf@suse.de, lvivier@redhat.com, thuth@redhat.com, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Quoting David Gibson (2016-10-20 21:56:33) > At each system reset, the pseries machine needs to load RTAS (the runtime > portion of the guest firmware) into the VM. This means copying > the actual RTAS code into guest memory, and also updating the device > tree so that the guest OS and boot firmware can locate it. > = > For historical reasons the copy and update to the device tree were in > different parts of the code. This cleanup brings them both together in > an spapr_load_rtas() function. > = > Signed-off-by: David Gibson > Reviewed-by: Alexey Kardashevskiy > Reviewed-by: Thomas Huth Reviewed-by: Michael Roth > --- > hw/ppc/spapr.c | 3 +-- > hw/ppc/spapr_rtas.c | 72 ++++++++++++++++++++++++++++----------------= ------ > include/hw/ppc/spapr.h | 1 + > 3 files changed, 43 insertions(+), 33 deletions(-) > = > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 1eddd1b..cb6b1a3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -1165,8 +1165,7 @@ static void ppc_spapr_reset(void) > = > fdt =3D spapr_build_fdt(spapr, rtas_addr, spapr->rtas_size); > = > - /* Copy RTAS over */ > - cpu_physical_memory_write(rtas_addr, spapr->rtas_blob, spapr->rtas_s= ize); > + spapr_load_rtas(spapr, fdt, rtas_addr); > = > rc =3D fdt_pack(fdt); > = > diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c > index 0db84c8..54b4ad3 100644 > --- a/hw/ppc/spapr_rtas.c > +++ b/hw/ppc/spapr_rtas.c > @@ -721,37 +721,6 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr r= tas_addr, > uint64_t max_hotplug_addr =3D spapr->hotplug_memory.base + > memory_region_size(&spapr->hotplug_memor= y.mr); > = > - ret =3D fdt_add_mem_rsv(fdt, rtas_addr, rtas_size); > - if (ret < 0) { > - error_report("Couldn't add RTAS reserve entry: %s", > - fdt_strerror(ret)); > - return ret; > - } > - > - ret =3D qemu_fdt_setprop_cell(fdt, "/rtas", "linux,rtas-base", > - rtas_addr); > - if (ret < 0) { > - error_report("Couldn't add linux,rtas-base property: %s", > - fdt_strerror(ret)); > - return ret; > - } > - > - ret =3D qemu_fdt_setprop_cell(fdt, "/rtas", "linux,rtas-entry", > - rtas_addr); > - if (ret < 0) { > - error_report("Couldn't add linux,rtas-entry property: %s", > - fdt_strerror(ret)); > - return ret; > - } > - > - ret =3D qemu_fdt_setprop_cell(fdt, "/rtas", "rtas-size", > - rtas_size); > - if (ret < 0) { > - error_report("Couldn't add rtas-size property: %s", > - fdt_strerror(ret)); > - return ret; > - } > - > for (i =3D 0; i < RTAS_TOKEN_MAX - RTAS_TOKEN_BASE; i++) { > struct rtas_call *call =3D &rtas_table[i]; > = > @@ -784,6 +753,47 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr r= tas_addr, > return 0; > } > = > +void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr) > +{ > + int rtas_node; > + int ret; > + > + /* Copy RTAS blob into guest RAM */ > + cpu_physical_memory_write(addr, spapr->rtas_blob, spapr->rtas_size); > + > + ret =3D fdt_add_mem_rsv(fdt, addr, spapr->rtas_size); > + if (ret < 0) { > + error_report("Couldn't add RTAS reserve entry: %s", > + fdt_strerror(ret)); > + exit(1); > + } > + > + /* Update the device tree with the blob's location */ > + rtas_node =3D fdt_path_offset(fdt, "/rtas"); > + assert(rtas_node >=3D 0); > + > + ret =3D fdt_setprop_cell(fdt, rtas_node, "linux,rtas-base", addr); > + if (ret < 0) { > + error_report("Couldn't add linux,rtas-base property: %s", > + fdt_strerror(ret)); > + exit(1); > + } > + > + ret =3D fdt_setprop_cell(fdt, rtas_node, "linux,rtas-entry", addr); > + if (ret < 0) { > + error_report("Couldn't add linux,rtas-entry property: %s", > + fdt_strerror(ret)); > + exit(1); > + } > + > + ret =3D fdt_setprop_cell(fdt, rtas_node, "rtas-size", spapr->rtas_si= ze); > + if (ret < 0) { > + error_report("Couldn't add rtas-size property: %s", > + fdt_strerror(ret)); > + exit(1); > + } > +} > + > static void core_rtas_register_types(void) > { > spapr_rtas_register(RTAS_DISPLAY_CHARACTER, "display-character", > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index a0b4bf8..847ae88 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -532,6 +532,7 @@ target_ulong spapr_rtas_call(PowerPCCPU *cpu, sPAPRMa= chineState *sm, > uint32_t nret, target_ulong rets); > int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, > hwaddr rtas_size); > +void spapr_load_rtas(sPAPRMachineState *spapr, void *fdt, hwaddr addr); > = > #define SPAPR_TCE_PAGE_SHIFT 12 > #define SPAPR_TCE_PAGE_SIZE (1ULL << SPAPR_TCE_PAGE_SHIFT) > -- = > 2.7.4 >=20