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

Ensure out of order is on a per-bank basis

This commit is contained in:
2018-08-10 16:35:16 -04:00
parent 86b3e2d2ef
commit 03a2ad6bdc
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
litedram/common.py
View File

@ -114,6 +114,8 @@ class LiteDRAMPort:
self.lock = Signal() self.lock = Signal()
self.reorder = reorder
self.cmd = stream.Endpoint(cmd_description(aw)) self.cmd = stream.Endpoint(cmd_description(aw))
self.wdata = stream.Endpoint(wdata_description(dw, reorder)) self.wdata = stream.Endpoint(wdata_description(dw, reorder))
self.rdata = stream.Endpoint(rdata_description(dw, reorder)) self.rdata = stream.Endpoint(rdata_description(dw, reorder))

11
litedram/frontend/crossbar.py
View File

@ -78,14 +78,15 @@ class LiteDRAMCrossbar(Module):
master_locked = [] master_locked = []
for nm, master in enumerate(self.masters): for nm, master in enumerate(self.masters):
locked = 0 locked = 0
for other_nb, other_arbiter in enumerate(arbiters): if not master.reorder:
if other_nb != nb: for other_nb, other_arbiter in enumerate(arbiters):
other_bank = getattr(controller, "bank"+str(other_nb)) if other_nb != nb:
locked = locked | (other_bank.lock & (other_arbiter.grant == nm)) other_bank = getattr(controller, "bank"+str(other_nb))
locked = locked | (other_bank.lock & (other_arbiter.grant == nm))
master_locked.append(locked) master_locked.append(locked)
# arbitrate # arbitrate
bank_selected = [(ba == nb) for ba, locked in zip(m_ba, master_locked)] bank_selected = [(ba == nb) & ~locked for ba, locked in zip(m_ba, master_locked)]
bank_requested = [bs & master.cmd.valid for bs, master in zip(bank_selected, self.masters)] bank_requested = [bs & master.cmd.valid for bs, master in zip(bank_selected, self.masters)]
self.comb += [ self.comb += [
arbiter.request.eq(Cat(*bank_requested)), arbiter.request.eq(Cat(*bank_requested)),