mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-27 13:30:45 -05:00
gve: Move ptp_schedule_worker to gve_init_clock
Previously, gve had been only initializing ptp aux work when hardware timestamping was initialized through ndo_hwtsatmp_set. As this patch series introduces XDP hardware timestamp metadata which will require the ptp aux work, the work can't be gated on the kernel_hwtstamp_config being set and must be initialized elsewhere. For simplicity, ptp_schedule_worker is invoked right after the ptp_clock is registered with the kernel (which happens during gve_probe or following reset). The worker is scheduled in GVE_NIC_TS_SYNC_INTERVAL_MS as the synchronous call to gve_clock_nic_ts_read makes the worker redundant if scheduled immediately. If gve cannot read the device clock immediately, it errors out of gve_init_clock. Signed-off-by: Tim Hostetler <thostet@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Harshitha Ramamurthy <hramamurthy@google.com> Signed-off-by: Joshua Washington <joshwash@google.com> Link: https://patch.msgid.link/20251114211146.292068-2-joshwash@google.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
committed by
Paolo Abeni
parent
19f1d6c723
commit
46e7860ef9
@@ -2188,10 +2188,6 @@ static int gve_set_ts_config(struct net_device *dev,
|
||||
}
|
||||
|
||||
kernel_config->rx_filter = HWTSTAMP_FILTER_ALL;
|
||||
gve_clock_nic_ts_read(priv);
|
||||
ptp_schedule_worker(priv->ptp->clock, 0);
|
||||
} else {
|
||||
ptp_cancel_worker_sync(priv->ptp->clock);
|
||||
}
|
||||
|
||||
priv->ts_config.rx_filter = kernel_config->rx_filter;
|
||||
|
||||
@@ -133,9 +133,21 @@ int gve_init_clock(struct gve_priv *priv)
|
||||
err = -ENOMEM;
|
||||
goto release_ptp;
|
||||
}
|
||||
err = gve_clock_nic_ts_read(priv);
|
||||
if (err) {
|
||||
dev_err(&priv->pdev->dev, "failed to read NIC clock %d\n", err);
|
||||
goto release_nic_ts_report;
|
||||
}
|
||||
ptp_schedule_worker(priv->ptp->clock,
|
||||
msecs_to_jiffies(GVE_NIC_TS_SYNC_INTERVAL_MS));
|
||||
|
||||
return 0;
|
||||
|
||||
release_nic_ts_report:
|
||||
dma_free_coherent(&priv->pdev->dev,
|
||||
sizeof(struct gve_nic_ts_report),
|
||||
priv->nic_ts_report, priv->nic_ts_report_bus);
|
||||
priv->nic_ts_report = NULL;
|
||||
release_ptp:
|
||||
gve_ptp_release(priv);
|
||||
return err;
|
||||
|
||||
Reference in New Issue
Block a user