From 73b5143cec3855d9841c33439be906e23f157b7c Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Mon, 17 Jan 2022 12:44:59 +0100 Subject: [PATCH 1/7] antmicro_datacenter: add DCI_CASCADE Signed-off-by: Karol Gugala --- litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py index 719096b4..b919d17d 100644 --- a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py @@ -61,7 +61,7 @@ _io = [ "AF17 AE17 AF20 AD19 AE15 AE16 AF19 AD18", "Y18 Y17 W14 V14 AA20 AA15 V18 W16", "AA18 AB19 V16 W15 AB17 AA17 V19 V17"), - IOStandard("SSTL12")), + IOStandard("SSTL12_T_DCI")), Subsignal("dqs_p", Pins( "W10 W6 AB1 AA5 AD20 AE18 W18 Y15 AF5", "B17 D19 L19 J15 T24 P19 R16 M25 AC8"), @@ -134,6 +134,7 @@ class Platform(XilinxPlatform): self.add_platform_command("set_property INTERNAL_VREF 0.6 [get_iobanks 32]") self.add_platform_command("set_property INTERNAL_VREF 0.6 [get_iobanks 33]") self.add_platform_command("set_property INTERNAL_VREF 0.6 [get_iobanks 34]") + self.add_platform_command("set_property DCI_CASCADE {{32 34}} [get_iobanks 33]") def create_programmer(self): return OpenOCD("openocd_xc7_ft4232.cfg", "bscan_spi_xc7k100t.bit") From 5359fc5bfcd2a623f05bc0b7bdb4037b620853c5 Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Mon, 17 Jan 2022 12:47:39 +0100 Subject: [PATCH 2/7] antmicro_datacenter: use A7DDRPHY Signed-off-by: Karol Gugala --- .../antmicro_datacenter_ddr4_test_board.py | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py index 70ab772c..d7995166 100755 --- a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py @@ -21,7 +21,7 @@ from litex.soc.integration.builder import * from litex.soc.cores.led import LedChaser from litedram.modules import MTA18ASF2G72PZ -from litedram.phy.s7ddrphy import K7DDRPHY +from litedram.phy.s7ddrphy import A7DDRPHY from liteeth.phy import LiteEthS7PHYRGMII from litex.soc.cores.hyperbus import HyperRAM @@ -30,19 +30,21 @@ from litex.soc.cores.hyperbus import HyperRAM class _CRG(Module): def __init__(self, platform, sys_clk_freq, iodelay_clk_freq): - self.clock_domains.cd_sys = ClockDomain() - self.clock_domains.cd_sys2x = ClockDomain(reset_less=True) - self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) - self.clock_domains.cd_idelay = ClockDomain() + self.clock_domains.cd_sys = ClockDomain() + self.clock_domains.cd_sys2x = ClockDomain(reset_less=True) + self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) + self.clock_domains.cd_sys4x_dqs = ClockDomain(reset_less=True) + self.clock_domains.cd_idelay = ClockDomain() # # # self.submodules.pll = pll = S7PLL(speedgrade=-1) pll.register_clkin(platform.request("clk100"), 100e6) - pll.create_clkout(self.cd_sys, sys_clk_freq) - pll.create_clkout(self.cd_sys2x, 2 * sys_clk_freq) - pll.create_clkout(self.cd_sys4x, 4 * sys_clk_freq) - pll.create_clkout(self.cd_idelay, iodelay_clk_freq) + pll.create_clkout(self.cd_sys, sys_clk_freq) + pll.create_clkout(self.cd_sys2x, 2 * sys_clk_freq) + pll.create_clkout(self.cd_sys4x, 4 * sys_clk_freq) + pll.create_clkout(self.cd_sys4x_dqs, 4 * sys_clk_freq, phase=90) + pll.create_clkout(self.cd_idelay, iodelay_clk_freq) self.submodules.idelayctrl = S7IDELAYCTRL(self.cd_idelay) @@ -65,7 +67,7 @@ class BaseSoC(SoCCore): # DDR4 SDRAM RDIMM ------------------------------------------------------------------------- if not self.integrated_main_ram_size: - self.submodules.ddrphy = K7DDRPHY(platform.request("ddr4"), + self.submodules.ddrphy = A7DDRPHY(platform.request("ddr4"), memtype = "DDR4", iodelay_clk_freq = iodelay_clk_freq, sys_clk_freq = sys_clk_freq, From 37905d1f34a61c75acdf415892b85ae40ba6cfb1 Mon Sep 17 00:00:00 2001 From: Piotr Binkowski Date: Wed, 19 Jan 2022 17:00:45 +0100 Subject: [PATCH 3/7] antmicro_datacenter: use correct DQS pins --- .../platforms/antmicro_datacenter_ddr4_test_board.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py index b919d17d..b6883b53 100644 --- a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py @@ -63,12 +63,12 @@ _io = [ "AA18 AB19 V16 W15 AB17 AA17 V19 V17"), IOStandard("SSTL12_T_DCI")), Subsignal("dqs_p", Pins( - "W10 W6 AB1 AA5 AD20 AE18 W18 Y15 AF5", - "B17 D19 L19 J15 T24 P19 R16 M25 AC8"), + "W10 B17 W6 D19 AB1 L19 AA5 J15", + "AD20 T24 AE18 P19 W18 R16 Y15 M25"), IOStandard("DIFF_HSUL_12")), Subsignal("dqs_n", Pins( - "W9 W5 AC1 AB5 AE20 AF18 W19 Y16 AF4", - "A17 D20 L20 J16 T25 P20 R17 L25 AD8"), + "W9 A17 W5 D20 AC1 L20 AB5 J16", + "AE20 T25 AF18 P20 W19 R17 Y16 L25"), IOStandard("DIFF_HSUL_12")), Subsignal("clk_p", Pins("AE12 AB12"), IOStandard("DIFF_SSTL12_DCI")), Subsignal("clk_n", Pins("AF12 AC12"), IOStandard("DIFF_SSTL12_DCI")), From 9976b47f72587fde746f185eded0c4740a7b5b3b Mon Sep 17 00:00:00 2001 From: Piotr Binkowski Date: Wed, 19 Jan 2022 17:01:33 +0100 Subject: [PATCH 4/7] antmicro_datacenter: generate outputs for rowhammer-tester --- .../antmicro_datacenter_ddr4_test_board.py | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py index d7995166..2a66da0f 100755 --- a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py @@ -8,6 +8,7 @@ import os import argparse import math +import json from migen import * @@ -22,6 +23,9 @@ from litex.soc.cores.led import LedChaser from litedram.modules import MTA18ASF2G72PZ from litedram.phy.s7ddrphy import A7DDRPHY +from litedram.init import get_sdram_phy_py_header +from litedram.core.controller import ControllerSettings +from litedram.common import PhySettings, GeomSettings, TimingSettings from liteeth.phy import LiteEthS7PHYRGMII from litex.soc.cores.hyperbus import HyperRAM @@ -116,8 +120,29 @@ class BaseSoC(SoCCore): pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) + def generate_sdram_phy_py_header(self, output_file): + os.makedirs(os.path.dirname(output_file), exist_ok=True) + f = open(output_file, "w") + f.write(get_sdram_phy_py_header( + self.sdram.controller.settings.phy, + self.sdram.controller.settings.timing)) + f.close() + + # Build -------------------------------------------------------------------------------------------- +class LiteDRAMSettingsEncoder(json.JSONEncoder): + def default(self, o): + if isinstance(o, (ControllerSettings, GeomSettings, PhySettings, TimingSettings)): + ignored = ['self', 'refresh_cls'] + return {k: v for k, v in vars(o).items() if k not in ignored} + elif isinstance(o, Signal) and isinstance(o.reset, Constant): + return o.reset + elif isinstance(o, Constant): + return o.value + print('o', end=' = '); __import__('pprint').pprint(o) + return super().default(o) + def main(): parser = argparse.ArgumentParser(description="LiteX SoC on LPDDR4 Test Board") target = parser.add_argument_group(title="Target options") @@ -159,6 +184,12 @@ def main(): builder = Builder(soc, **builder_argdict(args)) vns = builder.build(**vivado_build_argdict(args), run=args.build) + builder.soc.generate_sdram_phy_py_header(os.path.join(builder.output_dir, "sdram_init.py")) + + # LiteDRAM settings (controller, phy, geom, timing) + with open(os.path.join(builder.output_dir, 'litedram_settings.json'), 'w') as f: + json.dump(builder.soc.sdram.controller.settings, f, cls=LiteDRAMSettingsEncoder, indent=4) + if args.load: prog = soc.platform.create_programmer() prog.load_bitstream(os.path.join(builder.gateware_dir, soc.build_name + ".bit")) From d6fddc746f6f6dadecb4003de1a51ea6d705fa54 Mon Sep 17 00:00:00 2001 From: Piotr Binkowski Date: Mon, 24 Jan 2022 17:22:18 +0100 Subject: [PATCH 5/7] antmicro_datacenter: use single rank configuration --- .../platforms/antmicro_datacenter_ddr4_test_board.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py index b6883b53..093878a3 100644 --- a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py @@ -46,7 +46,7 @@ _io = [ Subsignal("ras_n", Pins("AA12"), IOStandard("SSTL12_DCI")), # A16 Subsignal("cas_n", Pins("AF13"), IOStandard("SSTL12_DCI")), # A15 Subsignal("we_n", Pins("AA13"), IOStandard("SSTL12_DCI")), # A14 - Subsignal("cs_n", Pins("W13 AA14 AC14 AF15"), IOStandard("SSTL12_DCI")), + Subsignal("cs_n", Pins("W13"), IOStandard("SSTL12_DCI")), Subsignal("act_n", Pins("Y8"), IOStandard("SSTL12_DCI")), Subsignal("alert_n", Pins("AE10"), IOStandard("SSTL12_DCI")), Subsignal("par", Pins("AE13"), IOStandard("SSTL12_DCI")), @@ -70,10 +70,10 @@ _io = [ "W9 A17 W5 D20 AC1 L20 AB5 J16", "AE20 T25 AF18 P20 W19 R17 Y16 L25"), IOStandard("DIFF_HSUL_12")), - Subsignal("clk_p", Pins("AE12 AB12"), IOStandard("DIFF_SSTL12_DCI")), - Subsignal("clk_n", Pins("AF12 AC12"), IOStandard("DIFF_SSTL12_DCI")), - Subsignal("cke", Pins("AA8 AA7"), IOStandard("SSTL12_DCI")), # also AM15 for larger SODIMMs - Subsignal("odt", Pins("Y13 AB14"), IOStandard("SSTL12_DCI")), # also AM16 for larger SODIMMs + Subsignal("clk_p", Pins("AE12"), IOStandard("DIFF_SSTL12_DCI")), + Subsignal("clk_n", Pins("AF12"), IOStandard("DIFF_SSTL12_DCI")), + Subsignal("cke", Pins("AA8"), IOStandard("SSTL12_DCI")), # also AM15 for larger SODIMMs + Subsignal("odt", Pins("Y13"), IOStandard("SSTL12_DCI")), # also AM16 for larger SODIMMs Subsignal("reset_n", Pins("AB6"), IOStandard("SSTL12")), Misc("SLEW=FAST"), ), From 0b80890119b3db65fb63d71687cba3c182e493f8 Mon Sep 17 00:00:00 2001 From: Piotr Binkowski Date: Wed, 26 Jan 2022 15:57:34 +0100 Subject: [PATCH 6/7] antmicro_datacenter: add 1 cycle of latency for RCD IC --- litex_boards/targets/antmicro_datacenter_ddr4_test_board.py | 1 + 1 file changed, 1 insertion(+) diff --git a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py index 2a66da0f..af7fd35f 100755 --- a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py @@ -75,6 +75,7 @@ class BaseSoC(SoCCore): memtype = "DDR4", iodelay_clk_freq = iodelay_clk_freq, sys_clk_freq = sys_clk_freq, + cmd_latency = 1, is_rdimm = True, ) self.add_sdram("sdram", From db2d83ea29110ae06f7283d02ec3295dd80cf5fa Mon Sep 17 00:00:00 2001 From: Alessandro Comodi Date: Wed, 23 Feb 2022 15:24:29 +0100 Subject: [PATCH 7/7] antmicro_datacenter: use 100 MHz and add i2c master Signed-off-by: Alessandro Comodi --- .../platforms/antmicro_datacenter_ddr4_test_board.py | 7 +++++++ .../targets/antmicro_datacenter_ddr4_test_board.py | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py index 093878a3..ab6cc530 100644 --- a/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/platforms/antmicro_datacenter_ddr4_test_board.py @@ -116,6 +116,13 @@ _io = [ Misc("SLEW=FAST"), IOStandard("LVCMOS33"), ), + + # I2C + ("i2c", 0, + Subsignal("scl", Pins("Y6")), + Subsignal("sda", Pins("Y5")), + IOStandard("SSTL12_T_DCI"), + ), ] # Platform ----------------------------------------------------------------------------------------- diff --git a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py index af7fd35f..06fff6de 100755 --- a/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py +++ b/litex_boards/targets/antmicro_datacenter_ddr4_test_board.py @@ -20,6 +20,7 @@ from litex.soc.integration.soc_core import * from litex.soc.integration.soc import SoCRegion from litex.soc.integration.builder import * from litex.soc.cores.led import LedChaser +from litex.soc.cores.bitbang import I2CMaster from litedram.modules import MTA18ASF2G72PZ from litedram.phy.s7ddrphy import A7DDRPHY @@ -75,7 +76,6 @@ class BaseSoC(SoCCore): memtype = "DDR4", iodelay_clk_freq = iodelay_clk_freq, sys_clk_freq = sys_clk_freq, - cmd_latency = 1, is_rdimm = True, ) self.add_sdram("sdram", @@ -121,6 +121,10 @@ class BaseSoC(SoCCore): pads = platform.request_all("user_led"), sys_clk_freq = sys_clk_freq) + # System I2C (behing multiplexer) ---------------------------------------------------------- + i2c_pads = platform.request('i2c') + self.submodules.i2c = I2CMaster(i2c_pads) + def generate_sdram_phy_py_header(self, output_file): os.makedirs(os.path.dirname(output_file), exist_ok=True) f = open(output_file, "w") @@ -150,7 +154,7 @@ def main(): target.add_argument("--build", action="store_true", help="Build bitstream.") target.add_argument("--load", action="store_true", help="Load bitstream.") target.add_argument("--flash", action="store_true", help="Flash bitstream.") - target.add_argument("--sys-clk-freq", default=50e6, help="System clock frequency.") + target.add_argument("--sys-clk-freq", default=100e6, help="System clock frequency.") target.add_argument("--iodelay-clk-freq", default=200e6, help="IODELAYCTRL frequency.") ethopts = target.add_mutually_exclusive_group() ethopts.add_argument("--with-ethernet", action="store_true", help="Add Ethernet.")