mlxsw: spectrum: Support time stamping on Spectrum-2

As opposed to Spectrum-1, in which time stamps arrive through a pair of
dedicated events into a queue and later are being matched to the
corresponding packets, in Spectrum-2 we are reading the time stamps
directly from the CQE. Software can get the time stamp in UTC format
using CQEv2.

Add a time stamp field to 'struct mlxsw_skb_cb'. In
mlxsw_pci_cqe_{rdq,sdq}_handle() extract the time stamp from the CQE into
the new time stamp field. Note that the time stamp in the CQE is
represented by 38 bits, which is a short representation of UTC time.
Software should create the full time stamp using the global UTC clock.
Read UTC clock from hardware only for PTP packets which were trapped to CPU
with PTP0 trap ID (event packets).

Use the time stamp from the SKB when packet is received or transmitted.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Signed-off-by: Amit Cohen <amcohen@nvidia.com>
Reviewed-by: Petr Machata <petrm@nvidia.com>
Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.h b/drivers/net/ethernet/mellanox/mlxsw/core.h
index cfc365b65c1c3678e27fc652e20ba7ce34e30cd6..02d9cc2ef0c8e7414573e271449e2e73af50e107 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/core.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.h
@@ -558,11 +558,17 @@ enum mlxsw_devlink_param_id {
        MLXSW_DEVLINK_PARAM_ID_ACL_REGION_REHASH_INTERVAL,
 };
 
+struct mlxsw_cqe_ts {
+       u8 sec;
+       u32 nsec;
+};
+
 struct mlxsw_skb_cb {
        union {
                struct mlxsw_tx_info tx_info;
                struct mlxsw_rx_md_info rx_md_info;
        };
+       struct mlxsw_cqe_ts cqe_ts;
 };
 
 static inline struct mlxsw_skb_cb *mlxsw_skb_cb(struct sk_buff *skb)

diff --git a/drivers/net/ethernet/mellanox/mlxsw/pci.c b/drivers/net/ethernet/mellanox/mlxsw/pci.c
index 0e4bd6315ea54abaa002a5a25dfdb6ee0ff117db..50527adc5b5ad6391c02c2ede3318b2351081941 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/pci.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/pci.c
@@ -513,9 +513,26 @@ static unsigned int mlxsw_pci_read32_off(struct mlxsw_pci *mlxsw_pci,
        return ioread32be(mlxsw_pci->hw_addr + off);
 }
 
+static void mlxsw_pci_skb_cb_ts_set(struct mlxsw_pci *mlxsw_pci,
+                                   struct sk_buff *skb,
+                                   enum mlxsw_pci_cqe_v cqe_v, char *cqe)
+{
+       if (cqe_v != MLXSW_PCI_CQE_V2)
+               return;
+
+       if (mlxsw_pci_cqe2_time_stamp_type_get(cqe) !=
+           MLXSW_PCI_CQE_TIME_STAMP_TYPE_UTC)
+               return;
+
+       mlxsw_skb_cb(skb)->cqe_ts.sec = mlxsw_pci_cqe2_time_stamp_sec_get(cqe);
+       mlxsw_skb_cb(skb)->cqe_ts.nsec =
+               mlxsw_pci_cqe2_time_stamp_nsec_get(cqe);
+}
+
 static void mlxsw_pci_cqe_sdq_handle(struct mlxsw_pci *mlxsw_pci,
                                     struct mlxsw_pci_queue *q,
                                     u16 consumer_counter_limit,
+                                    enum mlxsw_pci_cqe_v cqe_v,
                                     char *cqe)
 {
        struct pci_dev *pdev = mlxsw_pci->pdev;
@@ -535,6 +552,7 @@ static void mlxsw_pci_cqe_sdq_handle(struct mlxsw_pci *mlxsw_pci,
 
        if (unlikely(!tx_info.is_emad &&
                     skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
+               mlxsw_pci_skb_cb_ts_set(mlxsw_pci, skb, cqe_v, cqe);
                mlxsw_core_ptp_transmitted(mlxsw_pci->core, skb,
                                           tx_info.local_port);
                skb = NULL;
@@ -655,6 +673,8 @@ static void mlxsw_pci_cqe_rdq_handle(struct mlxsw_pci *mlxsw_pci,
                mlxsw_pci_cqe_rdq_md_tx_port_init(skb, cqe);
        }
 
+       mlxsw_pci_skb_cb_ts_set(mlxsw_pci, skb, cqe_v, cqe);
+
        byte_count = mlxsw_pci_cqe_byte_count_get(cqe);
        if (mlxsw_pci_cqe_crc_get(cqe_v, cqe))
                byte_count -= ETH_FCS_LEN;
@@ -706,7 +726,7 @@ static void mlxsw_pci_cq_tasklet(struct tasklet_struct *t)
 
                        sdq = mlxsw_pci_sdq_get(mlxsw_pci, dqn);
                        mlxsw_pci_cqe_sdq_handle(mlxsw_pci, sdq,
-                                                wqe_counter, ncqe);
+                                                wqe_counter, q->u.cq.v, ncqe);
                        q->u.cq.comp_sdq_count++;
                } else {
                        struct mlxsw_pci_queue *rdq;

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
index 25d96bedf243316ada81fb9eb9f5b55d27db7ffc..5bf772ceb1e064d9e515a95bd2e84cd3c46d965a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
@@ -1386,6 +1386,68 @@ void mlxsw_sp2_ptp_fini(struct mlxsw_sp_ptp_state *ptp_state_common)
        kfree(ptp_state);
 }
 
+static u32 mlxsw_ptp_utc_time_stamp_sec_get(struct mlxsw_core *mlxsw_core,
+                                           u8 cqe_ts_sec)
+{
+       u32 utc_sec = mlxsw_core_read_utc_sec(mlxsw_core);
+
+       if (cqe_ts_sec > (utc_sec & 0xff))
+               /* Time stamp above the last bits of UTC (UTC & 0xff) means the
+                * latter has wrapped after the time stamp was collected.
+                */
+               utc_sec -= 256;
+
+       utc_sec &= ~0xff;
+       utc_sec |= cqe_ts_sec;
+
+       return utc_sec;
+}
+
+static void mlxsw_sp2_ptp_hwtstamp_fill(struct mlxsw_core *mlxsw_core,
+                                       const struct mlxsw_skb_cb *cb,
+                                       struct skb_shared_hwtstamps *hwtstamps)
+{
+       u64 ts_sec, ts_nsec, nsec;
+
+       WARN_ON_ONCE(!cb->cqe_ts.sec && !cb->cqe_ts.nsec);
+
+       /* The time stamp in the CQE is represented by 38 bits, which is a short
+        * representation of UTC time. Software should create the full time
+        * stamp using the global UTC clock. The seconds have only 8 bits in the
+        * CQE, to create the full time stamp, use the current UTC time and fix
+        * the seconds according to the relation between UTC seconds and CQE
+        * seconds.
+        */
+       ts_sec = mlxsw_ptp_utc_time_stamp_sec_get(mlxsw_core, cb->cqe_ts.sec);
+       ts_nsec = cb->cqe_ts.nsec;
+
+       nsec = ts_sec * NSEC_PER_SEC + ts_nsec;
+
+       hwtstamps->hwtstamp = ns_to_ktime(nsec);
+}
+
+void mlxsw_sp2_ptp_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,
+                          u16 local_port)
+{
+       struct skb_shared_hwtstamps hwtstamps;
+
+       mlxsw_sp2_ptp_hwtstamp_fill(mlxsw_sp->core, mlxsw_skb_cb(skb),
+                                   &hwtstamps);
+       *skb_hwtstamps(skb) = hwtstamps;
+       mlxsw_sp_rx_listener_no_mark_func(skb, local_port, mlxsw_sp);
+}
+
+void mlxsw_sp2_ptp_transmitted(struct mlxsw_sp *mlxsw_sp,
+                              struct sk_buff *skb, u16 local_port)
+{
+       struct skb_shared_hwtstamps hwtstamps;
+
+       mlxsw_sp2_ptp_hwtstamp_fill(mlxsw_sp->core, mlxsw_skb_cb(skb),
+                                   &hwtstamps);
+       skb_tstamp_tx(skb, &hwtstamps);
+       dev_kfree_skb_any(skb);
+}
+
 int mlxsw_sp_ptp_txhdr_construct(struct mlxsw_core *mlxsw_core,
                                 struct mlxsw_sp_port *mlxsw_sp_port,
                                 struct sk_buff *skb,

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
index affc9930c5f9b294b06bb1e1da98c6589ec7eae1..26dda940789a46100093492520c351acd77adaa4 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.h
@@ -71,6 +71,12 @@ struct mlxsw_sp_ptp_state *mlxsw_sp2_ptp_init(struct mlxsw_sp *mlxsw_sp);
 
 void mlxsw_sp2_ptp_fini(struct mlxsw_sp_ptp_state *ptp_state);
 
+void mlxsw_sp2_ptp_receive(struct mlxsw_sp *mlxsw_sp, struct sk_buff *skb,
+                          u16 local_port);
+
+void mlxsw_sp2_ptp_transmitted(struct mlxsw_sp *mlxsw_sp,
+                              struct sk_buff *skb, u16 local_port);
+
 int mlxsw_sp2_ptp_txhdr_construct(struct mlxsw_core *mlxsw_core,
                                  struct mlxsw_sp_port *mlxsw_sp_port,
                                  struct sk_buff *skb,
@@ -184,15 +190,6 @@ static inline void mlxsw_sp2_ptp_fini(struct mlxsw_sp_ptp_state *ptp_state)
 {
 }
 
-int mlxsw_sp2_ptp_txhdr_construct(struct mlxsw_core *mlxsw_core,
-                                 struct mlxsw_sp_port *mlxsw_sp_port,
-                                 struct sk_buff *skb,
-                                 const struct mlxsw_tx_info *tx_info)
-{
-       return -EOPNOTSUPP;
-}
-#endif
-
 static inline void mlxsw_sp2_ptp_receive(struct mlxsw_sp *mlxsw_sp,
                                         struct sk_buff *skb, u16 local_port)
 {
@@ -205,6 +202,15 @@ static inline void mlxsw_sp2_ptp_transmitted(struct mlxsw_sp *mlxsw_sp,
        dev_kfree_skb_any(skb);
 }
 
+int mlxsw_sp2_ptp_txhdr_construct(struct mlxsw_core *mlxsw_core,
+                                 struct mlxsw_sp_port *mlxsw_sp_port,
+                                 struct sk_buff *skb,
+                                 const struct mlxsw_tx_info *tx_info)
+{
+       return -EOPNOTSUPP;
+}
+#endif
+
 static inline int
 mlxsw_sp2_ptp_hwtstamp_get(struct mlxsw_sp_port *mlxsw_sp_port,
                           struct hwtstamp_config *config)