From: David S. Miller Date: Mon, 5 Jul 2021 17:16:18 +0000 (-0700) Subject: Merge branch 'stmmac-ptp' X-Git-Tag: microblaze-v5.16~446^2~44 X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=c6c205ed442e4609a2bb3e369acc5f1007f782a2 Merge branch 'stmmac-ptp' Xiaoliang Yang says: ==================== net: stmmac: re-configure tas basetime after ptp time adjust If the DWMAC Ethernet device has already set the Qbv EST configuration before using ptp to synchronize the time adjustment, the Qbv base time may change to be the past time of the new current time. This is not allowed by hardware. This patch calculates and re-configures the Qbv basetime after ptp time adjustment. v1->v2: Update est mutex lock to protect btr/ctr r/w to be atomic. Add btr_reserve to store basetime from qopt and used as origin base time in Qbv re-configuration. ==================== Signed-off-by: David S. Miller --- c6c205ed442e4609a2bb3e369acc5f1007f782a2