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

sdram: remove nbits from modules and databits from GeomSettings

This commit is contained in:
Florent Kermarrec 2015-03-26 23:27:37 +01:00
parent 38d24b637e
commit 9137b91e9e
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misoclib/mem/sdram/__init__.py
View File

@ -4,8 +4,8 @@ PhySettingsT = namedtuple("PhySettings", "memtype dfi_databits nphases rdphase w
def PhySettings(memtype, dfi_databits, nphases, rdphase, wrphase, rdcmdphase, wrcmdphase, cl, read_latency, write_latency, cwl=0): def PhySettings(memtype, dfi_databits, nphases, rdphase, wrphase, rdcmdphase, wrcmdphase, cl, read_latency, write_latency, cwl=0):
return PhySettingsT(memtype, dfi_databits, nphases, rdphase, wrphase, rdcmdphase, wrcmdphase, cl, cwl, read_latency, write_latency) return PhySettingsT(memtype, dfi_databits, nphases, rdphase, wrphase, rdcmdphase, wrcmdphase, cl, cwl, read_latency, write_latency)
GeomSettingsT = namedtuple("_GeomSettings", "databits bankbits rowbits colbits addressbits") GeomSettingsT = namedtuple("_GeomSettings", "bankbits rowbits colbits addressbits")
def GeomSettings(databits, bankbits, rowbits, colbits): def GeomSettings(bankbits, rowbits, colbits):
return GeomSettingsT(databits, bankbits, rowbits, colbits, max(rowbits, colbits)) return GeomSettingsT(bankbits, rowbits, colbits, max(rowbits, colbits))
TimingSettings = namedtuple("TimingSettings", "tRP tRCD tWR tWTR tREFI tRFC") TimingSettings = namedtuple("TimingSettings", "tRP tRCD tWR tWTR tREFI tRFC")

8
misoclib/mem/sdram/module.py
View File

@ -25,7 +25,6 @@ class SDRAMModule:
self.clk_freq = clk_freq self.clk_freq = clk_freq
self.memtype = memtype self.memtype = memtype
self.geom_settings = sdram.GeomSettings( self.geom_settings = sdram.GeomSettings(
databits=geom_settings["nbits"],
bankbits=log2_int(geom_settings["nbanks"]), bankbits=log2_int(geom_settings["nbanks"]),
rowbits=log2_int(geom_settings["nrows"]), rowbits=log2_int(geom_settings["nrows"]),
colbits=log2_int(geom_settings["ncols"]), colbits=log2_int(geom_settings["ncols"]),
@ -48,7 +47,6 @@ class SDRAMModule:
# SDR # SDR
class IS42S16160(SDRAMModule): class IS42S16160(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 16,
"nbanks": 4, "nbanks": 4,
"nrows": 8192, "nrows": 8192,
"ncols": 512 "ncols": 512
@ -68,7 +66,6 @@ class IS42S16160(SDRAMModule):
class MT48LC4M16(SDRAMModule): class MT48LC4M16(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 16,
"nbanks": 4, "nbanks": 4,
"nrows": 4096, "nrows": 4096,
"ncols": 256 "ncols": 256
@ -87,7 +84,6 @@ class MT48LC4M16(SDRAMModule):
class AS4C16M16(SDRAMModule): class AS4C16M16(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 16,
"nbanks": 4, "nbanks": 4,
"nrows": 8192, "nrows": 8192,
"ncols": 512 "ncols": 512
@ -108,7 +104,6 @@ class AS4C16M16(SDRAMModule):
# DDR # DDR
class MT46V32M16(SDRAMModule): class MT46V32M16(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 16,
"nbanks": 4, "nbanks": 4,
"nrows": 8192, "nrows": 8192,
"ncols": 1024 "ncols": 1024
@ -128,7 +123,6 @@ class MT46V32M16(SDRAMModule):
# LPDDR # LPDDR
class MT46H32M16(SDRAMModule): class MT46H32M16(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 16,
"nbanks": 4, "nbanks": 4,
"nrows": 8192, "nrows": 8192,
"ncols": 1024 "ncols": 1024
@ -148,7 +142,6 @@ class MT46H32M16(SDRAMModule):
# DDR2 # DDR2
class MT47H128M8(SDRAMModule): class MT47H128M8(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 8,
"nbanks": 8, "nbanks": 8,
"nrows": 16384, "nrows": 16384,
"ncols": 1024 "ncols": 1024
@ -168,7 +161,6 @@ class MT47H128M8(SDRAMModule):
# DDR3 # DDR3
class MT8JTF12864(SDRAMModule): class MT8JTF12864(SDRAMModule):
geom_settings = { geom_settings = {
"nbits": 8,
"nbanks": 8, "nbanks": 8,
"nrows": 65536, "nrows": 65536,
"ncols": 1024 "ncols": 1024

8
misoclib/mem/sdram/phy/simphy.py
View File

@ -87,9 +87,8 @@ class DFIPhase(Module):
] ]
class SDRAMPHYSim(Module): class SDRAMPHYSim(Module):
def __init__(self, module, nmodules=1): def __init__(self, module, data_width):
addressbits = module.geom_settings.addressbits addressbits = module.geom_settings.addressbits
databits = module.geom_settings.databits
bankbits = module.geom_settings.bankbits bankbits = module.geom_settings.bankbits
rowbits = module.geom_settings.rowbits rowbits = module.geom_settings.rowbits
colbits = module.geom_settings.colbits colbits = module.geom_settings.colbits
@ -97,7 +96,7 @@ class SDRAMPHYSim(Module):
# XXX expose this to user # XXX expose this to user
self.settings = sdram.PhySettings( self.settings = sdram.PhySettings(
memtype=module.memtype, memtype=module.memtype,
dfi_databits=databits, dfi_databits=data_width,
nphases=1, nphases=1,
rdphase=0, rdphase=0,
wrphase=0, wrphase=0,
@ -109,13 +108,12 @@ class SDRAMPHYSim(Module):
) )
self.module = module self.module = module
self.dfi = Interface(addressbits, bankbits, databits) self.dfi = Interface(addressbits, bankbits, data_width)
### ###
nbanks = 2**bankbits nbanks = 2**bankbits
nrows = 2**rowbits nrows = 2**rowbits
ncols = 2**colbits ncols = 2**colbits
data_width = databits*nmodules
# DFI phases # DFI phases
phases = [DFIPhase(self.dfi, n) for n in range(self.settings.nphases)] phases = [DFIPhase(self.dfi, n) for n in range(self.settings.nphases)]