Skip to content

Commit 8738a92

Browse files
committed
n230: WIP: Wired PHY status signals to ZPU
- Also shrunk RX buffer size
1 parent f4d62b6 commit 8738a92

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

usrp3/top/n230/n230.v

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ module n230 (
528528
// LED's on SFPs
529529
///////////////////////////////////////////////////////////////////////
530530
wire [15:0] leds;
531-
assign { LED_ACT1, LED_ACT2, LED_LINK1, LED_LINK2} = ~leds[3:0];
531+
assign {LED_ACT1, LED_ACT2, LED_LINK1, LED_LINK2} = ~leds[3:0];
532532

533533
///////////////////////////////////////////////////////////////////////
534534
// SPI connections
@@ -617,18 +617,20 @@ module n230 (
617617
wire [7:0] gmii_rxd0;
618618
wire gmii_tx_en0, gmii_tx_er0;
619619
wire [7:0] gmii_txd0;
620+
wire [15:0] gmii_status0;
620621
wire mdc0, mdio_in0, mdio_out0;
621622

622623
wire gmii_rx_dv1, gmii_rx_er1;
623624
wire [7:0] gmii_rxd1;
624625
wire gmii_tx_en1, gmii_tx_er1;
625626
wire [7:0] gmii_txd1;
627+
wire [15:0] gmii_status1;
626628
wire mdc1, mdio_in1, mdio_out1;
627629

628630

629631
n230_core #(
630632
.EXTRA_TX_BUFF_SIZE(12),
631-
.EXTRA_RX_BUFF_SIZE(12)
633+
.EXTRA_RX_BUFF_SIZE(8)
632634
) n230_core (
633635
//------------------------------------------------------------------
634636
// bus interfaces
@@ -705,6 +707,7 @@ module n230 (
705707
.gmii_rxd0(gmii_rxd0),
706708
.gmii_rx_dv0(gmii_rx_dv0),
707709
.gmii_rx_er0(gmii_rx_er0),
710+
.gmii_status0(gmii_status0),
708711
.mdc0(mdc0),
709712
.mdio_in0(mdio_in0),
710713
.mdio_out0(mdio_out0),
@@ -719,6 +722,7 @@ module n230 (
719722
.gmii_rxd1(gmii_rxd1),
720723
.gmii_rx_dv1(gmii_rx_dv1),
721724
.gmii_rx_er1(gmii_rx_er1),
725+
.gmii_status1(gmii_status1),
722726
.mdc1(mdc1),
723727
.mdio_in1(mdio_in1),
724728
.mdio_out1(mdio_out1),
@@ -765,7 +769,6 @@ module n230 (
765769
);
766770

767771
wire ge_phy_resetdone0, ge_phy_resetdone1;
768-
wire [15:0] gmii_status0, gmii_status1; // Debug info useful for chipscope use.
769772

770773
OBUF pin_SFP0_TxDisable (.I(1'b0), .O(SFP0_TXDISABLE));
771774
OBUF pin_SFP1_TxDisable (.I(1'b0), .O(SFP1_TXDISABLE));

usrp3/top/n230/n230_core.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ module n230_core #(
109109
input [7:0] gmii_rxd0,
110110
input gmii_rx_dv0,
111111
input gmii_rx_er0,
112+
input [15:0] gmii_status0,
112113
output mdc0,
113114
output mdio_in0,
114115
input mdio_out0,
@@ -123,6 +124,7 @@ module n230_core #(
123124
input [7:0] gmii_rxd1,
124125
input gmii_rx_dv1,
125126
input gmii_rx_er1,
127+
input [15:0] gmii_status1,
126128
output mdc1,
127129
output mdio_in1,
128130
input mdio_out1,
@@ -759,6 +761,7 @@ module n230_core #(
759761
.gmii_rxd0(gmii_rxd0),
760762
.gmii_rx_dv0(gmii_rx_dv0),
761763
.gmii_rx_er0(gmii_rx_er0),
764+
.gmii_status0(gmii_status0),
762765
.mdc0(mdc0),
763766
.mdio_in0(mdio_in0),
764767
.mdio_out0(mdio_out0),
@@ -772,6 +775,7 @@ module n230_core #(
772775
.gmii_rxd1(gmii_rxd1),
773776
.gmii_rx_dv1(gmii_rx_dv1),
774777
.gmii_rx_er1(gmii_rx_er1),
778+
.gmii_status1(gmii_status1),
775779
.mdc1(mdc1),
776780
.mdio_in1(mdio_in1),
777781
.mdio_out1(mdio_out1),

usrp3/top/n230/zpu_subsystem.v

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ module zpu_subsystem #(
6565
input [7:0] gmii_rxd0,
6666
input gmii_rx_dv0,
6767
input gmii_rx_er0,
68+
input [15:0] gmii_status0,
6869
output mdc0,
6970
output mdio_in0,
7071
input mdio_out0,
@@ -79,6 +80,7 @@ module zpu_subsystem #(
7980
input [7:0] gmii_rxd1,
8081
input gmii_rx_dv1,
8182
input gmii_rx_er1,
83+
input [15:0] gmii_status1,
8284
output mdc1,
8385
output mdio_in1,
8486
input mdio_out1,
@@ -569,10 +571,18 @@ module zpu_subsystem #(
569571
RB_ZPU_COMPAT : rb_data = { PRODUCT_ID, COMPAT_MAJOR, COMPAT_MINOR };
570572
RB_ZPU_COUNTER : rb_data = { counter };
571573
// SFP Interface pins.
572-
RB_ZPU_SFP_STATUS0: rb_data = {26'b0,SFP0_ModAbs_chgd,SFP0_TxFault_chgd,SFP0_RxLOS_chgd,
573-
SFP0_ModAbs_reg2,SFP0_TxFault_reg2,SFP0_RxLOS_reg2};
574-
RB_ZPU_SFP_STATUS1: rb_data = {26'b0,SFP1_ModAbs_chgd,SFP1_TxFault_chgd,SFP1_RxLOS_chgd,
575-
SFP1_ModAbs_reg2,SFP1_TxFault_reg2,SFP1_RxLOS_reg2};
574+
RB_ZPU_SFP_STATUS0: rb_data = {
575+
gmii_status0,
576+
10'h0,
577+
SFP0_ModAbs_chgd,SFP0_TxFault_chgd,SFP0_RxLOS_chgd,
578+
SFP0_ModAbs_reg2,SFP0_TxFault_reg2,SFP0_RxLOS_reg2
579+
};
580+
RB_ZPU_SFP_STATUS1: rb_data = {
581+
gmii_status1,
582+
10'h0,
583+
SFP1_ModAbs_chgd,SFP1_TxFault_chgd,SFP1_RxLOS_chgd,
584+
SFP1_ModAbs_reg2,SFP1_TxFault_reg2,SFP1_RxLOS_reg2
585+
};
576586
// GIT HASH of RTL Source
577587
// [31:28] = 0xf - Unclean build
578588
// [27:0] - Abrieviated git hash for RTL.

0 commit comments

Comments
 (0)