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

frontend/bist: only use cdc on registers if needed (ie not in sys clock domain)

This commit is contained in:
Florent Kermarrec 2018-08-28 18:59:56 +02:00
parent 92c8513598
commit b1e734b2ac
1 changed files with 99 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

173
litedram/frontend/bist.py
View File

@ -230,46 +230,58 @@ class LiteDRAMBISTGenerator(Module, AutoCSR):
core = ClockDomainsRenamer(clock_domain)(core) core = ClockDomainsRenamer(clock_domain)(core)
self.submodules += core self.submodules += core
reset_sync = PulseSynchronizer("sys", clock_domain) if clock_domain != "sys":
start_sync = PulseSynchronizer("sys", clock_domain) reset_sync = PulseSynchronizer("sys", clock_domain)
self.submodules += reset_sync, start_sync start_sync = PulseSynchronizer("sys", clock_domain)
self.comb += [ self.submodules += reset_sync, start_sync
reset_sync.i.eq(self.reset.re), self.comb += [
core.reset.eq(reset_sync.o), reset_sync.i.eq(self.reset.re),
core.reset.eq(reset_sync.o),
start_sync.i.eq(self.start.re), start_sync.i.eq(self.start.re),
core.start.eq(start_sync.o) core.start.eq(start_sync.o)
] ]
done_sync = BusSynchronizer(1, clock_domain, "sys") done_sync = BusSynchronizer(1, clock_domain, "sys")
self.submodules += done_sync self.submodules += done_sync
self.comb += [ self.comb += [
done_sync.i.eq(core.done), done_sync.i.eq(core.done),
self.done.status.eq(done_sync.o) self.done.status.eq(done_sync.o)
] ]
base_sync = BusSynchronizer(awidth, "sys", clock_domain) base_sync = BusSynchronizer(awidth, "sys", clock_domain)
length_sync = BusSynchronizer(awidth, "sys", clock_domain) length_sync = BusSynchronizer(awidth, "sys", clock_domain)
self.submodules += base_sync, length_sync self.submodules += base_sync, length_sync
self.comb += [ self.comb += [
base_sync.i.eq(self.base.storage), base_sync.i.eq(self.base.storage),
core.base.eq(base_sync.o), core.base.eq(base_sync.o),
length_sync.i.eq(self.length.storage), length_sync.i.eq(self.length.storage),
core.length.eq(length_sync.o) core.length.eq(length_sync.o)
] ]
self.specials += [ self.specials += [
MultiReg(self.random_data_enable.storage, core.random_data_enable, clock_domain), MultiReg(self.random_data_enable.storage, core.random_data_enable, clock_domain),
MultiReg(self.random_addr_enable.storage, core.random_addr_enable, clock_domain), MultiReg(self.random_addr_enable.storage, core.random_addr_enable, clock_domain),
] ]
ticks_sync = BusSynchronizer(32, clock_domain, "sys") ticks_sync = BusSynchronizer(32, clock_domain, "sys")
self.submodules += ticks_sync self.submodules += ticks_sync
self.comb += [ self.comb += [
ticks_sync.i.eq(core.ticks), ticks_sync.i.eq(core.ticks),
self.ticks.status.eq(ticks_sync.o) self.ticks.status.eq(ticks_sync.o)
] ]
else:
self.comb += [
core.reset.eq(self.reset.re),
core.start.eq(self.start.re),
self.done.status.eq(core.done),
core.base.eq(self.base.storage),
core.length.eq(self.length.storage),
core.random_data_enable.eq(self.random_data_enable.storage),
core.random_addr_enable.eq(self.random_addr_enable.storage),
self.ticks.status.eq(core.ticks)
]
@ResetInserter() @ResetInserter()
@ -412,50 +424,63 @@ class LiteDRAMBISTChecker(Module, AutoCSR):
core = ClockDomainsRenamer(clock_domain)(core) core = ClockDomainsRenamer(clock_domain)(core)
self.submodules += core self.submodules += core
reset_sync = PulseSynchronizer("sys", clock_domain) if clock_domain != "sys":
start_sync = PulseSynchronizer("sys", clock_domain) reset_sync = PulseSynchronizer("sys", clock_domain)
self.submodules += reset_sync, start_sync start_sync = PulseSynchronizer("sys", clock_domain)
self.comb += [ self.submodules += reset_sync, start_sync
reset_sync.i.eq(self.reset.re), self.comb += [
core.reset.eq(reset_sync.o), reset_sync.i.eq(self.reset.re),
core.reset.eq(reset_sync.o),
start_sync.i.eq(self.start.re), start_sync.i.eq(self.start.re),
core.start.eq(start_sync.o) core.start.eq(start_sync.o)
] ]
done_sync = BusSynchronizer(1, clock_domain, "sys") done_sync = BusSynchronizer(1, clock_domain, "sys")
self.submodules += done_sync self.submodules += done_sync
self.comb += [ self.comb += [
done_sync.i.eq(core.done), done_sync.i.eq(core.done),
self.done.status.eq(done_sync.o) self.done.status.eq(done_sync.o)
] ]
base_sync = BusSynchronizer(awidth, "sys", clock_domain) base_sync = BusSynchronizer(awidth, "sys", clock_domain)
length_sync = BusSynchronizer(awidth, "sys", clock_domain) length_sync = BusSynchronizer(awidth, "sys", clock_domain)
self.submodules += base_sync, length_sync self.submodules += base_sync, length_sync
self.comb += [ self.comb += [
base_sync.i.eq(self.base.storage), base_sync.i.eq(self.base.storage),
core.base.eq(base_sync.o), core.base.eq(base_sync.o),
length_sync.i.eq(self.length.storage), length_sync.i.eq(self.length.storage),
core.length.eq(length_sync.o) core.length.eq(length_sync.o)
] ]
self.specials += [ self.specials += [
MultiReg(self.random_data_enable.storage, core.random_data_enable, clock_domain), MultiReg(self.random_data_enable.storage, core.random_data_enable, clock_domain),
MultiReg(self.random_addr_enable.storage, core.random_addr_enable, clock_domain), MultiReg(self.random_addr_enable.storage, core.random_addr_enable, clock_domain),
] ]
ticks_sync = BusSynchronizer(32, clock_domain, "sys") ticks_sync = BusSynchronizer(32, clock_domain, "sys")
self.submodules += ticks_sync self.submodules += ticks_sync
self.comb += [ self.comb += [
ticks_sync.i.eq(core.ticks), ticks_sync.i.eq(core.ticks),
self.ticks.status.eq(ticks_sync.o) self.ticks.status.eq(ticks_sync.o)
] ]
errors_sync = BusSynchronizer(32, clock_domain, "sys") errors_sync = BusSynchronizer(32, clock_domain, "sys")
self.submodules += errors_sync self.submodules += errors_sync
self.comb += [ self.comb += [
errors_sync.i.eq(core.errors), errors_sync.i.eq(core.errors),
self.errors.status.eq(errors_sync.o) self.errors.status.eq(errors_sync.o)
] ]
else:
self.comb += [
core.reset.eq(self.reset.re),
core.start.eq(self.start.re),
self.done.status.eq(core.done),
core.base.eq(self.base.storage),
core.length.eq(self.length.storage),
core.random_data_enable.eq(self.random_data_enable.storage),
core.random_addr_enable.eq(self.random_addr_enable.storage),
self.ticks.status.eq(core.ticks),
self.errors.status.eq(core.errors)
]