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

frontend/adapter: Add early_cmd_ready parameter to keep default behaviour to False but allow enabling it in Avalon Frontend.

This commit is contained in:
Florent Kermarrec 2023-05-31 19:07:06 +02:00
parent 1b7435c6d5
commit cc434c407b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
litedram/frontend/adapter.py
View File

@ -70,7 +70,7 @@ class LiteDRAMNativePortDownConverter(Module):
- A read from the user generates N reads to the controller and returned - A read from the user generates N reads to the controller and returned
datas are regrouped in a single data presented to the user. datas are regrouped in a single data presented to the user.
""" """
def __init__(self, port_from, port_to, reverse=False): def __init__(self, port_from, port_to, reverse=False, early_cmd_ready=False):
assert port_from.clock_domain == port_to.clock_domain assert port_from.clock_domain == port_to.clock_domain
assert port_from.data_width > port_to.data_width assert port_from.data_width > port_to.data_width
assert port_from.mode == port_to.mode assert port_from.mode == port_to.mode
@ -88,7 +88,7 @@ class LiteDRAMNativePortDownConverter(Module):
self.submodules.fsm = fsm = FSM(reset_state="IDLE") self.submodules.fsm = fsm = FSM(reset_state="IDLE")
fsm.act("IDLE", fsm.act("IDLE",
port_from.cmd.ready.eq(1), port_from.cmd.ready.eq(early_cmd_ready),
If(port_from.cmd.valid, If(port_from.cmd.valid,
NextValue(cmd_count, 0), NextValue(cmd_count, 0),
NextValue(cmd_addr, port_from.cmd.addr), NextValue(cmd_addr, port_from.cmd.addr),
@ -103,6 +103,7 @@ class LiteDRAMNativePortDownConverter(Module):
If(port_to.cmd.ready, If(port_to.cmd.ready,
NextValue(cmd_count, cmd_count + 1), NextValue(cmd_count, cmd_count + 1),
If(cmd_count == (ratio - 1), If(cmd_count == (ratio - 1),
port_from.cmd.ready.eq(~early_cmd_ready),
NextState("IDLE") NextState("IDLE")
) )
) )
@ -362,7 +363,7 @@ class LiteDRAMNativePortUpConverter(Module):
# LiteDRAMNativePortConverter ---------------------------------------------------------------------- # LiteDRAMNativePortConverter ----------------------------------------------------------------------
class LiteDRAMNativePortConverter(Module): class LiteDRAMNativePortConverter(Module):
def __init__(self, port_from, port_to, reverse=False): def __init__(self, port_from, port_to, reverse=False, early_cmd_ready=False):
assert port_from.clock_domain == port_to.clock_domain assert port_from.clock_domain == port_to.clock_domain
assert port_from.mode == port_to.mode assert port_from.mode == port_to.mode
@ -372,7 +373,7 @@ class LiteDRAMNativePortConverter(Module):
if ratio > 1: if ratio > 1:
# DownConverter # DownConverter
self.submodules.converter = LiteDRAMNativePortDownConverter(port_from, port_to, reverse) self.submodules.converter = LiteDRAMNativePortDownConverter(port_from, port_to, reverse, early_cmd_ready)
elif ratio < 1: elif ratio < 1:
# UpConverter # UpConverter
self.submodules.converter = LiteDRAMNativePortUpConverter(port_from, port_to, reverse) self.submodules.converter = LiteDRAMNativePortUpConverter(port_from, port_to, reverse)

2
litedram/frontend/avalon.py
View File

@ -44,7 +44,7 @@ class LiteDRAMAvalonMM2Native(LiteXModule):
address_width = port.address_width + addr_shift, address_width = port.address_width + addr_shift,
data_width = avalon_data_width data_width = avalon_data_width
) )
self.converter = LiteDRAMNativePortConverter(new_port, port) self.converter = LiteDRAMNativePortConverter(new_port, port, early_cmd_ready=True)
port = new_port port = new_port
# # # # # #