From f42a6891d18a156f41813e3cb924470d1e2ff9ad Mon Sep 17 00:00:00 2001 From: Bryan O'Donoghue Date: Mon, 7 Dec 2015 01:59:08 +0000 Subject: [PATCH] greybus: loopback: Ensure we reset stats once and once only 9445c54c ('greybus/loopback: drop bus aggregate calculation') removed the aggregation of data in-kernel but instead of dropping the reset of aggregate stastics, converted that reset into a second reset of the connection-level stats. While this doesn't result in anything bad it's also definitely a dumb thing to be doing, so, drop it now. Also ensure we reset the bridge-specific tracking variables at least once. Signed-off-by: Bryan O'Donoghue Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/loopback.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/greybus/loopback.c b/drivers/staging/greybus/loopback.c index b8297d6b7e60..626a841b1fe2 100644 --- a/drivers/staging/greybus/loopback.c +++ b/drivers/staging/greybus/loopback.c @@ -837,19 +837,9 @@ static void gb_loopback_reset_stats(struct gb_loopback *gb) memcpy(&gb->gpbridge_firmware_latency, &reset, sizeof(struct gb_loopback_stats)); - /* Set values to report min/max timeout to user-space */ - gb->timeout_min = jiffies_to_usecs(GB_LOOPBACK_TIMEOUT_MIN); - gb->timeout_max = jiffies_to_usecs(GB_LOOPBACK_TIMEOUT_MAX); - - /* Reset aggregate stats */ - memcpy(&gb->latency, &reset, sizeof(struct gb_loopback_stats)); - memcpy(&gb->throughput, &reset, sizeof(struct gb_loopback_stats)); - memcpy(&gb->requests_per_second, &reset, - sizeof(struct gb_loopback_stats)); - memcpy(&gb->apbridge_unipro_latency, &reset, - sizeof(struct gb_loopback_stats)); - memcpy(&gb->gpbridge_firmware_latency, &reset, - sizeof(struct gb_loopback_stats)); + /* Should be initialized at least once per transaction set */ + gb->apbridge_latency_ts = 0; + gb->gpbridge_latency_ts = 0; } static void gb_loopback_update_stats(struct gb_loopback_stats *stats, u32 val) -- 2.20.1