Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1482 from Icenowy/openc906-fix 

misc openc906 fixes and enhancements
This commit is contained in:
enjoy-digital 2022-11-02 08:36:33 +01:00 committed by GitHub
parent cd2805b422 0f097fd4c7
commit f71bda1c61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
litex/soc/cores/cpu/openc906/core.py
View File

@ -11,6 +11,7 @@ from migen import *
from litex import get_data_mod from litex import get_data_mod
from litex.soc.interconnect import axi from litex.soc.interconnect import axi
from litex.soc.interconnect import wishbone
from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV64 from litex.soc.cores.cpu import CPU, CPU_GCC_TRIPLE_RISCV64
# Helpers ------------------------------------------------------------------------------------------ # Helpers ------------------------------------------------------------------------------------------
@ -34,7 +35,7 @@ class OpenC906(CPU):
name = "openc906" name = "openc906"
human_name = "OpenC906" human_name = "OpenC906"
variants = ["standard"] variants = ["standard"]
data_width = 64 data_width = 128
endianness = "little" endianness = "little"
gcc_triple = CPU_GCC_TRIPLE_RISCV64 gcc_triple = CPU_GCC_TRIPLE_RISCV64
linker_output_format = "elf64-littleriscv" linker_output_format = "elf64-littleriscv"
@ -62,13 +63,20 @@ class OpenC906(CPU):
"csr": 0xa000_0000, # Region 1 too "csr": 0xa000_0000, # Region 1 too
} }
def __init__(self, platform, variant="standard"): def __init__(self, platform, variant="standard", convert_periph_bus_to_wishbone=True):
self.platform = platform self.platform = platform
self.variant = variant self.variant = variant
self.reset = Signal() self.reset = Signal()
self.interrupt = Signal(240) self.interrupt = Signal(240)
self.axi_if = axi.AXIInterface(data_width=64, address_width=40) # Peripheral bus (Connected to main SoC's bus).
self.periph_buses = [self.axi_if] # Peripheral buses (Connected to main SoC's bus). self.axi_if = axi_if = axi.AXIInterface(data_width=128, address_width=40, id_width=8)
if convert_periph_bus_to_wishbone:
self.wb_if = wishbone.Interface(data_width=axi_if.data_width,
adr_width=axi_if.address_width - log2_int(axi_if.data_width // 8))
self.submodules += axi.AXI2Wishbone(axi_if, self.wb_if)
self.periph_buses = [self.wb_if]
else:
self.periph_buses = [axi_if]
self.memory_buses = [] # Memory buses (Connected directly to LiteDRAM). self.memory_buses = [] # Memory buses (Connected directly to LiteDRAM).
# # # # # #
@ -97,45 +105,45 @@ class OpenC906(CPU):
i_pad_cpu_sys_cnt = cycle_count, i_pad_cpu_sys_cnt = cycle_count,
# AXI. # AXI.
o_biu_pad_awvalid = self.axi_if.aw.valid, o_biu_pad_awvalid = axi_if.aw.valid,
i_pad_biu_awready = self.axi_if.aw.ready, i_pad_biu_awready = axi_if.aw.ready,
o_biu_pad_awid = self.axi_if.aw.id, o_biu_pad_awid = axi_if.aw.id,
o_biu_pad_awaddr = self.axi_if.aw.addr, o_biu_pad_awaddr = axi_if.aw.addr,
o_biu_pad_awlen = self.axi_if.aw.len, o_biu_pad_awlen = axi_if.aw.len,
o_biu_pad_awsize = self.axi_if.aw.size, o_biu_pad_awsize = axi_if.aw.size,
o_biu_pad_awburst = self.axi_if.aw.burst, o_biu_pad_awburst = axi_if.aw.burst,
o_biu_pad_awlock = self.axi_if.aw.lock, o_biu_pad_awlock = axi_if.aw.lock,
o_biu_pad_awcache = self.axi_if.aw.cache, o_biu_pad_awcache = axi_if.aw.cache,
o_biu_pad_awprot = self.axi_if.aw.prot, o_biu_pad_awprot = axi_if.aw.prot,
o_biu_pad_wvalid = self.axi_if.w.valid, o_biu_pad_wvalid = axi_if.w.valid,
i_pad_biu_wready = self.axi_if.w.ready, i_pad_biu_wready = axi_if.w.ready,
o_biu_pad_wdata = self.axi_if.w.data, o_biu_pad_wdata = axi_if.w.data,
o_biu_pad_wstrb = self.axi_if.w.strb, o_biu_pad_wstrb = axi_if.w.strb,
o_biu_pad_wlast = self.axi_if.w.last, o_biu_pad_wlast = axi_if.w.last,
i_pad_biu_bvalid = self.axi_if.b.valid, i_pad_biu_bvalid = axi_if.b.valid,
o_biu_pad_bready = self.axi_if.b.ready, o_biu_pad_bready = axi_if.b.ready,
i_pad_biu_bid = self.axi_if.b.id, i_pad_biu_bid = axi_if.b.id,
i_pad_biu_bresp = self.axi_if.b.resp, i_pad_biu_bresp = axi_if.b.resp,
o_biu_pad_arvalid = self.axi_if.ar.valid, o_biu_pad_arvalid = axi_if.ar.valid,
i_pad_biu_arready = self.axi_if.ar.ready, i_pad_biu_arready = axi_if.ar.ready,
o_biu_pad_arid = self.axi_if.ar.id, o_biu_pad_arid = axi_if.ar.id,
o_biu_pad_araddr = self.axi_if.ar.addr, o_biu_pad_araddr = axi_if.ar.addr,
o_biu_pad_arlen = self.axi_if.ar.len, o_biu_pad_arlen = axi_if.ar.len,
o_biu_pad_arsize = self.axi_if.ar.size, o_biu_pad_arsize = axi_if.ar.size,
o_biu_pad_arburst = self.axi_if.ar.burst, o_biu_pad_arburst = axi_if.ar.burst,
o_biu_pad_arlock = self.axi_if.ar.lock, o_biu_pad_arlock = axi_if.ar.lock,
o_biu_pad_arcache = self.axi_if.ar.cache, o_biu_pad_arcache = axi_if.ar.cache,
o_biu_pad_arprot = self.axi_if.ar.prot, o_biu_pad_arprot = axi_if.ar.prot,
i_pad_biu_rvalid = self.axi_if.r.valid, i_pad_biu_rvalid = axi_if.r.valid,
o_biu_pad_rready = self.axi_if.r.ready, o_biu_pad_rready = axi_if.r.ready,
i_pad_biu_rid = self.axi_if.r.id, i_pad_biu_rid = axi_if.r.id,
i_pad_biu_rdata = self.axi_if.r.data, i_pad_biu_rdata = axi_if.r.data,
i_pad_biu_rresp = self.axi_if.r.resp, i_pad_biu_rresp = axi_if.r.resp,
i_pad_biu_rlast = self.axi_if.r.last, i_pad_biu_rlast = axi_if.r.last,
) )
# Add Verilog sources. # Add Verilog sources.

8
litex/soc/cores/cpu/openc906/crt0.S
View File

@ -56,8 +56,12 @@ crt_init:
la sp, _fstack la sp, _fstack
la t0, trap_entry la t0, trap_entry
csrw mtvec, t0 csrw mtvec, t0
li t0, 0x3 li t0, 0x400000
csrs 0x7c1, t0 // enable L1I+L1D csrs 0x7c0, t0 // enable THEADISAEE
li t0, 0x73
csrs 0x7c1, t0 // enable L1$ (I+D) + Branch Prediction + Return Stack
li t0, 0x504
csrs 0x7c5, t0 // enable L1$ prefetching
data_init: data_init:
la t0, _fdata la t0, _fdata

8
litex/soc/cores/cpu/openc906/system.h
View File

@ -35,13 +35,13 @@ void busy_wait_us(unsigned int us);
asm volatile ("csrrc x0, " #reg ", %0" :: "r"(bit)); }) asm volatile ("csrrc x0, " #reg ", %0" :: "r"(bit)); })
__attribute__((unused)) static void flush_cpu_icache(void) { __attribute__((unused)) static void flush_cpu_icache(void) {
csrc(0x7c2, 0x33); asm volatile (".long 0x0100000b"); /* icache.iall */
csrs(0x7c2, 0x11); asm volatile (".long 0x01a0000b"); /* sync.i */
}; };
__attribute__((unused)) static void flush_cpu_dcache(void) { __attribute__((unused)) static void flush_cpu_dcache(void) {
csrc(0x7c2, 0x33); asm volatile (".long 0x0030000b"); /* dcache.ciall */
csrs(0x7c2, 0x12); asm volatile (".long 0x01a0000b"); /* sync.i */
}; };
#ifdef __cplusplus #ifdef __cplusplus