From: Danylo Vodopianov <dvo-...@napatech.com>
The FPGA scrub T parameter shall be encoded timeout using internal unit,
which is measured in 2^30 nanoseconds. It is approx 1.074 times longer
than age timeout specified in seconds. Internal method
hw_mod_flm_inf_sta_data_update_get() was updated to perform conversion
between age time and internal FPGA scrub T time unit.
Fixes: c0d44442b831 ("net/ntnic: add flow aging event")
Signed-off-by: Danylo Vodopianov <dvo-...@napatech.com>
---
.../net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
index 14dd95a150..5cf8264909 100644
--- a/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
+++ b/drivers/net/ntnic/nthw/flow_api/hw_mod/hw_mod_flm.c
@@ -969,16 +969,22 @@ int hw_mod_flm_inf_sta_data_update_get(struct
flow_api_backend_s *be, enum hw_fl
*
* (T[7:3] != 0) ? ((8 + T[2:0]) shift-left (T[7:3] - 1)) : T[2:0]
*
- * The maximum allowed value is 0xEF (127 years).
+ * The maximum allowed value is 0xEF (137 years).
*
* Note that this represents a lower bound on the timeout, depending on the
flow
* scanner interval and overall load, the timeout can be substantially longer.
*/
uint32_t hw_mod_flm_scrub_timeout_decode(uint32_t t_enc)
{
- uint8_t t_bits_2_0 = t_enc & 0x07;
- uint8_t t_bits_7_3 = (t_enc >> 3) & 0x1F;
- return t_bits_7_3 != 0 ? ((8 + t_bits_2_0) << (t_bits_7_3 - 1)) :
t_bits_2_0;
+ uint32_t t_bits_2_0 = t_enc & 0x07;
+ uint32_t t_bits_7_3 = (t_enc >> 3) & 0x1F;
+ uint32_t t_dec = t_bits_7_3 != 0 ? ((8U + t_bits_2_0) << (t_bits_7_3 -
1U))
+ : t_bits_2_0;
+ /* convert internal FPGA scrub time unit into seconds, i.e. 2^30/1e9 is
+ * approx 1.074 sec per internal unit
+ */
+ uint64_t t_sec = (uint64_t)t_dec * 1074UL / 1000UL;
+ return t_sec > UINT32_MAX ? UINT32_MAX : (uint32_t)t_sec;
}
uint32_t hw_mod_flm_scrub_timeout_encode(uint32_t t)
--
2.45.0
