Skip to content

Commit 4bfc895

Browse files
FlyGoatphilmd
authored andcommitted
target/mips: Disable DSP ASE for Octeon68XX
I don't have access to Octeon68XX hardware but according to my investigation Octeon never had DSP ASE support. As per "Cavium Networks OCTEON Plus CN50XX Hardware Reference Manual" CP0C3_DSPP is reserved bit and read as 0. Also I do have access to a Ubiquiti Edgerouter 4 which has Octeon CN7130 processor and I can confirm CP0C3_DSPP is read as 0 on that processor. Further more, in linux kernel: arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h cpu_has_dsp is overridden as 0. So I believe we shouldn't emulate DSP in QEMU as well. Signed-off-by: Jiaxun Yang <[email protected]> Acked-by: Richard Henderson <[email protected]> Reviewed-by: Pavel Dovgalyuk <[email protected]> Message-Id: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
1 parent 4525ea7 commit 4bfc895

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

target/mips/cpu-defs.c.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,7 @@ const mips_def_t mips_defs[] =
934934
(1 << CP0C1_DS) | (4 << CP0C1_DL) | (1 << CP0C1_DA) |
935935
(1 << CP0C1_PC) | (1 << CP0C1_WR) | (1 << CP0C1_EP),
936936
.CP0_Config2 = MIPS_CONFIG2,
937-
.CP0_Config3 = MIPS_CONFIG3 | (1 << CP0C3_LPA) | (1 << CP0C3_DSPP) ,
937+
.CP0_Config3 = MIPS_CONFIG3 | (1 << CP0C3_LPA),
938938
.CP0_Config4 = MIPS_CONFIG4 | (1U << CP0C4_M) |
939939
(0x3c << CP0C4_KScrExist) | (1U << CP0C4_MMUExtDef) |
940940
(3U << CP0C4_MMUSizeExt),
@@ -946,7 +946,7 @@ const mips_def_t mips_defs[] =
946946
.CP0_Status_rw_bitmask = 0x12F8FFFF,
947947
.SEGBITS = 42,
948948
.PABITS = 49,
949-
.insn_flags = CPU_MIPS64R2 | INSN_OCTEON | ASE_DSP,
949+
.insn_flags = CPU_MIPS64R2 | INSN_OCTEON,
950950
.mmu_type = MMU_TYPE_R4000,
951951
},
952952

0 commit comments

Comments
 (0)