From 5c8037093b5e9f80f0dec7ce8152f07388f9e4c1 Mon Sep 17 00:00:00 2001 From: Alex Forencich Date: Sun, 16 Feb 2025 18:06:41 -0800 Subject: [PATCH] eth: Remove unnecessary PTP_TS_FMT_TOD parameter in 1G MAC module Signed-off-by: Alex Forencich --- rtl/eth/taxi_eth_mac_1g.sv | 3 +-- tb/eth/taxi_eth_mac_1g/Makefile | 3 +-- tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py | 3 +-- tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.sv | 4 +--- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/rtl/eth/taxi_eth_mac_1g.sv b/rtl/eth/taxi_eth_mac_1g.sv index 76f8dbd..6b3ede7 100644 --- a/rtl/eth/taxi_eth_mac_1g.sv +++ b/rtl/eth/taxi_eth_mac_1g.sv @@ -21,8 +21,7 @@ module taxi_eth_mac_1g # parameter logic PADDING_EN = 1'b1, parameter MIN_FRAME_LEN = 64, parameter logic PTP_TS_EN = 1'b0, - parameter logic PTP_TS_FMT_TOD = 1'b1, - parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64, + parameter PTP_TS_W = 96, parameter logic PFC_EN = 1'b0, parameter logic PAUSE_EN = PFC_EN ) diff --git a/tb/eth/taxi_eth_mac_1g/Makefile b/tb/eth/taxi_eth_mac_1g/Makefile index e577836..314041a 100644 --- a/tb/eth/taxi_eth_mac_1g/Makefile +++ b/tb/eth/taxi_eth_mac_1g/Makefile @@ -32,8 +32,7 @@ export PARAM_DATA_W := 8 export PARAM_PADDING_EN := 1 export PARAM_MIN_FRAME_LEN := 64 export PARAM_PTP_TS_EN := 1 -export PARAM_PTP_TS_FMT_TOD := 1 -export PARAM_PTP_TS_W := $(if $(filter-out 1,$(PARAM_PTP_TS_FMT_TOD)),64,96) +export PARAM_PTP_TS_W := 96 export PARAM_TX_TAG_W := 16 export PARAM_PFC_EN := 1 export PARAM_PAUSE_EN := $(PARAM_PFC_EN) diff --git a/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py b/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py index 42136d4..fea3d36 100644 --- a/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py +++ b/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.py @@ -714,8 +714,7 @@ def test_taxi_eth_mac_1g(request, pfc_en): parameters['PADDING_EN'] = 1 parameters['MIN_FRAME_LEN'] = 64 parameters['PTP_TS_EN'] = 1 - parameters['PTP_TS_FMT_TOD'] = 1 - parameters['PTP_TS_W'] = 96 if parameters['PTP_TS_FMT_TOD'] else 64 + parameters['PTP_TS_W'] = 96 parameters['TX_TAG_W'] = 16 parameters['PFC_EN'] = pfc_en parameters['PAUSE_EN'] = parameters['PFC_EN'] diff --git a/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.sv b/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.sv index 97521c4..529df18 100644 --- a/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.sv +++ b/tb/eth/taxi_eth_mac_1g/test_taxi_eth_mac_1g.sv @@ -22,8 +22,7 @@ module test_taxi_eth_mac_1g # parameter logic PADDING_EN = 1'b1, parameter MIN_FRAME_LEN = 64, parameter logic PTP_TS_EN = 1'b0, - parameter logic PTP_TS_FMT_TOD = 1'b1, - parameter PTP_TS_W = PTP_TS_FMT_TOD ? 96 : 64, + parameter PTP_TS_W = 96, parameter TX_TAG_W = 16, parameter logic PFC_EN = 1'b0, parameter logic PAUSE_EN = PFC_EN @@ -138,7 +137,6 @@ taxi_eth_mac_1g #( .PADDING_EN(PADDING_EN), .MIN_FRAME_LEN(MIN_FRAME_LEN), .PTP_TS_EN(PTP_TS_EN), - .PTP_TS_FMT_TOD(PTP_TS_FMT_TOD), .PTP_TS_W(PTP_TS_W), .PFC_EN(PFC_EN), .PAUSE_EN(PAUSE_EN)