net: dsa: sja1105: make SJA1105_SKB_CB fit a full timestamp

In SJA1105, RX timestamps for packets sent to the CPU are transmitted in
separate follow-up packets (metadata frames). These contain partial
timestamps (24 or 32 bits) which are kept in SJA1105_SKB_CB(skb)->meta_tstamp.

Thankfully, SJA1110 improved that, and the RX timestamps are now
transmitted in-band with the actual packet, in the timestamp trailer.
The RX timestamps are now full-width 64 bits.

Because we process the RX DSA tags in the rcv() method in the tagger,
but we would like to preserve the DSA code structure in that we populate
the skb timestamp in the port_rxtstamp() call which only happens later,
the implication is that we must somehow pass the 64-bit timestamp from
the rcv() method all the way to port_rxtstamp(). We can use the skb->cb
for that.

Rename the meta_tstamp from struct sja1105_skb_cb from "meta_tstamp" to
"tstamp", and increase its size to 64 bits.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index 0bc566b9e9587bdbe2f8cd0a16572486214096a3..dea82f8a40c45dfdbd0c7f64d0087278a0b166df 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -397,7 +397,7 @@ static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)
 
                *shwt = (struct skb_shared_hwtstamps) {0};
 
-               ts = SJA1105_SKB_CB(skb)->meta_tstamp;
+               ts = SJA1105_SKB_CB(skb)->tstamp;
                ts = sja1105_tstamp_reconstruct(ds, ticks, ts);
 
                shwt->hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));

diff --git a/include/linux/dsa/sja1105.h b/include/linux/dsa/sja1105.h
index 1eb84562b311f4f565cc379428f3113c61161580..865a548a6ef2e73874689d33b9b8e25924deb7d6 100644 (file)
--- a/include/linux/dsa/sja1105.h
+++ b/include/linux/dsa/sja1105.h
@@ -48,7 +48,7 @@ struct sja1105_tagger_data {
 
 struct sja1105_skb_cb {
        struct sk_buff *clone;
-       u32 meta_tstamp;
+       u64 tstamp;
 };
 
 #define SJA1105_SKB_CB(skb) \

diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
index a70625fe64f778898fa2cd727d9d88ba35b9559e..11f555dd9566715dd7b14375d413469cb49f49e9 100644 (file)
--- a/net/dsa/tag_sja1105.c
+++ b/net/dsa/tag_sja1105.c
@@ -147,7 +147,7 @@ static void sja1105_transfer_meta(struct sk_buff *skb,
 
        hdr->h_dest[3] = meta->dmac_byte_3;
        hdr->h_dest[4] = meta->dmac_byte_4;
-       SJA1105_SKB_CB(skb)->meta_tstamp = meta->tstamp;
+       SJA1105_SKB_CB(skb)->tstamp = meta->tstamp;
 }
 
 /* This is a simple state machine which follows the hardware mechanism of