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

s6ddrphy: revert CAS LATENCY 3 (configurable CAS Latency was buggy)

This commit is contained in:
Florent Kermarrec 2013-07-16 10:43:15 +02:00 committed by Sebastien Bourdeauducq
parent 525c32976b
commit fb06d803e1
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
milkymist/s6ddrphy/__init__.py
View File

@ -8,31 +8,41 @@
# #
# Assert dfi_rddata_en in the same cycle as the read # Assert dfi_rddata_en in the same cycle as the read
# command. The data will come back on dfi_rddata # command. The data will come back on dfi_rddata
# CL + 2 cycles later, along with the assertion # 5 cycles later, along with the assertion
# of dfi_rddata_valid. # of dfi_rddata_valid.
# #
# This PHY supports configurable CAS Latency. # This PHY only supports CAS Latency 3.
# Read commands must be sent on phase RDPHASE. # Read commands must be sent on phase RDPHASE.
# Write commands must be sent on phase WRPHASE. # Write commands must be sent on phase WRPHASE.
#/ #/
# Todo: # Todo:
# - use CSR for bitslip? # - use CSR for bitslip?
# - add configurable CAS Latency
# - automatically determines wrphase / rdphase / latencies according to phy_settings
from migen.fhdl.std import * from migen.fhdl.std import *
from migen.bus.dfi import * from migen.bus.dfi import *
from migen.genlib.record import * from migen.genlib.record import *
def get_latencies(phy_settings):
read_latency=5
write_latency=0
return read_latency, write_latency
class S6DDRPHY(Module): class S6DDRPHY(Module):
def __init__(self, pads, phy_settings, bitslip): def __init__(self, pads, phy_settings, bitslip):
if phy_settings.type not in ["DDR", "LPDDR", "DDR2"]: if phy_settings.type not in ["DDR", "LPDDR", "DDR2"]:
raise NotImplementedError("S6DDRPHY only supports DDR, LPDDR and DDR2") raise NotImplementedError("S6DDRPHY only supports DDR, LPDDR and DDR2")
if phy_settings.cl != 3:
raise NotImplementedError("S6DDRPHY only supports CAS LATENCY 3 for now")
a = flen(pads.a) a = flen(pads.a)
ba = flen(pads.ba) ba = flen(pads.ba)
d = flen(pads.dq) d = flen(pads.dq)
nphases = phy_settings.nphases nphases = phy_settings.nphases
self.phy_settings = phy_settings self.phy_settings = phy_settings
read_latency, write_latency = get_latencies(phy_settings)
self.dfi = Interface(a, ba, nphases*d, nphases) self.dfi = Interface(a, ba, nphases*d, nphases)
self.clk4x_wr_strb = Signal() self.clk4x_wr_strb = Signal()
@ -57,7 +67,7 @@ class S6DDRPHY(Module):
# #
# select active phase # select active phase
# sys_clk ____----____---- # sys_clk ----____----____
# phase_sel(nphases=1) 0 0 # phase_sel(nphases=1) 0 0
# phase_sel(nphases=2) 0 1 0 1 # phase_sel(nphases=2) 0 1 0 1
# phase_sel(nphases=4) 0 1 2 3 0 1 2 3 # phase_sel(nphases=4) 0 1 2 3 0 1 2 3
@ -338,11 +348,11 @@ class S6DDRPHY(Module):
self.comb += drive_dqs.eq(r_dfi_wrdata_en[1]) self.comb += drive_dqs.eq(r_dfi_wrdata_en[1])
rddata_sr = Signal(phy_settings.cl+2) rddata_sr = Signal(read_latency)
sd_sys += rddata_sr.eq(Cat(rddata_sr[1:phy_settings.cl+2], d_dfi[phy_settings.rdphase].rddata_en)) sd_sys += rddata_sr.eq(Cat(rddata_sr[1:read_latency], d_dfi[phy_settings.rdphase].rddata_en))
for n, phase in enumerate(self.dfi.phases): for n, phase in enumerate(self.dfi.phases):
self.comb += [ self.comb += [
phase.rddata.eq(d_dfi[n].rddata), phase.rddata.eq(d_dfi[n].rddata),
phase.rddata_valid.eq(rddata_sr[0]), phase.rddata_valid.eq(rddata_sr[0]),
] ]

5
top.py
View File

@ -38,6 +38,7 @@ sdram_geom = lasmicon.GeomSettings(
row_a=13, row_a=13,
col_a=10 col_a=10
) )
sdram_phy_read_latency, sdram_phy_write_latency = s6ddrphy.get_latencies(sdram_phy)
sdram_timing = lasmicon.TimingSettings( sdram_timing = lasmicon.TimingSettings(
tRP=ns(15), tRP=ns(15),
tRCD=ns(15), tRCD=ns(15),
@ -46,8 +47,8 @@ sdram_timing = lasmicon.TimingSettings(
tREFI=ns(7800, False), tREFI=ns(7800, False),
tRFC=ns(70), tRFC=ns(70),
read_latency=5, read_latency=sdram_phy_read_latency+0,
write_latency=0, write_latency=sdram_phy_write_latency+0,
req_queue_size=8, req_queue_size=8,
read_time=32, read_time=32,