asmicon/multiplexer: correct read-to-write delay to prevent conflicts on the tag bus
[litex.git] / top.py
diff --git a/top.py b/top.py
index 473674060639c8b94e4d77fb7df47511606af139..a219234106e0947472addb89f3cb5fdcd4e2181b 100644 (file)
--- a/top.py
+++ b/top.py
@@ -1,50 +1,91 @@
 from fractions import Fraction
+from math import ceil
 
 from migen.fhdl.structure import *
 from migen.fhdl import verilog, autofragment
-from migen.bus import wishbone, asmibus, wishbone2asmi, csr, wishbone2csr, dfi
+from migen.bus import wishbone, wishbone2asmi, csr, wishbone2csr, dfi
 
-from milkymist import m1crg, lm32, norflash, uart, sram, s6ddrphy, dfii
-import constraints
+from milkymist import m1crg, lm32, norflash, uart, sram, s6ddrphy, dfii, asmicon, \
+       identifier, timer, minimac3, framebuffer, asmiprobe
+from cmacros import get_macros
+from constraints import Constraints
 
 MHz = 1000000
 clk_freq = (83 + Fraction(1, 3))*MHz
 sram_size = 4096 # in bytes
 l2_size = 8192 # in bytes
 
-dfi_a = 13
-dfi_ba = 2
-dfi_d = 128 # TODO -> 64
+clk_period_ns = 1000000000/clk_freq
+def ns(t, margin=True):
+       if margin:
+               t += clk_period_ns/2
+       return ceil(t/clk_period_ns)
+
+sdram_phy = asmicon.PhySettings(
+       dfi_d=64, 
+       nphases=2,
+       rdphase=0,
+       wrphase=1
+)
+sdram_geom = asmicon.GeomSettings(
+       bank_a=2,
+       row_a=13,
+       col_a=10
+)
+sdram_timing = asmicon.TimingSettings(
+       tRP=ns(15),
+       tRCD=ns(15),
+       tWR=ns(15),
+       tREFI=ns(7800, False),
+       tRFC=ns(70),
+       
+       CL=3,
+       rd_delay=4,
+
+       read_time=32,
+       write_time=16
+)
 
 def ddrphy_clocking(crg, phy):
        names = [
-               "clk2x_90",
-               "clk4x_wr_left",
-               "clk4x_wr_strb_left",
-               "clk4x_wr_right",
-               "clk4x_wr_strb_right",
-               "clk4x_rd_left",
-               "clk4x_rd_strb_left",
-               "clk4x_rd_right",
-               "clk4x_rd_strb_right",
+               "clk2x_270",
+               "clk4x_wr",
+               "clk4x_wr_strb",
+               "clk4x_rd",
+               "clk4x_rd_strb"
        ]
        comb = [getattr(phy, name).eq(getattr(crg, name)) for name in names]
        return Fragment(comb)
 
+csr_macros = get_macros("common/csrbase.h")
+def csr_offset(name):
+       base = int(csr_macros[name + "_BASE"], 0)
+       assert((base >= 0xe0000000) and (base <= 0xe0010000))
+       return (base - 0xe0000000)//0x800
+
+interrupt_macros = get_macros("common/interrupt.h")
+def interrupt_n(name):
+       return int(interrupt_macros[name + "_INTERRUPT"], 0)
+
+version = get_macros("common/version.h")["VERSION"][1:-1]
+
 def get():
        #
        # ASMI
        #
-       asmihub0 = asmibus.Hub(23, 128, 12) # TODO: get hub from memory controller
-       asmiport_wb = asmihub0.get_port()
-       asmihub0.finalize()
+       asmicon0 = asmicon.ASMIcon(sdram_phy, sdram_geom, sdram_timing)
+       asmiport_wb = asmicon0.hub.get_port()
+       asmiport_fb = asmicon0.hub.get_port(2)
+       asmicon0.finalize()
        
        #
        # DFI
        #
-       ddrphy0 = s6ddrphy.S6DDRPHY(1, dfi_a, dfi_ba, dfi_d)
-       dfii0 = dfii.DFIInjector(2, dfi_a, dfi_ba, dfi_d, 1)
+       ddrphy0 = s6ddrphy.S6DDRPHY(sdram_geom.mux_a, sdram_geom.bank_a, sdram_phy.dfi_d)
+       dfii0 = dfii.DFIInjector(csr_offset("DFII"),
+               sdram_geom.mux_a, sdram_geom.bank_a, sdram_phy.dfi_d, sdram_phy.nphases)
        dficon0 = dfi.Interconnect(dfii0.master, ddrphy0.dfi)
+       dficon1 = dfi.Interconnect(asmicon0.dfi, dfii0.slave)
 
        #
        # WISHBONE
@@ -52,6 +93,7 @@ def get():
        cpu0 = lm32.LM32()
        norflash0 = norflash.NorFlash(25, 12)
        sram0 = sram.SRAM(sram_size//4)
+       minimac0 = minimac3.MiniMAC(csr_offset("MINIMAC"))
        wishbone2asmi0 = wishbone2asmi.WB2ASMI(l2_size//4, asmiport_wb)
        wishbone2csr0 = wishbone2csr.WB2CSR()
        
@@ -68,6 +110,7 @@ def get():
                ], [
                        (binc("000"), norflash0.bus),
                        (binc("001"), sram0.bus),
+                       (binc("011"), minimac0.membus),
                        (binc("10"), wishbone2asmi0.wishbone),
                        (binc("11"), wishbone2csr0.wishbone)
                ],
@@ -77,18 +120,28 @@ def get():
        #
        # CSR
        #
-       uart0 = uart.UART(0, clk_freq, baud=115200)
+       uart0 = uart.UART(csr_offset("UART"), clk_freq, baud=115200)
+       identifier0 = identifier.Identifier(csr_offset("ID"), 0x4D31, version, int(clk_freq))
+       timer0 = timer.Timer(csr_offset("TIMER0"))
+       fb0 = framebuffer.Framebuffer(csr_offset("FB"), asmiport_fb)
+       asmiprobe0 = asmiprobe.ASMIprobe(csr_offset("ASMIPROBE"), asmicon0.hub)
        csrcon0 = csr.Interconnect(wishbone2csr0.csr, [
                uart0.bank.interface,
-               ddrphy0.bank.interface,
-               dfii0.bank.interface
+               dfii0.bank.interface,
+               identifier0.bank.interface,
+               timer0.bank.interface,
+               minimac0.bank.interface,
+               fb0.bank.interface,
+               asmiprobe0.bank.interface
        ])
        
        #
        # Interrupts
        #
        interrupts = Fragment([
-               cpu0.interrupt[0].eq(uart0.events.irq)
+               cpu0.interrupt[interrupt_n("UART")].eq(uart0.events.irq),
+               cpu0.interrupt[interrupt_n("TIMER0")].eq(timer0.events.irq),
+               cpu0.interrupt[interrupt_n("MINIMAC")].eq(minimac0.events.irq)
        ])
        
        #
@@ -96,12 +149,19 @@ def get():
        #
        crg0 = m1crg.M1CRG(50*MHz, clk_freq)
        
-       frag = autofragment.from_local() + interrupts + ddrphy_clocking(crg0, ddrphy0)
+       vga_clocking = Fragment([
+               fb0.vga_clk.eq(crg0.vga_clk)
+       ])
+       frag = autofragment.from_local() \
+               + interrupts \
+               + ddrphy_clocking(crg0, ddrphy0) \
+               + vga_clocking
+       cst = Constraints(crg0, norflash0, uart0, ddrphy0, minimac0, fb0)
        src_verilog, vns = verilog.convert(frag,
-               {crg0.trigger_reset},
+               cst.get_ios(),
                name="soc",
                clk_signal=crg0.sys_clk,
                rst_signal=crg0.sys_rst,
                return_ns=True)
-       src_ucf = constraints.get(vns, crg0, norflash0, uart0, ddrphy0)
+       src_ucf = cst.get_ucf(vns)
        return (src_verilog, src_ucf)