Commit 8eeb330c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by David Gibson
Browse files

ppc: Add a bunch of hypervisor SPRs to Book3s 



We don't give them a KVM reg number yet as no current KVM version
supports HV mode.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
[clg: SPRs AMOR,DAWR,DARWX were already included in commit f401dd32]
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 8a0b4de0

target-ppc/translate_init.c

+116 −3
Original line number Diff line number Diff line
@@ -7793,15 +7793,116 @@ static void gen_spr_power5p_lpar(CPUPPCState *env) 
    spr_register_kvm(env, SPR_LPCR, "LPCR",

                     SPR_NOACCESS, SPR_NOACCESS,

                     &spr_read_generic, &spr_write_generic,

                     KVM_REG_PPC_LPCR, 0x00000000);

                     KVM_REG_PPC_LPCR, LPCR_LPES0 | LPCR_LPES1);

}



#if !defined(CONFIG_USER_ONLY)

static void spr_write_hmer(DisasContext *ctx, int sprn, int gprn)

{

    TCGv hmer = tcg_temp_new();



    gen_load_spr(hmer, sprn);

    tcg_gen_and_tl(hmer, cpu_gpr[gprn], hmer);

    gen_store_spr(sprn, hmer);

    spr_store_dump_spr(sprn);

    tcg_temp_free(hmer);

}

#endif



static void gen_spr_book3s_ids(CPUPPCState *env)

{

    /* FIXME: Will need to deal with thread vs core only SPRs */



    /* Processor identification */

    spr_register(env, SPR_PIR, "PIR",

    spr_register_hv(env, SPR_PIR, "PIR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_pir,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, NULL,

                 0x00000000);

    spr_register_hv(env, SPR_HID0, "HID0",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_TSCR, "TSCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HMER, "HMER",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_hmer,

                 0x00000000);

    spr_register_hv(env, SPR_HMEER, "HMEER",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_TFMR, "TFMR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_LPIDR, "LPIDR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HFSCR, "HFSCR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_MMCRC, "MMCRC",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_MMCRH, "MMCRH",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HSPRG0, "HSPRG0",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HSPRG1, "HSPRG1",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HSRR0, "HSRR0",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HSRR1, "HSRR1",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HDAR, "HDAR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HDSISR, "HDSISR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_RMOR, "RMOR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

    spr_register_hv(env, SPR_HRMOR, "HRMOR",

                 SPR_NOACCESS, SPR_NOACCESS,

                 SPR_NOACCESS, SPR_NOACCESS,

                 &spr_read_generic, &spr_write_generic,

                 0x00000000);

}
@@ -8060,6 +8161,17 @@ static void gen_spr_power7_book4(CPUPPCState *env) 
#endif

}



static void gen_spr_power8_rpr(CPUPPCState *env)

{

#if !defined(CONFIG_USER_ONLY)

    spr_register_hv(env, SPR_RPR, "RPR",

                    SPR_NOACCESS, SPR_NOACCESS,

                    SPR_NOACCESS, SPR_NOACCESS,

                    &spr_read_generic, &spr_write_generic,

                    0x00000103070F1F3F);

#endif

}



static void init_proc_book3s_64(CPUPPCState *env, int version)

{

    gen_spr_ne_601(env);
@@ -8117,6 +8229,7 @@ static void init_proc_book3s_64(CPUPPCState *env, int version) 
        gen_spr_vtb(env);

        gen_spr_power8_ic(env);

        gen_spr_power8_book4(env);

        gen_spr_power8_rpr(env);

    }

    if (version < BOOK3S_CPU_POWER8) {

        gen_spr_book3s_dbg(env);