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

Add option to switch DFIInjector to externally driven DFI

This commit is contained in:
Jędrzej Boczar 2020-10-27 10:55:20 +01:00 committed by Ryszard Różak
parent 4c1ce026e9
commit da2748723d
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
litedram/dfii.py
View File

@ -48,9 +48,12 @@ class PhaseInjector(Module, AutoCSR):
class DFIInjector(Module, AutoCSR): class DFIInjector(Module, AutoCSR):
def __init__(self, addressbits, bankbits, nranks, databits, nphases=1): def __init__(self, addressbits, bankbits, nranks, databits, nphases=1):
inti = dfi.Interface(addressbits, bankbits, nranks, databits, nphases) self.slave = dfi.Interface(addressbits, bankbits, nranks, databits, nphases)
self.slave = dfi.Interface(addressbits, bankbits, nranks, databits, nphases) self.master = dfi.Interface(addressbits, bankbits, nranks, databits, nphases)
self.master = dfi.Interface(addressbits, bankbits, nranks, databits, nphases) csr_dfi = dfi.Interface(addressbits, bankbits, nranks, databits, nphases)
self.ext_dfi = dfi.Interface(addressbits, bankbits, nranks, databits, nphases)
self.ext_dfi_sel = Signal()
self._control = CSRStorage(fields=[ self._control = CSRStorage(fields=[
CSRField("sel", size=1, values=[ CSRField("sel", size=1, values=[
@ -62,17 +65,21 @@ class DFIInjector(Module, AutoCSR):
CSRField("reset_n", size=1), CSRField("reset_n", size=1),
]) ])
for n, phase in enumerate(inti.phases): for n, phase in enumerate(csr_dfi.phases):
setattr(self.submodules, "pi" + str(n), PhaseInjector(phase)) setattr(self.submodules, "pi" + str(n), PhaseInjector(phase))
# # # # # #
self.comb += If(self._control.fields.sel, self.comb += If(self._control.fields.sel, # Hardware
self.slave.connect(self.master) If(self.ext_dfi_sel, # Hardware through ext_dfi
).Else( self.ext_dfi.connect(self.master)
inti.connect(self.master) ).Else( # Hardware by LiteDRAM controller
self.slave.connect(self.master)
)
).Else( # Software through CSRs
csr_dfi.connect(self.master)
) )
for i in range(nranks): for i in range(nranks):
self.comb += [phase.cke[i].eq(self._control.fields.cke) for phase in inti.phases] self.comb += [phase.cke[i].eq(self._control.fields.cke) for phase in csr_dfi.phases]
self.comb += [phase.odt[i].eq(self._control.fields.odt) for phase in inti.phases if hasattr(phase, "odt")] self.comb += [phase.odt[i].eq(self._control.fields.odt) for phase in csr_dfi.phases if hasattr(phase, "odt")]
self.comb += [phase.reset_n.eq(self._control.fields.reset_n) for phase in inti.phases if hasattr(phase, "reset_n")] self.comb += [phase.reset_n.eq(self._control.fields.reset_n) for phase in csr_dfi.phases if hasattr(phase, "reset_n")]