From 76f11fb5eb622b279e2f144765e8ed6a5ee097fd Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Fri, 13 Dec 2024 16:55:04 +0100 Subject: [PATCH] re-add small slow control buffer in GbE (4k instead of 64k) --- gbe_trb/base/gbe_wrapper.vhd | 9 +++++---- gbe_trb_ecp5/base/gbe_wrapper.vhd | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gbe_trb/base/gbe_wrapper.vhd b/gbe_trb/base/gbe_wrapper.vhd index 2f50be9..9281337 100644 --- a/gbe_trb/base/gbe_wrapper.vhd +++ b/gbe_trb/base/gbe_wrapper.vhd @@ -26,6 +26,7 @@ entity gbe_wrapper is UP_DOWN_LIMIT : integer range 0 to 16777215 := 0; FIXED_DELAY : integer range 0 to 16777215 := 16777215; NUMBER_OF_GBE_LINKS : integer range 1 to 4 := 4; + SLOWCTRL_BUFFER_SIZE : integer range 1 to 2 := 2; LINKS_ACTIVE : std_logic_vector(3 downto 0) := "1111"; LINK_HAS_PING : std_logic_vector(3 downto 0) := "1111"; LINK_HAS_ARP : std_logic_vector(3 downto 0) := "1111"; @@ -291,7 +292,7 @@ begin INCLUDE_FWD => LINK_HAS_FWD(3), FRAME_BUFFER_SIZE => 1, READOUT_BUFFER_SIZE => 4, - SLOWCTRL_BUFFER_SIZE => 2, + SLOWCTRL_BUFFER_SIZE => SLOWCTRL_BUFFER_SIZE, FIXED_SIZE_MODE => FIXED_SIZE_MODE, INCREMENTAL_MODE => INCREMENTAL_MODE, FIXED_SIZE => FIXED_SIZE, @@ -442,7 +443,7 @@ begin INCLUDE_FWD => LINK_HAS_FWD(2), FRAME_BUFFER_SIZE => 1, READOUT_BUFFER_SIZE => 4, - SLOWCTRL_BUFFER_SIZE => 2, + SLOWCTRL_BUFFER_SIZE => SLOWCTRL_BUFFER_SIZE, FIXED_SIZE_MODE => FIXED_SIZE_MODE, INCREMENTAL_MODE => INCREMENTAL_MODE, FIXED_SIZE => FIXED_SIZE, @@ -593,7 +594,7 @@ FWD_FULL_OUT => FWD_FULL_OUT(2), INCLUDE_FWD => LINK_HAS_FWD(1), FRAME_BUFFER_SIZE => 1, READOUT_BUFFER_SIZE => 4, - SLOWCTRL_BUFFER_SIZE => 2, + SLOWCTRL_BUFFER_SIZE => SLOWCTRL_BUFFER_SIZE, FIXED_SIZE_MODE => FIXED_SIZE_MODE, INCREMENTAL_MODE => INCREMENTAL_MODE, FIXED_SIZE => FIXED_SIZE, @@ -745,7 +746,7 @@ FWD_FULL_OUT => FWD_FULL_OUT(1), INCLUDE_FWD => LINK_HAS_FWD(0), FRAME_BUFFER_SIZE => 1, READOUT_BUFFER_SIZE => 4, - SLOWCTRL_BUFFER_SIZE => 2, + SLOWCTRL_BUFFER_SIZE => SLOWCTRL_BUFFER_SIZE, FIXED_SIZE_MODE => FIXED_SIZE_MODE, INCREMENTAL_MODE => INCREMENTAL_MODE, FIXED_SIZE => FIXED_SIZE, diff --git a/gbe_trb_ecp5/base/gbe_wrapper.vhd b/gbe_trb_ecp5/base/gbe_wrapper.vhd index 5b45ed3..9f7031b 100644 --- a/gbe_trb_ecp5/base/gbe_wrapper.vhd +++ b/gbe_trb_ecp5/base/gbe_wrapper.vhd @@ -25,6 +25,7 @@ entity gbe_wrapper is UP_DOWN_MODE : integer range 0 to 1 := 0; -- only for debugging UP_DOWN_LIMIT : integer range 0 to 16777215 := 0; -- only for debugging FIXED_DELAY : integer range 0 to 16777215 := 16777215; -- only for debugging + SLOWCTRL_BUFFER_SIZE : integer range 1 to 2 := 2; NUMBER_OF_GBE_LINKS : integer range 1 to 4 := 1; --can't be changed LINKS_ACTIVE : std_logic_vector(3 downto 0) := "1111"; LINK_HAS_PING : std_logic_vector(3 downto 0) := "1111"; @@ -325,7 +326,7 @@ begin INCLUDE_FWD => LINK_HAS_FWD(0), FRAME_BUFFER_SIZE => 1, READOUT_BUFFER_SIZE => 4, - SLOWCTRL_BUFFER_SIZE => 2, + SLOWCTRL_BUFFER_SIZE => SLOWCTRL_BUFFER_SIZE, FIXED_SIZE_MODE => FIXED_SIZE_MODE, INCREMENTAL_MODE => INCREMENTAL_MODE, FIXED_SIZE => FIXED_SIZE, -- 2.43.0