1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c
index 2220c771092b..a6dc47edc4cf 100644
--- a/drivers/net/ethernet/cadence/macb_ptp.c
+++ b/drivers/net/ethernet/cadence/macb_ptp.c
@@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
 
         if (delta > TSU_NSEC_MAX_VAL) {
                 gem_tsu_get_time(&bp->ptp_clock_info, &now);
-                if (sign)
-                        now = timespec64_sub(now, then);
-                else
-                        now = timespec64_add(now, then);
+                now = timespec64_add(now, then);
 
                 gem_tsu_set_time(&bp->ptp_clock_info,
                                  (const struct timespec64 *)&now);
@@ -322,6 +319,8 @@ int gem_ptp_txstamp(struct macb_queue *queue, struct sk_buff *skb,
         desc_ptp = macb_ptp_desc(queue->bp, desc);
         tx_timestamp = &queue->tx_timestamps[head];
         tx_timestamp->skb = skb;
+        /* ensure ts_1/ts_2 is loaded after ctrl (TX_USED check) */
+        dma_rmb();
         tx_timestamp->desc_ptp.ts_1 = desc_ptp->ts_1;
         tx_timestamp->desc_ptp.ts_2 = desc_ptp->ts_2;
         /* move head */
@@ -469,6 +468,7 @@ int gem_set_hwtst(struct net_device *dev, struct ifreq *ifr, int cmd)
         case HWTSTAMP_TX_ONESTEP_SYNC:
                 if (gem_ptp_set_one_step_sync(bp, 1) != 0)
                         return -ERANGE;
+                /* fall through */
         case HWTSTAMP_TX_ON:
                 tx_bd_control = TSTAMP_ALL_FRAMES;
                 break;