Skip to content

Commit

Permalink
phy/efinix: Avoid manual PLL numbering and add auto-numbering for aut…
Browse files Browse the repository at this point in the history 
…o_eth names.
  • Loading branch information
@enjoy-digital
enjoy-digital committed Sep 11, 2023
1 parent 44f739a commit 41ad929
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 34 deletions.
36 changes: 19 additions & 17 deletions liteeth/phy/titaniumrgmii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# LiteEth PHY RGMII TX -----------------------------------------------------------------------------

class LiteEthPHYRGMIITX(LiteXModule):
def __init__(self, platform, pads):
def __init__(self, platform, pads, n=0):
self.sink = sink = stream.Endpoint(eth_phy_description(8))

# # #
Expand All @@ -36,7 +36,7 @@ def __init__(self, platform, pads):
i1 = tx_data_h[n],
i2 = tx_data_l[n],
o = pads.tx_data[n],
clk = "auto_eth_tx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_tx_clk", # FIXME: Use Clk Signal.
)

# TX Ctl IOs.
Expand All @@ -47,7 +47,7 @@ def __init__(self, platform, pads):
i1 = tx_ctl_h,
i2 = tx_ctl_l,
o = pads.tx_ctl,
clk = "auto_eth_tx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_tx_clk", # FIXME: Use Clk Signal.
)

# Logic.
Expand All @@ -66,7 +66,7 @@ def __init__(self, platform, pads):
# LiteEth PHY RGMII RX -----------------------------------------------------------------------------

class LiteEthPHYRGMIIRX(LiteXModule):
def __init__(self, platform, pads):
def __init__(self, platform, pads, n=0):
self.source = source = stream.Endpoint(eth_phy_description(8))

# # #
Expand All @@ -80,7 +80,7 @@ def __init__(self, platform, pads):
i = pads.rx_data[n],
o1 = rx_data_h[n],
o2 = rx_data_l[n],
clk = "auto_eth_rx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_rx_clk", # FIXME: Use Clk Signal.
)

# RX Ctl IOs.
Expand All @@ -91,7 +91,7 @@ def __init__(self, platform, pads):
i = pads.rx_ctl,
o1 = rx_ctl_h,
o2 = rx_ctl_l,
clk = "auto_eth_rx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_rx_clk", # FIXME: Use Clk Signal.
)

rx_ctl = rx_ctl_h
Expand All @@ -116,7 +116,7 @@ def __init__(self, platform, pads):
# LiteEth PHY RGMII CRG ----------------------------------------------------------------------------

class LiteEthPHYRGMIICRG(LiteXModule):
def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256):
def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256, n=0):
self._reset = CSRStorage()

# # #
Expand All @@ -128,7 +128,7 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256

# RX Clk.
# -------
eth_rx_clk = platform.add_iface_io("auto_eth_rx_clk_in")
eth_rx_clk = platform.add_iface_io(f"auto_eth{n}_rx_clk_in")
block = {
"type" : "GPIO",
"size" : 1,
Expand All @@ -147,19 +147,19 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256
"size" : 1,
"location" : platform.get_pin_location(clock_pads.tx)[0],
"properties" : platform.get_pin_properties(clock_pads.tx),
"name" : "auto_eth_tx_clk_delayed",
"name" : f"auto_eth{n}_tx_clk_delayed",
"mode" : "OUTPUT_CLK"
}
platform.toolchain.ifacewriter.blocks.append(block)
platform.toolchain.excluded_ios.append(clock_pads.tx)

# TX PLL.
# -------
self.pll = pll = TITANIUMPLL(platform, n=1) # FIXME: Add Auto-Numbering.
pll.register_clkin(None, freq=125e6, name="auto_eth_rx_clk_in")
pll.create_clkout(self.cd_eth_rx, freq=125e6, phase=0, name="auto_eth_rx_clk", with_reset=False)
pll.create_clkout(self.cd_eth_tx, freq=125e6, phase=0, name="auto_eth_tx_clk", with_reset=False)
pll.create_clkout(None, freq=125e6, phase=90, name="auto_eth_tx_clk_delayed")
self.pll = pll = TITANIUMPLL(platform)
pll.register_clkin(None, freq=125e6, name=f"auto_eth{n}_rx_clk_in")
pll.create_clkout(self.cd_eth_rx, freq=125e6, phase=0, name=f"auto_eth{n}_rx_clk", with_reset=False)
pll.create_clkout(self.cd_eth_tx, freq=125e6, phase=0, name=f"auto_eth{n}_tx_clk", with_reset=False)
pll.create_clkout(None, freq=125e6, phase=90, name=f"auto_eth{n}_tx_clk_delayed")

# Reset.
# ------
Expand All @@ -179,14 +179,16 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256
# LiteEth PHY RGMII --------------------------------------------------------------------------------

class LiteEthPHYRGMII(LiteXModule):
n = 0
dw = 8
tx_clk_freq = 125e6
rx_clk_freq = 125e6
def __init__(self, platform, clock_pads, pads, with_hw_init_reset=True, hw_reset_cycles=256):
self.crg = LiteEthPHYRGMIICRG(platform, clock_pads, with_hw_init_reset, hw_reset_cycles)
self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(platform, pads))
self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(platform, pads))
self.crg = LiteEthPHYRGMIICRG(platform, clock_pads, with_hw_init_reset, hw_reset_cycles, n=self.n)
self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(platform, pads, n=self.n))
self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(platform, pads, n=self.n))
self.sink, self.source = self.tx.sink, self.rx.source
LiteEthPHYRGMII.n += 1 # FIXME: Improve.

if hasattr(pads, "mdc"):
self.mdio = LiteEthPHYMDIO(pads)
36 changes: 19 additions & 17 deletions liteeth/phy/trionrgmii.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# LiteEth PHY RGMII TX -----------------------------------------------------------------------------

class LiteEthPHYRGMIITX(LiteXModule):
def __init__(self, platform, pads):
def __init__(self, platform, pads, n=0):
self.sink = sink = stream.Endpoint(eth_phy_description(8))

# # #
Expand All @@ -36,7 +36,7 @@ def __init__(self, platform, pads):
i1 = tx_data_h[n],
i2 = tx_data_l[n],
o = pads.tx_data[n],
clk = "auto_eth_tx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_tx_clk", # FIXME: Use Clk Signal.
)

# TX Ctl IOs.
Expand All @@ -47,7 +47,7 @@ def __init__(self, platform, pads):
i1 = tx_ctl_h,
i2 = tx_ctl_l,
o = pads.tx_ctl,
clk = "auto_eth_tx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_tx_clk", # FIXME: Use Clk Signal.
)

# Logic.
Expand All @@ -66,7 +66,7 @@ def __init__(self, platform, pads):
# LiteEth PHY RGMII RX -----------------------------------------------------------------------------

class LiteEthPHYRGMIIRX(LiteXModule):
def __init__(self, platform, pads):
def __init__(self, platform, pads, n=0):
self.source = source = stream.Endpoint(eth_phy_description(8))

# # #
Expand All @@ -80,7 +80,7 @@ def __init__(self, platform, pads):
i = pads.rx_data[n],
o1 = rx_data_h[n],
o2 = rx_data_l[n],
clk = "auto_eth_rx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_rx_clk", # FIXME: Use Clk Signal.
)

# RX Ctl IOs.
Expand All @@ -91,7 +91,7 @@ def __init__(self, platform, pads):
i = pads.rx_ctl,
o1 = rx_ctl_h,
o2 = rx_ctl_l,
clk = "auto_eth_rx_clk", # FIXME: Use Clk Signal.
clk = f"auto_eth{n}_rx_clk", # FIXME: Use Clk Signal.
)

rx_ctl = rx_ctl_h
Expand All @@ -116,7 +116,7 @@ def __init__(self, platform, pads):
# LiteEth PHY RGMII CRG ----------------------------------------------------------------------------

class LiteEthPHYRGMIICRG(LiteXModule):
def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256):
def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256, n=0):
self._reset = CSRStorage()

# # #
Expand All @@ -128,7 +128,7 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256

# RX Clk.
# -------
eth_rx_clk = platform.add_iface_io("auto_eth_rx_clk_in")
eth_rx_clk = platform.add_iface_io(f"auto_eth{n}_rx_clk_in")
block = {
"type" : "GPIO",
"size" : 1,
Expand All @@ -147,19 +147,19 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256
"size" : 1,
"location" : platform.get_pin_location(clock_pads.tx)[0],
"properties" : platform.get_pin_properties(clock_pads.tx),
"name" : "auto_eth_tx_clk_delayed",
"name" : f"auto_eth{n}_tx_clk_delayed",
"mode" : "OUTPUT_CLK"
}
platform.toolchain.ifacewriter.blocks.append(block)
platform.toolchain.excluded_ios.append(clock_pads.tx)

# TX PLL.
# -------
self.pll = pll = TRIONPLL(platform, n=1) # FIXME: Add Auto-Numbering.
pll.register_clkin(None, freq=125e6, name="auto_eth_rx_clk_in")
pll.create_clkout(self.cd_eth_rx, freq=125e6, phase=0, name="auto_eth_rx_clk", with_reset=False)
pll.create_clkout(self.cd_eth_tx, freq=125e6, phase=0, name="auto_eth_tx_clk", with_reset=False)
pll.create_clkout(None, freq=125e6, phase=90, name="auto_eth_tx_clk_delayed")
self.pll = pll = TRIONPLL(platform)
pll.register_clkin(None, freq=125e6, name=f"auto_eth{n}_rx_clk_in")
pll.create_clkout(self.cd_eth_rx, freq=125e6, phase=0, name=f"auto_eth{n}_rx_clk", with_reset=False)
pll.create_clkout(self.cd_eth_tx, freq=125e6, phase=0, name=f"auto_eth{n}_tx_clk", with_reset=False)
pll.create_clkout(None, freq=125e6, phase=90, name=f"auto_eth{n}_tx_clk_delayed")

# Reset.
# ------
Expand All @@ -179,14 +179,16 @@ def __init__(self, platform, clock_pads, with_hw_init_reset, hw_reset_cycles=256
# LiteEth PHY RGMII --------------------------------------------------------------------------------

class LiteEthPHYRGMII(LiteXModule):
n = 0
dw = 8
tx_clk_freq = 125e6
rx_clk_freq = 125e6
def __init__(self, platform, clock_pads, pads, with_hw_init_reset=True, hw_reset_cycles=256):
self.crg = LiteEthPHYRGMIICRG(platform, clock_pads, with_hw_init_reset, hw_reset_cycles)
self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(platform, pads))
self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(platform, pads))
self.crg = LiteEthPHYRGMIICRG(platform, clock_pads, with_hw_init_reset, hw_reset_cycles, n=self.n)
self.tx = ClockDomainsRenamer("eth_tx")(LiteEthPHYRGMIITX(platform, pads, n=self.n))
self.rx = ClockDomainsRenamer("eth_rx")(LiteEthPHYRGMIIRX(platform, pads, n=self.n))
self.sink, self.source = self.tx.sink, self.rx.source
LiteEthPHYRGMII.n += 1 # FIXME: Improve.

if hasattr(pads, "mdc"):
self.mdio = LiteEthPHYMDIO(pads)

0 comments on commit 41ad929

Please sign in to comment.