net: dsa: sja1105: add the RX timestamping procedure for SJA1110

This is really easy, since the full RX timestamp is in the DSA trailer
and the tagger code transfers it to SJA1105_SKB_CB(skb)->tstamp, we just
need to move it to the skb shared info region. This is as opposed to
SJA1105, where the RX timestamp was received in a meta frame (so there
needed to be a state machine to pair the 2 packets) and the timestamp
was partial (so the packet, once matched with its timestamp, needed to
be added to an RX timestamping queue where the PTP aux worker would
reconstruct that timestamp).

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.h b/drivers/net/dsa/sja1105/sja1105.h
index a6d64b2..201bca2 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105.h
+++ b/drivers/net/dsa/sja1105/sja1105.h
@@ -130,6 +130,7 @@ struct sja1105_info {
                           const unsigned char *addr, u16 vid);
        void (*ptp_cmd_packing)(u8 *buf, struct sja1105_ptp_cmd *cmd,
                                enum packing_op op);
+       bool (*rxtstamp)(struct dsa_switch *ds, int port, struct sk_buff *skb);
        int (*clocking_setup)(struct sja1105_private *priv);
        const char *name;
        bool supports_mii[SJA1105_MAX_NUM_PORTS];

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.c b/drivers/net/dsa/sja1105/sja1105_ptp.c
index dea82f8..62fe05b 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.c
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.c
@@ -413,9 +413,7 @@ static long sja1105_rxtstamp_work(struct ptp_clock_info *ptp)
        return -1;
 }
 
-/* Called from dsa_skb_defer_rx_timestamp */
-bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,
-                          struct sk_buff *skb, unsigned int type)
+bool sja1105_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)
 {
        struct sja1105_private *priv = ds->priv;
        struct sja1105_ptp_data *ptp_data = &priv->ptp_data;
@@ -431,6 +429,28 @@ bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,
        return true;
 }
 
+bool sja1110_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb)
+{
+       struct skb_shared_hwtstamps *shwt = skb_hwtstamps(skb);
+       u64 ts = SJA1105_SKB_CB(skb)->tstamp;
+
+       *shwt = (struct skb_shared_hwtstamps) {0};
+
+       shwt->hwtstamp = ns_to_ktime(sja1105_ticks_to_ns(ts));
+
+       /* Don't defer */
+       return false;
+}
+
+/* Called from dsa_skb_defer_rx_timestamp */
+bool sja1105_port_rxtstamp(struct dsa_switch *ds, int port,
+                          struct sk_buff *skb, unsigned int type)
+{
+       struct sja1105_private *priv = ds->priv;
+
+       return priv->info->rxtstamp(ds, port, skb);
+}
+
 /* Called from dsa_skb_tx_timestamp. This callback is just to clone
  * the skb and have it available in SJA1105_SKB_CB in the .port_deferred_xmit
  * callback, where we will timestamp it synchronously.

diff --git a/drivers/net/dsa/sja1105/sja1105_ptp.h b/drivers/net/dsa/sja1105/sja1105_ptp.h
index 34f97f5..bf0c4f1 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_ptp.h
+++ b/drivers/net/dsa/sja1105/sja1105_ptp.h
@@ -122,6 +122,9 @@ int __sja1105_ptp_adjtime(struct dsa_switch *ds, s64 delta);
 int sja1105_ptp_commit(struct dsa_switch *ds, struct sja1105_ptp_cmd *cmd,
                       sja1105_spi_rw_mode_t rw);
 
+bool sja1105_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);
+bool sja1110_rxtstamp(struct dsa_switch *ds, int port, struct sk_buff *skb);
+
 #else
 
 struct sja1105_ptp_cmd;
@@ -184,6 +187,9 @@ static inline int sja1105_ptp_commit(struct dsa_switch *ds,
 
 #define sja1105_hwtstamp_set NULL
 
+#define sja1105_rxtstamp NULL
+#define sja1110_rxtstamp NULL
+
 #endif /* IS_ENABLED(CONFIG_NET_DSA_SJA1105_PTP) */
 
 #endif /* _SJA1105_PTP_H */

diff --git a/drivers/net/dsa/sja1105/sja1105_spi.c b/drivers/net/dsa/sja1105/sja1105_spi.c
index 9156f4c..f7dd862 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_spi.c
+++ b/drivers/net/dsa/sja1105/sja1105_spi.c
@@ -580,6 +580,7 @@ const struct sja1105_info sja1105e_info = {
        .fdb_add_cmd            = sja1105et_fdb_add,
        .fdb_del_cmd            = sja1105et_fdb_del,
        .ptp_cmd_packing        = sja1105et_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105et_regs,
        .port_speed             = {
@@ -612,6 +613,7 @@ const struct sja1105_info sja1105t_info = {
        .fdb_add_cmd            = sja1105et_fdb_add,
        .fdb_del_cmd            = sja1105et_fdb_del,
        .ptp_cmd_packing        = sja1105et_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105et_regs,
        .port_speed             = {
@@ -645,6 +647,7 @@ const struct sja1105_info sja1105p_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
        .port_speed             = {
@@ -678,6 +681,7 @@ const struct sja1105_info sja1105q_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
        .port_speed             = {
@@ -711,6 +715,7 @@ const struct sja1105_info sja1105r_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .regs                   = &sja1105pqrs_regs,
        .port_speed             = {
@@ -746,6 +751,7 @@ const struct sja1105_info sja1105s_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1105_rxtstamp,
        .clocking_setup         = sja1105_clocking_setup,
        .port_speed             = {
                [SJA1105_SPEED_AUTO] = 0,
@@ -781,6 +787,7 @@ const struct sja1105_info sja1110a_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1110_rxtstamp,
        .clocking_setup         = sja1110_clocking_setup,
        .port_speed             = {
                [SJA1105_SPEED_AUTO] = 0,
@@ -828,6 +835,7 @@ const struct sja1105_info sja1110b_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1110_rxtstamp,
        .clocking_setup         = sja1110_clocking_setup,
        .port_speed             = {
                [SJA1105_SPEED_AUTO] = 0,
@@ -875,6 +883,7 @@ const struct sja1105_info sja1110c_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1110_rxtstamp,
        .clocking_setup         = sja1110_clocking_setup,
        .port_speed             = {
                [SJA1105_SPEED_AUTO] = 0,
@@ -922,6 +931,7 @@ const struct sja1105_info sja1110d_info = {
        .fdb_add_cmd            = sja1105pqrs_fdb_add,
        .fdb_del_cmd            = sja1105pqrs_fdb_del,
        .ptp_cmd_packing        = sja1105pqrs_ptp_cmd_packing,
+       .rxtstamp               = sja1110_rxtstamp,
        .clocking_setup         = sja1110_clocking_setup,
        .port_speed             = {
                [SJA1105_SPEED_AUTO] = 0,