From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buYMz-00054B-SS for qemu-devel@nongnu.org; Thu, 13 Oct 2016 01:15:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buYMx-00086f-5c for qemu-devel@nongnu.org; Thu, 13 Oct 2016 01:15:53 -0400 From: David Gibson Date: Thu, 13 Oct 2016 16:15:32 +1100 Message-Id: <1476335734-29831-3-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1476335734-29831-1-git-send-email-david@gibson.dropbear.id.au> References: <1476335734-29831-1-git-send-email-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/4] hw/ppc/spapr: Move code related to "ibm, pa-features" to a separate function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-stable@nongnu.org Cc: thuth@redhat.com, anton@samba.org, agraf@suse.de, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson From: Thomas Huth The function spapr_populate_cpu_dt() has become quite big already, and since we likely have to extend the pa-features property for every new processor generation, it is nicer if we put the related code into a separate function. Signed-off-by: Thomas Huth Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson (cherry picked from commit 230bf719d3a3b144a4ffa441e5d6170ef0ad8999) --- hw/ppc/spapr.c | 66 ++++++++++++++++++++++++++++++++--------------------= ------ 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 30d6800..36d9077 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -594,6 +594,41 @@ static int spapr_populate_memory(sPAPRMachineState *= spapr, void *fdt) return 0; } =20 +/* Populate the "ibm,pa-features" property */ +static void spapr_populate_pa_features(CPUPPCState *env, void *fdt, int = offset) +{ + uint8_t pa_features_206[] =3D { 6, 0, + 0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 }; + uint8_t pa_features_207[] =3D { 24, 0, + 0xf6, 0x1f, 0xc7, 0xc0, 0x80, 0xf0, + 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; + uint8_t *pa_features; + size_t pa_size; + + if (env->mmu_model =3D=3D POWERPC_MMU_2_06) { + pa_features =3D pa_features_206; + pa_size =3D sizeof(pa_features_206); + } else { /* env->mmu_model =3D=3D POWERPC_MMU_2_07 */ + pa_features =3D pa_features_207; + pa_size =3D sizeof(pa_features_207); + } + + if (env->ci_large_pages) { + /* + * Note: we keep CI large pages off by default because a 64K cap= able + * guest provisioned with large pages might otherwise try to map= a qemu + * framebuffer (or other kind of memory mapped PCI BAR) using 64= K pages + * even if that qemu runs on a 4k host. + * We dd this bit back here if we are confident this is not an i= ssue + */ + pa_features[3] |=3D 0x20; + } + + _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", pa_features, pa_si= ze))); +} + static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, sPAPRMachineState *spapr) { @@ -621,24 +656,6 @@ static void spapr_populate_cpu_dt(CPUState *cs, void= *fdt, int offset, _FDT((fdt_setprop_cell(fdt, offset, "ibm,my-drc-index", drc_inde= x))); } =20 - /* Note: we keep CI large pages off for now because a 64K capable gu= est - * provisioned with large pages might otherwise try to map a qemu - * framebuffer (or other kind of memory mapped PCI BAR) using 64K pa= ges - * even if that qemu runs on a 4k host. - * - * We can later add this bit back when we are confident this is not - * an issue (!HV KVM or 64K host) - */ - uint8_t pa_features_206[] =3D { 6, 0, - 0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 }; - uint8_t pa_features_207[] =3D { 24, 0, - 0xf6, 0x1f, 0xc7, 0xc0, 0x80, 0xf0, - 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00 }; - uint8_t *pa_features; - size_t pa_size; - _FDT((fdt_setprop_cell(fdt, offset, "reg", index))); _FDT((fdt_setprop_string(fdt, offset, "device_type", "cpu"))); =20 @@ -705,18 +722,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void= *fdt, int offset, page_sizes_prop, page_sizes_prop_size))); } =20 - /* Do the ibm,pa-features property, adjust it for ci-large-pages */ - if (env->mmu_model =3D=3D POWERPC_MMU_2_06) { - pa_features =3D pa_features_206; - pa_size =3D sizeof(pa_features_206); - } else /* env->mmu_model =3D=3D POWERPC_MMU_2_07 */ { - pa_features =3D pa_features_207; - pa_size =3D sizeof(pa_features_207); - } - if (env->ci_large_pages) { - pa_features[3] |=3D 0x20; - } - _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", pa_features, pa_si= ze))); + spapr_populate_pa_features(env, fdt, offset); =20 _FDT((fdt_setprop_cell(fdt, offset, "ibm,chip-id", cs->cpu_index / vcpus_per_socket))); --=20 2.7.4