From 8564b7eb6a0e33a5a32d2141c07dfdd1c2220116 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Sat, 28 Feb 2015 11:44:14 +0100 Subject: [PATCH] soc: move SDRAMSoC to a separate sdram.py file (ideally part of SDRAMSoC should move mem/sdram) --- misoclib/soc/__init__.py | 82 -------------------------------------- misoclib/soc/sdram.py | 86 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 82 deletions(-) create mode 100644 misoclib/soc/sdram.py diff --git a/misoclib/soc/__init__.py b/misoclib/soc/__init__.py index 28071461..dd0c1ff8 100644 --- a/misoclib/soc/__init__.py +++ b/misoclib/soc/__init__.py @@ -9,10 +9,6 @@ from migen.bus import wishbone, csr, wishbone2csr from misoclib.com import uart from misoclib.cpu import CPU, lm32, mor1kx from misoclib.cpu.peripherals import identifier, timer -from misoclib.mem.sdram.bus import dfi, lasmibus, wishbone2lasmi -from misoclib.mem.sdram import minicon,lasmicon -from misoclib.mem.sdram import dfii -from misoclib.mem.sdram import memtest def mem_decoder(address, start=26, end=29): return lambda a: a[start:end] == ((address >> (start+2)) & (2**(end-start))-1) @@ -191,81 +187,3 @@ class SoC(Module): def do_exit(self, vns): pass - -class SDRAMSoC(SoC): - csr_map = { - "dfii": 6, - "lasmicon": 7, - "wishbone2lasmi": 8, - "memtest_w": 9, - "memtest_r": 10 - } - csr_map.update(SoC.csr_map) - - def __init__(self, platform, clk_freq, - ramcon_type="lasmicon", - with_l2=True, l2_size=8192, - with_memtest=False, - **kwargs): - SoC.__init__(self, platform, clk_freq, **kwargs) - self.ramcon_type = ramcon_type - - self.with_l2 = with_l2 - self.l2_size = l2_size - - self.with_memtest = with_memtest - - self._sdram_phy_registered = False - - def register_sdram_phy(self, phy_dfi, phy_settings, sdram_geom, sdram_timing): - if self._sdram_phy_registered: - raise FinalizeError - self._sdram_phy_registered = True - - # DFI - self.submodules.dfii = dfii.DFIInjector(sdram_geom.mux_a, sdram_geom.bank_a, - phy_settings.dfi_d, phy_settings.nphases) - self.submodules.dficon0 = dfi.Interconnect(self.dfii.master, phy_dfi) - - # LASMICON - if self.ramcon_type == "lasmicon": - self.submodules.lasmicon = lasmicon.LASMIcon(phy_settings, sdram_geom, sdram_timing) - self.submodules.dficon1 = dfi.Interconnect(self.lasmicon.dfi, self.dfii.slave) - - self.submodules.lasmixbar = lasmibus.Crossbar([self.lasmicon.lasmic], self.lasmicon.nrowbits) - - if self.with_memtest: - self.submodules.memtest_w = memtest.MemtestWriter(self.lasmixbar.get_master()) - self.submodules.memtest_r = memtest.MemtestReader(self.lasmixbar.get_master()) - - if self.with_l2: - self.submodules.wishbone2lasmi = wishbone2lasmi.WB2LASMI(self.l2_size//4, self.lasmixbar.get_master()) - sdram_size = 2**self.lasmicon.lasmic.aw*self.lasmicon.lasmic.dw*self.lasmicon.lasmic.nbanks//8 - self.register_mem("sdram", self.mem_map["sdram"], self.wishbone2lasmi.wishbone, sdram_size) - - # MINICON - elif self.ramcon_type == "minicon": - if self.with_l2: - raise ValueError("MINICON does not implement L2 cache (Use LASMICON or disable L2 cache (with_l2=False))") - - self.submodules.minicon = sdramcon = minicon.Minicon(phy_settings, sdram_geom, sdram_timing) - self.submodules.dficon1 = dfi.Interconnect(sdramcon.dfi, self.dfii.slave) - sdram_width = flen(sdramcon.bus.dat_r) - - sdram_size = 2**(sdram_geom.bank_a+sdram_geom.row_a+sdram_geom.col_a)*sdram_width//8 - - if sdram_width == 32: - self.register_mem("sdram", self.mem_map["sdram"], sdramcon.bus, sdram_size) - elif sdram_width < 32: - self.submodules.dc = wishbone.DownConverter(32, sdram_width) - self.submodules.intercon = wishbone.InterconnectPointToPoint(self.dc.wishbone_o, sdramcon.bus) - self.register_mem("sdram", self.mem_map["sdram"], self.dc.wishbone_i, sdram_size) - else: - raise NotImplementedError("Unsupported SDRAM width of {} > 32".format(sdram_width)) - else: - raise ValueError("Unsupported SDRAM controller type: {}".format(self.ramcon_type)) - - def do_finalize(self): - if not self._sdram_phy_registered: - raise FinalizeError("Need to call SDRAMSoC.register_sdram_phy()") - SoC.do_finalize(self) diff --git a/misoclib/soc/sdram.py b/misoclib/soc/sdram.py new file mode 100644 index 00000000..4b948854 --- /dev/null +++ b/misoclib/soc/sdram.py @@ -0,0 +1,86 @@ +from migen.fhdl.std import * +from migen.bus import wishbone, csr + +from misoclib.mem.sdram.bus import dfi, lasmibus, wishbone2lasmi +from misoclib.mem.sdram import minicon, lasmicon +from misoclib.mem.sdram import dfii +from misoclib.mem.sdram import memtest +from misoclib.soc import Soc, mem_decoder + +class SDRAMSoC(SoC): + csr_map = { + "dfii": 6, + "lasmicon": 7, + "wishbone2lasmi": 8, + "memtest_w": 9, + "memtest_r": 10 + } + csr_map.update(SoC.csr_map) + + def __init__(self, platform, clk_freq, + ramcon_type="lasmicon", + with_l2=True, l2_size=8192, + with_memtest=False, + **kwargs): + SoC.__init__(self, platform, clk_freq, **kwargs) + self.ramcon_type = ramcon_type + + self.with_l2 = with_l2 + self.l2_size = l2_size + + self.with_memtest = with_memtest + + self._sdram_phy_registered = False + + def register_sdram_phy(self, phy_dfi, phy_settings, sdram_geom, sdram_timing): + if self._sdram_phy_registered: + raise FinalizeError + self._sdram_phy_registered = True + + # DFI + self.submodules.dfii = dfii.DFIInjector(sdram_geom.mux_a, sdram_geom.bank_a, + phy_settings.dfi_d, phy_settings.nphases) + self.submodules.dficon0 = dfi.Interconnect(self.dfii.master, phy_dfi) + + # LASMICON + if self.ramcon_type == "lasmicon": + self.submodules.lasmicon = lasmicon.LASMIcon(phy_settings, sdram_geom, sdram_timing) + self.submodules.dficon1 = dfi.Interconnect(self.lasmicon.dfi, self.dfii.slave) + + self.submodules.lasmixbar = lasmibus.Crossbar([self.lasmicon.lasmic], self.lasmicon.nrowbits) + + if self.with_memtest: + self.submodules.memtest_w = memtest.MemtestWriter(self.lasmixbar.get_master()) + self.submodules.memtest_r = memtest.MemtestReader(self.lasmixbar.get_master()) + + if self.with_l2: + self.submodules.wishbone2lasmi = wishbone2lasmi.WB2LASMI(self.l2_size//4, self.lasmixbar.get_master()) + sdram_size = 2**self.lasmicon.lasmic.aw*self.lasmicon.lasmic.dw*self.lasmicon.lasmic.nbanks//8 + self.register_mem("sdram", self.mem_map["sdram"], self.wishbone2lasmi.wishbone, sdram_size) + + # MINICON + elif self.ramcon_type == "minicon": + if self.with_l2: + raise ValueError("MINICON does not implement L2 cache (Use LASMICON or disable L2 cache (with_l2=False))") + + self.submodules.minicon = sdramcon = minicon.Minicon(phy_settings, sdram_geom, sdram_timing) + self.submodules.dficon1 = dfi.Interconnect(sdramcon.dfi, self.dfii.slave) + sdram_width = flen(sdramcon.bus.dat_r) + + sdram_size = 2**(sdram_geom.bank_a+sdram_geom.row_a+sdram_geom.col_a)*sdram_width//8 + + if sdram_width == 32: + self.register_mem("sdram", self.mem_map["sdram"], sdramcon.bus, sdram_size) + elif sdram_width < 32: + self.submodules.dc = wishbone.DownConverter(32, sdram_width) + self.submodules.intercon = wishbone.InterconnectPointToPoint(self.dc.wishbone_o, sdramcon.bus) + self.register_mem("sdram", self.mem_map["sdram"], self.dc.wishbone_i, sdram_size) + else: + raise NotImplementedError("Unsupported SDRAM width of {} > 32".format(sdram_width)) + else: + raise ValueError("Unsupported SDRAM controller type: {}".format(self.ramcon_type)) + + def do_finalize(self): + if not self._sdram_phy_registered: + raise FinalizeError("Need to call SDRAMSoC.register_sdram_phy()") + SoC.do_finalize(self) -- 2.30.2