0dd8f840c7
- vdpa: Fix bug where vdpa appliance migration does not resume after rollback - block: Parse filenames only when explicitly requested (CVE-2024-4467) - block: introduce bdrv_open_file_child() helper - iotests/270: Don't store data-file with json: prefix in image (CVE-2024-4467) - iotests/244: Don't store data-file with protocol in image (CVE-2024-4467) - qcow2: Don't open data_file with BDRV_O_NO_IO (CVE-2024-4467) - qcow2: Do not reopen data_file in invalidate_cache - hw/intc/arm_gic: Fix deactivation of SPI lines chery-pick from 7175a562f157d39725ab396e39c1e8e410d206b3 - vhost-user: Skip unnecessary duplicated VHOST_USER_SET_LOG_BASE requests - target/ppc: Split off common embedded TLB init cheery-pick from 581eea5d656b73c6532109f4ced4c73fd4e5fd47` - vdpa: fix vdpa device migrate rollback wrong when suspend device failed 1. - hw/virtio/virtio-pci:Support shadow device for virtio-net/blk/scsi devices Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit ad45062d44e901468eeb8c4ac0729587daaa1e1f)
119 lines
3.7 KiB
Diff
119 lines
3.7 KiB
Diff
From 9f45d0ded0694739898e2fbbb6fa08891a7de280 Mon Sep 17 00:00:00 2001
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
Date: Mon, 10 Jun 2024 15:52:59 +0800
|
|
Subject: [PATCH] target/ppc: Split off common embedded TLB init cheery-pick
|
|
from 581eea5d656b73c6532109f4ced4c73fd4e5fd47`
|
|
|
|
Several 4xx CPUs and e200 share the same TLB settings enclosed in an
|
|
ifdef. Split it off in a common function to reduce code duplication
|
|
and the number of ifdefs.
|
|
|
|
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
|
|
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
|
|
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
|
|
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
---
|
|
target/ppc/cpu_init.c | 50 +++++++++++++------------------------------
|
|
1 file changed, 15 insertions(+), 35 deletions(-)
|
|
|
|
diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
|
|
index 986d16a24d..d0dfa1aeaf 100644
|
|
--- a/target/ppc/cpu_init.c
|
|
+++ b/target/ppc/cpu_init.c
|
|
@@ -3018,7 +3018,15 @@ POWERPC_FAMILY(403GCX)(ObjectClass *oc, void *data)
|
|
pcc->flags = POWERPC_FLAG_CE | POWERPC_FLAG_PX |
|
|
POWERPC_FLAG_BUS_CLK;
|
|
}
|
|
-
|
|
+static void init_tlbs_emb(CPUPPCState *env)
|
|
+{
|
|
+#if !defined(CONFIG_USER_ONLY)
|
|
+ env->nb_tlb = 64;
|
|
+ env->nb_ways = 1;
|
|
+ env->id_tlbs = 0;
|
|
+ env->tlb_type = TLB_EMB;
|
|
+#endif
|
|
+}
|
|
static void init_proc_405(CPUPPCState *env)
|
|
{
|
|
/* Time base */
|
|
@@ -3036,13 +3044,7 @@ static void init_proc_405(CPUPPCState *env)
|
|
SPR_NOACCESS, SPR_NOACCESS,
|
|
&spr_read_generic, &spr_write_generic,
|
|
0x00000000);
|
|
- /* Memory management */
|
|
-#if !defined(CONFIG_USER_ONLY)
|
|
- env->nb_tlb = 64;
|
|
- env->nb_ways = 1;
|
|
- env->id_tlbs = 0;
|
|
- env->tlb_type = TLB_EMB;
|
|
-#endif
|
|
+ init_tlbs_emb(env);
|
|
init_excp_4xx_softmmu(env);
|
|
env->dcache_line_size = 32;
|
|
env->icache_line_size = 32;
|
|
@@ -3135,13 +3137,7 @@ static void init_proc_440EP(CPUPPCState *env)
|
|
SPR_NOACCESS, SPR_NOACCESS,
|
|
&spr_read_generic, &spr_write_generic,
|
|
0x00000000);
|
|
- /* Memory management */
|
|
-#if !defined(CONFIG_USER_ONLY)
|
|
- env->nb_tlb = 64;
|
|
- env->nb_ways = 1;
|
|
- env->id_tlbs = 0;
|
|
- env->tlb_type = TLB_EMB;
|
|
-#endif
|
|
+ init_tlbs_emb(env);
|
|
init_excp_BookE(env);
|
|
env->dcache_line_size = 32;
|
|
env->icache_line_size = 32;
|
|
@@ -3259,13 +3255,7 @@ static void init_proc_440GP(CPUPPCState *env)
|
|
SPR_NOACCESS, SPR_NOACCESS,
|
|
&spr_read_generic, &spr_write_generic,
|
|
0x00000000);
|
|
- /* Memory management */
|
|
-#if !defined(CONFIG_USER_ONLY)
|
|
- env->nb_tlb = 64;
|
|
- env->nb_ways = 1;
|
|
- env->id_tlbs = 0;
|
|
- env->tlb_type = TLB_EMB;
|
|
-#endif
|
|
+ init_tlbs_emb(env);
|
|
init_excp_BookE(env);
|
|
env->dcache_line_size = 32;
|
|
env->icache_line_size = 32;
|
|
@@ -3443,13 +3433,7 @@ static void init_proc_440x5(CPUPPCState *env)
|
|
SPR_NOACCESS, SPR_NOACCESS,
|
|
&spr_read_generic, &spr_write_generic,
|
|
0x00000000);
|
|
- /* Memory management */
|
|
-#if !defined(CONFIG_USER_ONLY)
|
|
- env->nb_tlb = 64;
|
|
- env->nb_ways = 1;
|
|
- env->id_tlbs = 0;
|
|
- env->tlb_type = TLB_EMB;
|
|
-#endif
|
|
+ init_tlbs_emb(env);
|
|
init_excp_BookE(env);
|
|
env->dcache_line_size = 32;
|
|
env->icache_line_size = 32;
|
|
@@ -3877,12 +3861,8 @@ static void init_proc_e200(CPUPPCState *env)
|
|
SPR_NOACCESS, SPR_NOACCESS,
|
|
&spr_read_generic, &spr_write_generic,
|
|
0x00000000);
|
|
-#if !defined(CONFIG_USER_ONLY)
|
|
- env->nb_tlb = 64;
|
|
- env->nb_ways = 1;
|
|
- env->id_tlbs = 0;
|
|
- env->tlb_type = TLB_EMB;
|
|
-#endif
|
|
+
|
|
+ init_tlbs_emb(env);
|
|
init_excp_e200(env, 0xFFFF0000UL);
|
|
env->dcache_line_size = 32;
|
|
env->icache_line_size = 32;
|
|
--
|
|
2.41.0.windows.1
|
|
|