Commit 5c179666 authored by Thomas Huth's avatar Thomas Huth Committed by David Gibson
Browse files

hw/ppc/spapr: Move code related to "ibm,pa-features" to a separate function 



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: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
(cherry picked from commit 230bf719)
parent 6ff3ab0d

hw/ppc/spapr.c

+36 −30
Original line number Diff line number Diff line
@@ -594,6 +594,41 @@ static int spapr_populate_memory(sPAPRMachineState *spapr, void *fdt) 
    return 0;

}



/* Populate the "ibm,pa-features" property */

static void spapr_populate_pa_features(CPUPPCState *env, void *fdt, int offset)

{

    uint8_t pa_features_206[] = { 6, 0,

        0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 };

    uint8_t pa_features_207[] = { 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 == POWERPC_MMU_2_06) {

        pa_features = pa_features_206;

        pa_size = sizeof(pa_features_206);

    } else { /* env->mmu_model == POWERPC_MMU_2_07 */

        pa_features = pa_features_207;

        pa_size = sizeof(pa_features_207);

    }



    if (env->ci_large_pages) {

        /*

         * Note: we keep CI large pages off by default because a 64K capable

         * guest provisioned with large pages might otherwise try to map a qemu

         * framebuffer (or other kind of memory mapped PCI BAR) using 64K pages

         * even if that qemu runs on a 4k host.

         * We dd this bit back here if we are confident this is not an issue

         */

        pa_features[3] |= 0x20;

    }



    _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", pa_features, pa_size)));

}



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_index)));

    }



    /* Note: we keep CI large pages off for now because a 64K capable guest

     * provisioned with large pages might otherwise try to map a qemu

     * framebuffer (or other kind of memory mapped PCI BAR) using 64K pages

     * 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[] = { 6, 0,

        0xf6, 0x1f, 0xc7, 0x00, 0x80, 0xc0 };

    uint8_t pa_features_207[] = { 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")));
@@ -705,18 +722,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, 
                          page_sizes_prop, page_sizes_prop_size)));

    }



    /* Do the ibm,pa-features property, adjust it for ci-large-pages */

    if (env->mmu_model == POWERPC_MMU_2_06) {

        pa_features = pa_features_206;

        pa_size = sizeof(pa_features_206);

    } else /* env->mmu_model == POWERPC_MMU_2_07 */ {

        pa_features = pa_features_207;

        pa_size = sizeof(pa_features_207);

    }

    if (env->ci_large_pages) {

        pa_features[3] |= 0x20;

    }

    _FDT((fdt_setprop(fdt, offset, "ibm,pa-features", pa_features, pa_size)));

    spapr_populate_pa_features(env, fdt, offset);



    _FDT((fdt_setprop_cell(fdt, offset, "ibm,chip-id",

                           cs->cpu_index / vcpus_per_socket)));