[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/31] target/ppc: Finish removal of 401/403 CPUs
From: |
Cédric Le Goater |
Subject: |
[PULL 08/31] target/ppc: Finish removal of 401/403 CPUs |
Date: |
Tue, 18 Jan 2022 14:07:07 +0100 |
Commit c8f49e6b938e ("target/ppc: remove 401/403 CPUs") left a few
things behind.
Reviewed-by: Fabiano Rosas <farosas@linux.ibm.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-Id: <20220117091541.1615807-1-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20220118104150.1899661-3-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
target/ppc/cpu.h | 1 -
target/ppc/helper.h | 1 -
target/ppc/cpu-models.c | 1 -
target/ppc/machine.c | 24 ------------------------
target/ppc/misc_helper.c | 9 ---------
target/ppc/translate.c | 16 +---------------
6 files changed, 1 insertion(+), 51 deletions(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index f99cd0ea92fc..2560b70c5f10 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1133,7 +1133,6 @@ struct CPUPPCState {
int nb_pids; /* Number of available PID registers */
int tlb_type; /* Type of TLB we're dealing with */
ppc_tlb_t tlb; /* TLB is optional. Allocate them only if needed */
- target_ulong pb[4]; /* 403 dedicated access protection registers */
bool tlb_dirty; /* Set to non-zero when modifying TLB */
bool kvm_sw_tlb; /* non-zero if KVM SW TLB API is active */
uint32_t tlb_need_flush; /* Delayed flush needed */
diff --git a/target/ppc/helper.h b/target/ppc/helper.h
index f9c72dcd504d..d318837ea5cc 100644
--- a/target/ppc/helper.h
+++ b/target/ppc/helper.h
@@ -703,7 +703,6 @@ DEF_HELPER_FLAGS_2(store_hdecr, TCG_CALL_NO_RWG, void, env,
tl)
DEF_HELPER_FLAGS_2(store_vtb, TCG_CALL_NO_RWG, void, env, tl)
DEF_HELPER_FLAGS_2(store_tbu40, TCG_CALL_NO_RWG, void, env, tl)
DEF_HELPER_2(store_hid0_601, void, env, tl)
-DEF_HELPER_3(store_403_pbr, void, env, i32, tl)
DEF_HELPER_FLAGS_1(load_40x_pit, TCG_CALL_NO_RWG, tl, env)
DEF_HELPER_FLAGS_2(store_40x_pit, TCG_CALL_NO_RWG, void, env, tl)
DEF_HELPER_FLAGS_2(store_40x_tcr, TCG_CALL_NO_RWG, void, env, tl)
diff --git a/target/ppc/cpu-models.c b/target/ppc/cpu-models.c
index c9fcb6119f40..96fec9c2e501 100644
--- a/target/ppc/cpu-models.c
+++ b/target/ppc/cpu-models.c
@@ -750,7 +750,6 @@
/* PowerPC CPU aliases */
PowerPCCPUAlias ppc_cpu_aliases[] = {
- { "403", "403gc" },
{ "405", "405d4" },
{ "405cr", "405crc" },
{ "405gp", "405gpd" },
diff --git a/target/ppc/machine.c b/target/ppc/machine.c
index df547385ff1e..733a22d74407 100644
--- a/target/ppc/machine.c
+++ b/target/ppc/machine.c
@@ -598,25 +598,6 @@ static bool tlbemb_needed(void *opaque)
return env->nb_tlb && (env->tlb_type == TLB_EMB);
}
-static bool pbr403_needed(void *opaque)
-{
- PowerPCCPU *cpu = opaque;
- uint32_t pvr = cpu->env.spr[SPR_PVR];
-
- return (pvr & 0xffff0000) == 0x00200000;
-}
-
-static const VMStateDescription vmstate_pbr403 = {
- .name = "cpu/pbr403",
- .version_id = 1,
- .minimum_version_id = 1,
- .needed = pbr403_needed,
- .fields = (VMStateField[]) {
- VMSTATE_UINTTL_ARRAY(env.pb, PowerPCCPU, 4),
- VMSTATE_END_OF_LIST()
- },
-};
-
static const VMStateDescription vmstate_tlbemb = {
.name = "cpu/tlb6xx",
.version_id = 1,
@@ -628,13 +609,8 @@ static const VMStateDescription vmstate_tlbemb = {
env.nb_tlb,
vmstate_tlbemb_entry,
ppcemb_tlb_t),
- /* 403 protection registers */
VMSTATE_END_OF_LIST()
},
- .subsections = (const VMStateDescription*[]) {
- &vmstate_pbr403,
- NULL
- }
};
static const VMStateDescription vmstate_tlbmas_entry = {
diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c
index c33f5f39b90b..1bcefa7c843c 100644
--- a/target/ppc/misc_helper.c
+++ b/target/ppc/misc_helper.c
@@ -226,15 +226,6 @@ void helper_store_hid0_601(CPUPPCState *env, target_ulong
val)
}
}
-void helper_store_403_pbr(CPUPPCState *env, uint32_t num, target_ulong value)
-{
- if (likely(env->pb[num] != value)) {
- env->pb[num] = value;
- /* Should be optimized */
- tlb_flush(env_cpu(env));
- }
-}
-
void helper_store_40x_dbcr0(CPUPPCState *env, target_ulong val)
{
/* Bits 26 & 27 affect single-stepping. */
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 40232201bb0c..9d2adc0caee0 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -911,22 +911,8 @@ void spr_write_booke_tsr(DisasContext *ctx, int sprn, int
gprn)
}
#endif
-/* PowerPC 403 specific registers */
-/* PBL1 / PBU1 / PBL2 / PBU2 */
+/* PIR */
#if !defined(CONFIG_USER_ONLY)
-void spr_read_403_pbr(DisasContext *ctx, int gprn, int sprn)
-{
- tcg_gen_ld_tl(cpu_gpr[gprn], cpu_env,
- offsetof(CPUPPCState, pb[sprn - SPR_403_PBL1]));
-}
-
-void spr_write_403_pbr(DisasContext *ctx, int sprn, int gprn)
-{
- TCGv_i32 t0 = tcg_const_i32(sprn - SPR_403_PBL1);
- gen_helper_store_403_pbr(cpu_env, t0, cpu_gpr[gprn]);
- tcg_temp_free_i32(t0);
-}
-
void spr_write_pir(DisasContext *ctx, int sprn, int gprn)
{
TCGv t0 = tcg_temp_new();
--
2.31.1
- [PULL 10/31] tests/avocado: ppc: Add smoke tests for MPC7400 and MPC7450 families, (continued)
- [PULL 10/31] tests/avocado: ppc: Add smoke tests for MPC7400 and MPC7450 families, Cédric Le Goater, 2022/01/18
- [PULL 13/31] ppc/pnv: move phbbar to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 09/31] target/ppc: Fix 7448 support, Cédric Le Goater, 2022/01/18
- [PULL 12/31] ppc/pnv: move PCI registers to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 01/31] docs: rSTify ppc-spapr-hotplug.txt., Cédric Le Goater, 2022/01/18
- [PULL 11/31] ppc/pnv: use PHB4 obj in pnv_pec_stk_pci_xscom_ops, Cédric Le Goater, 2022/01/18
- [PULL 21/31] ppc/pnv: introduce PnvPHB4 'pec' property, Cédric Le Goater, 2022/01/18
- [PULL 22/31] ppc/pnv: reduce stack->stack_no usage, Cédric Le Goater, 2022/01/18
- [PULL 15/31] ppc/pnv: change pnv_phb4_update_regions() to use PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 07/31] target/ppc: Remove last user of .load_state_old, Cédric Le Goater, 2022/01/18
- [PULL 08/31] target/ppc: Finish removal of 401/403 CPUs,
Cédric Le Goater <=
- [PULL 25/31] ppc/pnv: remove PnvPhb4PecStack::stack_no, Cédric Le Goater, 2022/01/18
- [PULL 06/31] Link new ppc-spapr-uv-hcalls.rst to pseries.rst., Cédric Le Goater, 2022/01/18
- [PULL 19/31] ppc/pnv: move nest_regs_mr to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 28/31] ppc/pnv: rename pnv_pec_stk_update_map(), Cédric Le Goater, 2022/01/18
- [PULL 30/31] ppc/pnv: Add a 'rp_model' class attribute for the PHB4 PEC, Cédric Le Goater, 2022/01/18
- [PULL 26/31] ppc/pnv: make PECs create and realize PHB4s, Cédric Le Goater, 2022/01/18
- [PULL 29/31] ppc/pnv: Move root port allocation under pnv_pec_default_phb_realize(), Cédric Le Goater, 2022/01/18
- [PULL 18/31] ppc/pnv: change pnv_pec_stk_update_map() to use PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 20/31] ppc/pnv: move phb_regs_mr to PnvPHB4, Cédric Le Goater, 2022/01/18
- [PULL 27/31] ppc/pnv: remove PnvPhb4PecStack object, Cédric Le Goater, 2022/01/18