Skip to content

Commit 74cb0f1

Browse files
Markus Blöchlgregkh
authored andcommitted
net: stmmac: intel: populate entire system_counterval_t in get_time_fn() callback
commit e6176ab upstream. get_time_fn() callback implementations are expected to fill out the entire system_counterval_t struct as it may be initially uninitialized. This broke with the removal of convert_art_to_tsc() helper functions which left use_nsecs uninitialized. Initially assign the entire struct with default values. Fixes: f5e1d0d ("stmmac: intel: Remove convert_art_to_tsc()") Cc: stable@vger.kernel.org Signed-off-by: Markus Blöchl <markus@blochl.de> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/20250713-stmmac_crossts-v1-1-31bfe051b5cb@blochl.de Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 516cd09 commit 74cb0f1

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,12 @@ static int intel_crosststamp(ktime_t *device,
379379
return -ETIMEDOUT;
380380
}
381381

382+
*system = (struct system_counterval_t) {
383+
.cycles = 0,
384+
.cs_id = CSID_X86_ART,
385+
.use_nsecs = false,
386+
};
387+
382388
num_snapshot = (readl(ioaddr + GMAC_TIMESTAMP_STATUS) &
383389
GMAC_TIMESTAMP_ATSNS_MASK) >>
384390
GMAC_TIMESTAMP_ATSNS_SHIFT;
@@ -394,7 +400,7 @@ static int intel_crosststamp(ktime_t *device,
394400
}
395401

396402
system->cycles *= intel_priv->crossts_adj;
397-
system->cs_id = CSID_X86_ART;
403+
398404
priv->plat->flags &= ~STMMAC_FLAG_INT_SNAPSHOT_EN;
399405

400406
return 0;

0 commit comments

Comments
 (0)