Skip to content

Commit

Permalink
target/ppc: cpu_init: Expose some SPR registration helpers
Browse files Browse the repository at this point in the history
The following patches will move CPU-specific code into separate files,
so expose the most used SPR registration functions:

register_sdr1_sprs         | 22 callers
register_low_BATs          | 20 callers
register_non_embedded_sprs | 19 callers
register_high_BATs         | 10 callers
register_thrm_sprs         | 8 callers
register_usprgh_sprs       | 6 callers
register_6xx_7xx_soft_tlb  | only 3 callers, but it helps to
                             keep the soft TLB code consistent.

Signed-off-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20220216162426.1885923-25-farosas@linux.ibm.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
  • Loading branch information
farosas authored and legoater committed Feb 18, 2022
1 parent 99e964e commit 917ea43
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
14 changes: 7 additions & 7 deletions target/ppc/cpu_init.c
Expand Up @@ -241,7 +241,7 @@ static void register_generic_sprs(PowerPCCPU *cpu)
0x00000000);
}

static void register_non_embedded_sprs(CPUPPCState *env)
void register_non_embedded_sprs(CPUPPCState *env)
{
/* Exception processing */
spr_register_kvm(env, SPR_DSISR, "DSISR",
Expand All @@ -260,7 +260,7 @@ static void register_non_embedded_sprs(CPUPPCState *env)
}

/* Storage Description Register 1 */
static void register_sdr1_sprs(CPUPPCState *env)
void register_sdr1_sprs(CPUPPCState *env)
{
#ifndef CONFIG_USER_ONLY
if (env->has_hv_mode) {
Expand All @@ -283,7 +283,7 @@ static void register_sdr1_sprs(CPUPPCState *env)
}

/* BATs 0-3 */
static void register_low_BATs(CPUPPCState *env)
void register_low_BATs(CPUPPCState *env)
{
#if !defined(CONFIG_USER_ONLY)
spr_register(env, SPR_IBAT0U, "IBAT0U",
Expand Down Expand Up @@ -355,7 +355,7 @@ static void register_low_BATs(CPUPPCState *env)
}

/* BATs 4-7 */
static void register_high_BATs(CPUPPCState *env)
void register_high_BATs(CPUPPCState *env)
{
#if !defined(CONFIG_USER_ONLY)
spr_register(env, SPR_IBAT4U, "IBAT4U",
Expand Down Expand Up @@ -427,7 +427,7 @@ static void register_high_BATs(CPUPPCState *env)
}

/* Softare table search registers */
static void register_6xx_7xx_soft_tlb(CPUPPCState *env, int nb_tlbs, int nb_ways)
void register_6xx_7xx_soft_tlb(CPUPPCState *env, int nb_tlbs, int nb_ways)
{
#if !defined(CONFIG_USER_ONLY)
env->nb_tlb = nb_tlbs;
Expand Down Expand Up @@ -667,7 +667,7 @@ static void register_iamr_sprs(CPUPPCState *env)
}
#endif /* TARGET_PPC64 */

static void register_thrm_sprs(CPUPPCState *env)
void register_thrm_sprs(CPUPPCState *env)
{
/* Thermal management */
spr_register(env, SPR_THRM1, "THRM1",
Expand Down Expand Up @@ -1072,7 +1072,7 @@ static void register_l3_ctrl(CPUPPCState *env)
0x00000000);
}

static void register_usprgh_sprs(CPUPPCState *env)
void register_usprgh_sprs(CPUPPCState *env)
{
spr_register(env, SPR_USPRG4, "USPRG4",
&spr_read_ureg, SPR_NOACCESS,
Expand Down
8 changes: 8 additions & 0 deletions target/ppc/spr_common.h
Expand Up @@ -141,4 +141,12 @@ void spr_write_hmer(DisasContext *ctx, int sprn, int gprn);
void spr_write_lpcr(DisasContext *ctx, int sprn, int gprn);
#endif

void register_low_BATs(CPUPPCState *env);
void register_high_BATs(CPUPPCState *env);
void register_sdr1_sprs(CPUPPCState *env);
void register_thrm_sprs(CPUPPCState *env);
void register_usprgh_sprs(CPUPPCState *env);
void register_non_embedded_sprs(CPUPPCState *env);
void register_6xx_7xx_soft_tlb(CPUPPCState *env, int nb_tlbs, int nb_ways);

#endif

0 comments on commit 917ea43

Please sign in to comment.