From d137811952c792a7f22080f69093d91cd4f8e49d Mon Sep 17 00:00:00 2001
From: Adrian Costina <adrian.costina@analog.com>
Date: Tue, 16 Jun 2015 17:39:31 +0300
Subject: [PATCH] util_gmii_to_rgmii: Updated core so that it has an option to
 include a delay controller.

It also allows to configure the fixed delay value so that no additional constraints are needed
The default value of 18 seems to work very well(450mbps tx / 640 mbps rx) on the motor control platform used for tests
---
 .../util_gmii_to_rgmii/util_gmii_to_rgmii.v   | 52 +++++++++++++++++++
 .../util_gmii_to_rgmii_ip.tcl                 |  3 ++
 2 files changed, 55 insertions(+)

diff --git a/library/util_gmii_to_rgmii/util_gmii_to_rgmii.v b/library/util_gmii_to_rgmii/util_gmii_to_rgmii.v
index 3ad00a845..3c971ff13 100644
--- a/library/util_gmii_to_rgmii/util_gmii_to_rgmii.v
+++ b/library/util_gmii_to_rgmii/util_gmii_to_rgmii.v
@@ -43,6 +43,7 @@ module util_gmii_to_rgmii (
   clk_20m,
   clk_25m,
   clk_125m,
+  idelayctrl_clk,
 
   reset,
 
@@ -69,10 +70,14 @@ module util_gmii_to_rgmii (
   gmii_rx_clk);
 
   parameter PHY_AD = 5'b10000;
+  parameter IODELAY_CTRL = 1'b0;
+  parameter IDELAY_VALUE = 18;
+  parameter IODELAY_GROUP = "if_delay_group";
 
   input           clk_20m;
   input           clk_25m;
   input           clk_125m;
+  input           idelayctrl_clk;
 
   input           reset;
 
@@ -129,6 +134,9 @@ module util_gmii_to_rgmii (
   reg             gmii_rx_dv;
   reg             gmii_rx_er;
 
+  reg             idelayctrl_reset;
+  reg [ 3:0]      idelay_reset_cnt;
+
   assign gigabit        = speed_selection [1];
   assign gmii_tx_clk    = gmii_tx_clk_s;
 
@@ -236,11 +244,13 @@ module util_gmii_to_rgmii (
     .I(rgmii_rxc),
     .O(gmii_rx_clk));
 
+  (* IODELAY_GROUP = IODELAY_GROUP *)
   IDELAYE2 #(
     .IDELAY_TYPE("FIXED"),
     .HIGH_PERFORMANCE_MODE("TRUE"),
     .REFCLK_FREQUENCY(200.0),
     .SIGNAL_PATTERN("DATA"),
+    .IDELAY_VALUE (IDELAY_VALUE),
     .DELAY_SRC("IDATAIN")
   ) delay_rgmii_rx_ctl (
     .IDATAIN(rgmii_rx_ctl),
@@ -258,11 +268,13 @@ module util_gmii_to_rgmii (
 
   generate
   for (i = 0; i < 4; i = i + 1) begin
+  (* IODELAY_GROUP = IODELAY_GROUP *)
     IDELAYE2 #(
       .IDELAY_TYPE("FIXED"),
       .HIGH_PERFORMANCE_MODE("TRUE"),
       .REFCLK_FREQUENCY(200.0),
       .SIGNAL_PATTERN("DATA"),
+      .IDELAY_VALUE (IDELAY_VALUE),
       .DELAY_SRC("IDATAIN")
     ) delay_rgmii_rd (
       .IDATAIN(rgmii_rd[i]),
@@ -311,4 +323,44 @@ module util_gmii_to_rgmii (
       .speed_select(speed_selection),
       .duplex_mode(duplex_mode));
 
+  // DELAY CONTROLLER
+  generate
+  if (IODELAY_CTRL == 1'b1) begin
+    always @(posedge idelayctrl_clk) begin
+      if (reset == 1'b1) begin
+        idelay_reset_cnt <= 4'h0;
+        idelayctrl_reset <= 1'b1;
+      end else begin
+        idelayctrl_reset <= 1'b1;
+        case (idelay_reset_cnt)
+          4'h0: idelay_reset_cnt <= 4'h1;
+          4'h1: idelay_reset_cnt <= 4'h2;
+          4'h2: idelay_reset_cnt <= 4'h3;
+          4'h3: idelay_reset_cnt <= 4'h4;
+          4'h4: idelay_reset_cnt <= 4'h5;
+          4'h5: idelay_reset_cnt <= 4'h6;
+          4'h6: idelay_reset_cnt <= 4'h7;
+          4'h7: idelay_reset_cnt <= 4'h8;
+          4'h8: idelay_reset_cnt <= 4'h9;
+          4'h9: idelay_reset_cnt <= 4'ha;
+          4'ha: idelay_reset_cnt <= 4'hb;
+          4'hb: idelay_reset_cnt <= 4'hc;
+          4'hc: idelay_reset_cnt <= 4'hd;
+          4'hd: idelay_reset_cnt <= 4'he;
+          default: begin
+            idelay_reset_cnt <= 4'he;
+            idelayctrl_reset <= 1'b0;
+          end
+        endcase
+      end
+    end
+
+    (* IODELAY_GROUP = IODELAY_GROUP *)
+    IDELAYCTRL dlyctrl (
+      .RDY(),
+      .REFCLK(idelayctrl_clk),
+      .RST(idelayctrl_reset));
+  end
+  endgenerate
+
 endmodule
diff --git a/library/util_gmii_to_rgmii/util_gmii_to_rgmii_ip.tcl b/library/util_gmii_to_rgmii/util_gmii_to_rgmii_ip.tcl
index b0e8dc1b2..079f67940 100644
--- a/library/util_gmii_to_rgmii/util_gmii_to_rgmii_ip.tcl
+++ b/library/util_gmii_to_rgmii/util_gmii_to_rgmii_ip.tcl
@@ -19,4 +19,7 @@ set_property name {gmii} [ipx::get_bus_interface gmii_rtl_1 [ipx::current_core]]
 ipx::infer_bus_interface {rgmii_td rgmii_tx_ctl rgmii_txc rgmii_rd rgmii_rx_ctl rgmii_rxc} xilinx.com:interface:rgmii_rtl:1.0 [ipx::current_core]
 set_property value ACTIVE_HIGH [ipx::get_bus_parameters POLARITY -of_objects [ipx::get_bus_interfaces signal_reset -of_objects [ipx::current_core]]]
 
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.IODELAY_CTRL')) = 1} \
+  [ipx::get_ports idelayctrl_clk -of_objects [ipx::current_core]]
+
 ipx::save_core [ipx::current_core]