bslathi19/taxi
1
0
Fork 0
mirror of https://github.com/fpganinja/taxi.git synced 2025-12-07 00:28:38 -08:00
Code Issues Packages Projects Releases Wiki Activity

eth: Move link speed detection logic from MAC wrapper to PHY interface

Browse Source 
Signed-off-by: Alex Forencich <alex@alexforencich.com>
This commit is contained in:
Alex Forencich
2025-11-13 21:27:03 -08:00
parent a919552914
commit 729bf79427
4 changed files with 142 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/eth/rtl/taxi_eth_mac_1g_gmii.sv
View File

@@ -197,9 +197,6 @@ module taxi_eth_mac_1g_gmii #
input wire logic cfg_rx_pfc_en = 1'b0 input wire logic cfg_rx_pfc_en = 1'b0
); );
logic [1:0] link_speed_reg = 2'b10;
logic mii_select_reg = 1'b0;
wire tx_mii_select_sync; wire tx_mii_select_sync;
taxi_sync_signal #( taxi_sync_signal #(
@@ -208,7 +205,7 @@ taxi_sync_signal #(
) )
tx_mii_select_sync_inst ( tx_mii_select_sync_inst (
.clk(tx_clk), .clk(tx_clk),
.in(mii_select_reg), .in(!link_speed[1]),
.out(tx_mii_select_sync) .out(tx_mii_select_sync)
); );
@@ -220,74 +217,10 @@ taxi_sync_signal #(
) )
rx_mii_select_sync_inst ( rx_mii_select_sync_inst (
.clk(rx_clk), .clk(rx_clk),
.in(mii_select_reg), .in(!link_speed[1]),
.out(rx_mii_select_sync) .out(rx_mii_select_sync)
); );
// PHY speed detection
logic [2:0] rx_prescale = 3'd0;
always_ff @(posedge rx_clk) begin
rx_prescale <= rx_prescale + 3'd1;
end
wire rx_prescale_sync;
taxi_sync_signal #(
.WIDTH(1),
.N(2)
)
rx_prescale_sync_inst (
.clk(gtx_clk),
.in(rx_prescale[2]),
.out(rx_prescale_sync)
);
logic [6:0] rx_speed_count_1 = 0;
logic [1:0] rx_speed_count_2 = 0;
logic rx_prescale_sync_last_reg = 1'b0;
always_ff @(posedge gtx_clk) begin
rx_prescale_sync_last_reg <= rx_prescale_sync;
rx_speed_count_1 <= rx_speed_count_1 + 1;
if (rx_prescale_sync ^ rx_prescale_sync_last_reg) begin
rx_speed_count_2 <= rx_speed_count_2 + 1;
end
if (&rx_speed_count_1) begin
// reference count overflow - 10M
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
link_speed_reg <= 2'b00;
mii_select_reg <= 1'b1;
end
if (&rx_speed_count_2) begin
// prescaled count overflow - 100M or 1000M
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
if (rx_speed_count_1[6:5] != 0) begin
// large reference count - 100M
link_speed_reg <= 2'b01;
mii_select_reg <= 1'b1;
end else begin
// small reference count - 1000M
link_speed_reg <= 2'b10;
mii_select_reg <= 1'b0;
end
end
if (gtx_rst) begin
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
link_speed_reg <= 2'b10;
mii_select_reg <= 1'b0;
end
end
assign link_speed = link_speed_reg;
wire [7:0] mac_gmii_rxd; wire [7:0] mac_gmii_rxd;
wire mac_gmii_rx_dv; wire mac_gmii_rx_dv;
wire mac_gmii_rx_er; wire mac_gmii_rx_er;
@@ -331,7 +264,7 @@ gmii_phy_if_inst (
.phy_gmii_tx_en(gmii_tx_en), .phy_gmii_tx_en(gmii_tx_en),
.phy_gmii_tx_er(gmii_tx_er), .phy_gmii_tx_er(gmii_tx_er),
.mii_select(mii_select_reg) .link_speed(link_speed)
); );
taxi_eth_mac_1g #( taxi_eth_mac_1g #(

73
src/eth/rtl/taxi_eth_mac_1g_rgmii.sv
View File

@@ -196,9 +196,6 @@ module taxi_eth_mac_1g_rgmii #
input wire logic cfg_rx_pfc_en = 1'b0 input wire logic cfg_rx_pfc_en = 1'b0
); );
logic [1:0] link_speed_reg = 2'b10;
logic mii_select_reg = 1'b0;
wire tx_mii_select_sync; wire tx_mii_select_sync;
taxi_sync_signal #( taxi_sync_signal #(
@@ -207,7 +204,7 @@ taxi_sync_signal #(
) )
tx_mii_select_sync_inst ( tx_mii_select_sync_inst (
.clk(tx_clk), .clk(tx_clk),
.in(mii_select_reg), .in(!link_speed[1]),
.out(tx_mii_select_sync) .out(tx_mii_select_sync)
); );
@@ -219,74 +216,10 @@ taxi_sync_signal #(
) )
rx_mii_select_sync_inst ( rx_mii_select_sync_inst (
.clk(rx_clk), .clk(rx_clk),
.in(mii_select_reg), .in(!link_speed[1]),
.out(rx_mii_select_sync) .out(rx_mii_select_sync)
); );
// PHY speed detection
logic [2:0] rx_prescale = 3'd0;
always_ff @(posedge rx_clk) begin
rx_prescale <= rx_prescale + 3'd1;
end
wire rx_prescale_sync;
taxi_sync_signal #(
.WIDTH(1),
.N(2)
)
rx_prescale_sync_inst (
.clk(gtx_clk),
.in(rx_prescale[2]),
.out(rx_prescale_sync)
);
logic [6:0] rx_speed_count_1 = 0;
logic [1:0] rx_speed_count_2 = 0;
logic rx_prescale_sync_last_reg = 1'b0;
always_ff @(posedge gtx_clk) begin
rx_prescale_sync_last_reg <= rx_prescale_sync;
rx_speed_count_1 <= rx_speed_count_1 + 1;
if (rx_prescale_sync ^ rx_prescale_sync_last_reg) begin
rx_speed_count_2 <= rx_speed_count_2 + 1;
end
if (&rx_speed_count_1) begin
// reference count overflow - 10M
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
link_speed_reg <= 2'b00;
mii_select_reg <= 1'b1;
end
if (&rx_speed_count_2) begin
// prescaled count overflow - 100M or 1000M
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
if (rx_speed_count_1[6:5] != 0) begin
// large reference count - 100M
link_speed_reg <= 2'b01;
mii_select_reg <= 1'b1;
end else begin
// small reference count - 1000M
link_speed_reg <= 2'b10;
mii_select_reg <= 1'b0;
end
end
if (gtx_rst) begin
rx_speed_count_1 <= 0;
rx_speed_count_2 <= 0;
link_speed_reg <= 2'b10;
mii_select_reg <= 1'b0;
end
end
assign link_speed = link_speed_reg;
wire [7:0] mac_gmii_rxd; wire [7:0] mac_gmii_rxd;
wire mac_gmii_rx_dv; wire mac_gmii_rx_dv;
wire mac_gmii_rx_er; wire mac_gmii_rx_er;
@@ -331,7 +264,7 @@ rgmii_phy_if_inst (
.phy_rgmii_txd(rgmii_txd), .phy_rgmii_txd(rgmii_txd),
.phy_rgmii_tx_ctl(rgmii_tx_ctl), .phy_rgmii_tx_ctl(rgmii_tx_ctl),
.speed(link_speed) .link_speed(link_speed)
); );
taxi_eth_mac_1g #( taxi_eth_mac_1g #(

74
src/eth/rtl/taxi_gmii_phy_if.sv
View File

@@ -56,11 +56,73 @@ module taxi_gmii_phy_if #
output wire logic phy_gmii_tx_er, output wire logic phy_gmii_tx_er,
/* /*
* Control * Status
*/ */
input wire logic mii_select output wire logic [1:0] link_speed
); );
// PHY speed detection
logic [2:0] rx_prescale = 3'd0;
always_ff @(posedge mac_gmii_rx_clk) begin
rx_prescale <= rx_prescale + 3'd1;
end
wire rx_prescale_sync;
taxi_sync_signal #(
.WIDTH(1),
.N(2)
)
rx_prescale_sync_inst (
.clk(gtx_clk),
.in(rx_prescale[2]),
.out(rx_prescale_sync)
);
logic [6:0] rx_speed_count_1 = '0;
logic [1:0] rx_speed_count_2 = '0;
logic rx_prescale_sync_last_reg = 1'b0;
logic [1:0] link_speed_reg = '0;
assign link_speed = link_speed_reg;
always_ff @(posedge gtx_clk) begin
rx_prescale_sync_last_reg <= rx_prescale_sync;
rx_speed_count_1 <= rx_speed_count_1 + 1;
if (rx_prescale_sync ^ rx_prescale_sync_last_reg) begin
rx_speed_count_2 <= rx_speed_count_2 + 1;
end
if (&rx_speed_count_1) begin
// reference count overflow - 10M
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
link_speed_reg <= 2'b00;
end
if (&rx_speed_count_2) begin
// prescaled count overflow - 100M or 1000M
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
if (rx_speed_count_1[6:5] != 0) begin
// large reference count - 100M
link_speed_reg <= 2'b01;
end else begin
// small reference count - 1000M
link_speed_reg <= 2'b10;
end
end
if (gtx_rst) begin
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
link_speed_reg <= 2'b10;
end
end
taxi_ssio_sdr_in #( taxi_ssio_sdr_in #(
.SIM(SIM), .SIM(SIM),
.VENDOR(VENDOR), .VENDOR(VENDOR),
@@ -92,16 +154,16 @@ if (!SIM && VENDOR == "XILINX") begin
BUFGMUX BUFGMUX
gmii_bufgmux_inst ( gmii_bufgmux_inst (
.I0(gtx_clk), .I0(phy_mii_tx_clk),
.I1(phy_mii_tx_clk), .I1(gtx_clk),
.S(mii_select), .S(link_speed_reg[1]),
.O(mac_gmii_tx_clk) .O(mac_gmii_tx_clk)
); );
end else begin end else begin
// generic/simulation implementation (no vendor primitives) // generic/simulation implementation (no vendor primitives)
assign mac_gmii_tx_clk = mii_select ? phy_mii_tx_clk : gtx_clk; assign mac_gmii_tx_clk = link_speed_reg[1] ? gtx_clk : phy_mii_tx_clk;
end end

74
src/eth/rtl/taxi_rgmii_phy_if.sv
View File

@@ -57,11 +57,73 @@ module taxi_rgmii_phy_if #
output wire logic phy_rgmii_tx_ctl, output wire logic phy_rgmii_tx_ctl,
/* /*
* Control * Status
*/ */
input wire logic [1:0] speed output wire logic [1:0] link_speed
); );
// PHY speed detection
logic [2:0] rx_prescale = 3'd0;
always_ff @(posedge mac_gmii_rx_clk) begin
rx_prescale <= rx_prescale + 3'd1;
end
wire rx_prescale_sync;
taxi_sync_signal #(
.WIDTH(1),
.N(2)
)
rx_prescale_sync_inst (
.clk(gtx_clk),
.in(rx_prescale[2]),
.out(rx_prescale_sync)
);
logic [6:0] rx_speed_count_1 = '0;
logic [1:0] rx_speed_count_2 = '0;
logic rx_prescale_sync_last_reg = 1'b0;
logic [1:0] link_speed_reg = '0;
assign link_speed = link_speed_reg;
always_ff @(posedge gtx_clk) begin
rx_prescale_sync_last_reg <= rx_prescale_sync;
rx_speed_count_1 <= rx_speed_count_1 + 1;
if (rx_prescale_sync ^ rx_prescale_sync_last_reg) begin
rx_speed_count_2 <= rx_speed_count_2 + 1;
end
if (&rx_speed_count_1) begin
// reference count overflow - 10M
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
link_speed_reg <= 2'b00;
end
if (&rx_speed_count_2) begin
// prescaled count overflow - 100M or 1000M
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
if (rx_speed_count_1[6:5] != 0) begin
// large reference count - 100M
link_speed_reg <= 2'b01;
end else begin
// small reference count - 1000M
link_speed_reg <= 2'b10;
end
end
if (gtx_rst) begin
rx_speed_count_1 <= '0;
rx_speed_count_2 <= '0;
link_speed_reg <= 2'b10;
end
end
// receive // receive
wire rgmii_rx_ctl_1; wire rgmii_rx_ctl_1;
@@ -95,7 +157,7 @@ logic [5:0] count_reg = 6'd0, count_next;
always_ff @(posedge gtx_clk) begin always_ff @(posedge gtx_clk) begin
rgmii_tx_clk_1_reg <= rgmii_tx_clk_2_reg; rgmii_tx_clk_1_reg <= rgmii_tx_clk_2_reg;
if (speed == 2'b00) begin if (link_speed_reg == 2'b00) begin
// 10M // 10M
count_reg <= count_reg + 1; count_reg <= count_reg + 1;
rgmii_tx_clk_en_reg <= 1'b0; rgmii_tx_clk_en_reg <= 1'b0;
@@ -107,7 +169,7 @@ always_ff @(posedge gtx_clk) begin
rgmii_tx_clk_en_reg <= 1'b1; rgmii_tx_clk_en_reg <= 1'b1;
count_reg <= 0; count_reg <= 0;
end end
end else if (speed == 2'b01) begin end else if (link_speed_reg == 2'b01) begin
// 100M // 100M
count_reg <= count_reg + 1; count_reg <= count_reg + 1;
rgmii_tx_clk_en_reg <= 1'b0; rgmii_tx_clk_en_reg <= 1'b0;
@@ -142,7 +204,7 @@ logic rgmii_tx_ctl_2;
logic gmii_clk_en; logic gmii_clk_en;
always_comb begin always_comb begin
if (speed == 2'b00) begin if (link_speed_reg == 2'b00) begin
// 10M // 10M
rgmii_txd_1 = mac_gmii_txd[3:0]; rgmii_txd_1 = mac_gmii_txd[3:0];
rgmii_txd_2 = mac_gmii_txd[3:0]; rgmii_txd_2 = mac_gmii_txd[3:0];
@@ -154,7 +216,7 @@ always_comb begin
rgmii_tx_ctl_2 = mac_gmii_tx_en; rgmii_tx_ctl_2 = mac_gmii_tx_en;
end end
gmii_clk_en = rgmii_tx_clk_en_reg; gmii_clk_en = rgmii_tx_clk_en_reg;
end else if (speed == 2'b01) begin end else if (link_speed_reg == 2'b01) begin
// 100M // 100M
rgmii_txd_1 = mac_gmii_txd[3:0]; rgmii_txd_1 = mac_gmii_txd[3:0];
rgmii_txd_2 = mac_gmii_txd[3:0]; rgmii_txd_2 = mac_gmii_txd[3:0];