From 4154bdf0345b6ec2aa3bc417a843adbc5e0b354d Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Mon, 20 Apr 2020 12:30:09 +0200 Subject: [PATCH] targets/PCIe: add PCIe software reset. --- litex_boards/targets/aller.py | 11 ++++++++++- litex_boards/targets/nereid.py | 12 ++++++++++-- litex_boards/targets/tagus.py | 12 ++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/litex_boards/targets/aller.py b/litex_boards/targets/aller.py index 24154b12..6c06e411 100755 --- a/litex_boards/targets/aller.py +++ b/litex_boards/targets/aller.py @@ -8,6 +8,7 @@ import argparse import sys from migen import * +from migen.genlib.misc import WaitTimer from litex.build import tools @@ -38,17 +39,25 @@ from litepcie.frontend.wishbone import LitePCIeWishboneBridge class CRG(Module, AutoCSR): def __init__(self, platform, sys_clk_freq): - self.reset = CSR() # FIXME: not used for now + self.rst = CSR() self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) self.clock_domains.cd_sys4x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() + # Clk/Rst clk100 = platform.request("clk100") platform.add_period_constraint(clk100, 1e9/100e6) + # Delay software reset by 10us to ensure write has been acked on PCIe. + rst_delay = WaitTimer(int(10e-6*sys_clk_freq)) + self.submodules += rst_delay + self.sync += If(self.rst.re, rst_delay.wait.eq(1)) + + # PLL self.submodules.pll = pll = S7PLL() + self.comb += pll.reset.eq(rst_delay.done) pll.register_clkin(clk100, 100e6) pll.create_clkout(self.cd_sys, sys_clk_freq) pll.create_clkout(self.cd_sys4x, 4*sys_clk_freq) diff --git a/litex_boards/targets/nereid.py b/litex_boards/targets/nereid.py index 73f335bf..f5831eae 100755 --- a/litex_boards/targets/nereid.py +++ b/litex_boards/targets/nereid.py @@ -8,6 +8,7 @@ import argparse import sys from migen import * +from migen.genlib.misc import WaitTimer from litex.build import tools @@ -38,17 +39,24 @@ from litepcie.frontend.wishbone import LitePCIeWishboneBridge class CRG(Module, AutoCSR): def __init__(self, platform, sys_clk_freq): - self.reset = CSR() # FIXME: not used for now + self.rst = CSR() self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() + # Clk/Rst clk100 = platform.request("clk100") platform.add_period_constraint(clk100, 1e9/100e6) + # Delay software reset by 10us to ensure write has been acked on PCIe. + rst_delay = WaitTimer(int(10e-6*sys_clk_freq)) + self.submodules += rst_delay + self.sync += If(self.rst.re, rst_delay.wait.eq(1)) + + # PLL self.submodules.pll = pll = S7PLL() - self.comb += pll.reset.eq(platform.request("cpu_reset")) + self.comb += pll.reset.eq(rst_delay.done) pll.register_clkin(clk100, 100e6) pll.create_clkout(self.cd_sys, sys_clk_freq) pll.create_clkout(self.cd_sys4x, 4*sys_clk_freq) diff --git a/litex_boards/targets/tagus.py b/litex_boards/targets/tagus.py index 0afa61f0..89eb333e 100755 --- a/litex_boards/targets/tagus.py +++ b/litex_boards/targets/tagus.py @@ -8,6 +8,7 @@ import argparse import sys from migen import * +from migen.genlib.misc import WaitTimer from litex.build import tools @@ -36,18 +37,25 @@ from litepcie.frontend.wishbone import LitePCIeWishboneBridge class CRG(Module, AutoCSR): def __init__(self, platform, sys_clk_freq): - self.reset = CSR() # FIXME: not used for now + self.rst = CSR() self.clock_domains.cd_sys = ClockDomain() self.clock_domains.cd_sys4x = ClockDomain(reset_less=True) self.clock_domains.cd_sys4x_dqs = ClockDomain(reset_less=True) self.clock_domains.cd_clk200 = ClockDomain() + # Clk/Rst clk100 = platform.request("clk100") platform.add_period_constraint(clk100, 1e9/100e6) + # Delay software reset by 10us to ensure write has been acked on PCIe. + rst_delay = WaitTimer(int(10e-6*sys_clk_freq)) + self.submodules += rst_delay + self.sync += If(self.rst.re, rst_delay.wait.eq(1)) + + # PLL self.submodules.pll = pll = S7PLL() - self.comb += pll.reset.eq(platform.request("rst")) + self.comb += pll.reset.eq(rst_delay.done) pll.register_clkin(clk100, 100e6) pll.create_clkout(self.cd_sys, sys_clk_freq) pll.create_clkout(self.cd_sys4x, 4*sys_clk_freq)