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

cpu/rocket/core: Initial changes for .dts generation through json2dts. 

For now just add information missing by json2dts to generate the .dts similarly to VexRiscv-SMP.
This commit is contained in:
Florent Kermarrec 2023-02-20 10:13:16 +01:00
parent c6394c8f27
commit 8c79c2599f
1 changed files with 73 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
litex/soc/cores/cpu/rocket/core.py
View File

@ -43,62 +43,62 @@ class Open(Signal): pass
# Variants ----------------------------------------------------------------------------------------- # Variants -----------------------------------------------------------------------------------------
CPU_VARIANTS = { CPU_VARIANTS = {
"standard": "freechips.rocketchip.system.LitexConfig", "standard" : "freechips.rocketchip.system.LitexConfig",
"linux": "freechips.rocketchip.system.LitexLinuxConfig", "linux" : "freechips.rocketchip.system.LitexLinuxConfig",
"linux4": "freechips.rocketchip.system.LitexLinux4Config", "linux4" : "freechips.rocketchip.system.LitexLinux4Config",
"linuxd": "freechips.rocketchip.system.LitexLinuxDConfig", "linuxd" : "freechips.rocketchip.system.LitexLinuxDConfig",
"linux2d": "freechips.rocketchip.system.LitexLinux2DConfig", "linux2d" : "freechips.rocketchip.system.LitexLinux2DConfig",
"linuxq": "freechips.rocketchip.system.LitexLinuxQConfig", "linuxq" : "freechips.rocketchip.system.LitexLinuxQConfig",
"linux2q": "freechips.rocketchip.system.LitexLinux2QConfig", "linux2q" : "freechips.rocketchip.system.LitexLinux2QConfig",
"full": "freechips.rocketchip.system.LitexFullConfig", "full" : "freechips.rocketchip.system.LitexFullConfig",
"fulld": "freechips.rocketchip.system.LitexFullDConfig", "fulld" : "freechips.rocketchip.system.LitexFullDConfig",
"full4d": "freechips.rocketchip.system.LitexFull4DConfig", "full4d" : "freechips.rocketchip.system.LitexFull4DConfig",
"fullq": "freechips.rocketchip.system.LitexFullQConfig", "fullq" : "freechips.rocketchip.system.LitexFullQConfig",
"full4q": "freechips.rocketchip.system.LitexFull4QConfig", "full4q" : "freechips.rocketchip.system.LitexFull4QConfig",
"fullo": "freechips.rocketchip.system.LitexFullOConfig", "fullo" : "freechips.rocketchip.system.LitexFullOConfig",
"full4o": "freechips.rocketchip.system.LitexFull4OConfig", "full4o" : "freechips.rocketchip.system.LitexFull4OConfig",
"full8o": "freechips.rocketchip.system.LitexFull8OConfig", "full8o" : "freechips.rocketchip.system.LitexFull8OConfig",
} }
# GCC Flags----------------------------------------------------------------------------------------- # GCC Flags-----------------------------------------------------------------------------------------
GCC_FLAGS = { GCC_FLAGS = {
"standard": "-march=rv64imac -mabi=lp64 ", "standard" : "-march=rv64imac -mabi=lp64 ",
"linux": "-march=rv64imac -mabi=lp64 ", "linux" : "-march=rv64imac -mabi=lp64 ",
"linux4": "-march=rv64imac -mabi=lp64 ", "linux4" : "-march=rv64imac -mabi=lp64 ",
"linuxd": "-march=rv64imac -mabi=lp64 ", "linuxd" : "-march=rv64imac -mabi=lp64 ",
"linux2d": "-march=rv64imac -mabi=lp64 ", "linux2d" : "-march=rv64imac -mabi=lp64 ",
"linuxq": "-march=rv64imac -mabi=lp64 ", "linuxq" : "-march=rv64imac -mabi=lp64 ",
"linux2q": "-march=rv64imac -mabi=lp64 ", "linux2q" : "-march=rv64imac -mabi=lp64 ",
"full": "-march=rv64imafdc -mabi=lp64 ", "full" : "-march=rv64imafdc -mabi=lp64 ",
"fulld": "-march=rv64imafdc -mabi=lp64 ", "fulld" : "-march=rv64imafdc -mabi=lp64 ",
"full4d": "-march=rv64imafdc -mabi=lp64 ", "full4d" : "-march=rv64imafdc -mabi=lp64 ",
"fullq": "-march=rv64imafdc -mabi=lp64 ", "fullq" : "-march=rv64imafdc -mabi=lp64 ",
"full4q": "-march=rv64imafdc -mabi=lp64 ", "full4q" : "-march=rv64imafdc -mabi=lp64 ",
"fullo": "-march=rv64imafdc -mabi=lp64 ", "fullo" : "-march=rv64imafdc -mabi=lp64 ",
"full4o": "-march=rv64imafdc -mabi=lp64 ", "full4o" : "-march=rv64imafdc -mabi=lp64 ",
"full8o": "-march=rv64imafdc -mabi=lp64 ", "full8o" : "-march=rv64imafdc -mabi=lp64 ",
} }
# CPU Size Params ---------------------------------------------------------------------------------- # CPU Params ----------------------------------------------------------------------------------
CPU_SIZE_PARAMS = { CPU_PARAMS = {
# Variant : (mem_dw, mmio_dw, num_cores) # Variant : (mem_dw, mmio_dw, num_cores)
"standard": ( 64, 64, 1), "standard" : ( 64, 64, 1),
"linux": ( 64, 64, 1), "linux" : ( 64, 64, 1),
"linux4": ( 64, 64, 4), "linux4" : ( 64, 64, 4),
"linuxd": ( 128, 64, 1), "linuxd" : ( 128, 64, 1),
"linux2d": ( 128, 64, 2), "linux2d" : ( 128, 64, 2),
"linuxq": ( 256, 64, 1), "linuxq" : ( 256, 64, 1),
"linux2q": ( 256, 64, 2), "linux2q" : ( 256, 64, 2),
"full": ( 64, 64, 1), "full" : ( 64, 64, 1),
"fulld": ( 128, 64, 1), "fulld" : ( 128, 64, 1),
"full4d": ( 128, 64, 4), "full4d" : ( 128, 64, 4),
"fullq": ( 256, 64, 1), "fullq" : ( 256, 64, 1),
"full4q": ( 256, 64, 4), "full4q" : ( 256, 64, 4),
"fullo": ( 512, 64, 1), "fullo" : ( 512, 64, 1),
"full4o": ( 512, 64, 4), "full4o" : ( 512, 64, 4),
"full8o": ( 512, 64, 8), "full8o" : ( 512, 64, 8),
} }
# Rocket ------------------------------------------------------------------------------------------ # Rocket ------------------------------------------------------------------------------------------
@ -116,6 +116,14 @@ class Rocket(CPU):
nop = "nop" nop = "nop"
io_regions = {0x1200_0000: 0x7000_0000} # Origin, Length. io_regions = {0x1200_0000: 0x7000_0000} # Origin, Length.
# Arch.
@staticmethod
def get_arch(variant):
arch = "rv64imac"
if "full" in variant:
arch += "fdc"
return arch
# Memory Mapping. # Memory Mapping.
@property @property
def mem_map(self): def mem_map(self):
@ -124,6 +132,8 @@ class Rocket(CPU):
"rom" : 0x1000_0000, "rom" : 0x1000_0000,
"sram" : 0x1100_0000, "sram" : 0x1100_0000,
"csr" : 0x1200_0000, "csr" : 0x1200_0000,
"clint" : 0x1300_0000, # FIXME: Just here for .dts generation through json2ds.
"plic" : 0x1400_0000, # FIXME: Just here for .dts generation through json2ds.
"ethmac" : 0x3000_0000, "ethmac" : 0x3000_0000,
"main_ram" : 0x8000_0000, "main_ram" : 0x8000_0000,
} }
@ -132,7 +142,7 @@ class Rocket(CPU):
@property @property
def gcc_flags(self): def gcc_flags(self):
flags = "-mno-save-restore " flags = "-mno-save-restore "
flags += GCC_FLAGS[self.variant] flags += f"-march={self.get_arch(self.variant)} -mabi=lp64 "
flags += "-D__rocket__ " flags += "-D__rocket__ "
flags += "-mcmodel=medany" flags += "-mcmodel=medany"
return flags return flags
@ -144,7 +154,7 @@ class Rocket(CPU):
self.reset = Signal() self.reset = Signal()
self.interrupt = Signal(8) self.interrupt = Signal(8)
mem_dw, mmio_dw, num_cores = CPU_SIZE_PARAMS[self.variant] mem_dw, mmio_dw, num_cores = CPU_PARAMS[self.variant]
self.mem_axi = mem_axi = axi.AXIInterface(data_width=mem_dw, address_width=32, id_width=4) self.mem_axi = mem_axi = axi.AXIInterface(data_width=mem_dw, address_width=32, id_width=4)
self.mmio_axi = mmio_axi = axi.AXIInterface(data_width=mmio_dw, address_width=32, id_width=4) self.mmio_axi = mmio_axi = axi.AXIInterface(data_width=mmio_dw, address_width=32, id_width=4)
@ -346,6 +356,19 @@ class Rocket(CPU):
"EICG_wrapper.v", "EICG_wrapper.v",
) )
def add_soc_components(self, soc, soc_region_cls):
# Get CPU Params.
mem_dw, mmio_dw, num_cores = CPU_PARAMS[self.variant]
# Add OpenSBI/PLIC/CLINT regions. # FIXME: Just here for .dts generation through json2ds.
soc.add_memory_region("opensbi", self.mem_map["main_ram"] + 0x00f0_0000, 0x8_0000, type="linker")
soc.add_memory_region("plic", soc.mem_map.get("plic") , 0x40_0000, type="linker")
soc.add_memory_region("clint", soc.mem_map.get("clint") , 0x1_0000, type="linker")
# Define number of CPUs
soc.add_config("CPU_COUNT", num_cores)
soc.add_constant("CPU_ISA", self.get_arch(self.variant))
def do_finalize(self): def do_finalize(self):
assert hasattr(self, "reset_address") assert hasattr(self, "reset_address")
self.specials += Instance("ExampleRocketSystem", **self.cpu_params) self.specials += Instance("ExampleRocketSystem", **self.cpu_params)