net: Introduce peer to peer one step PTP time stamping.

The 1588 standard defines one step operation for both Sync and
PDelay_Resp messages.  Up until now, hardware with P2P one step has
been rare, and kernel support was lacking.  This patch adds support of
the mode in anticipation of new hardware developments.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index cff64e4..741d865 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -15410,6 +15410,7 @@ int bnx2x_configure_ptp_filters(struct bnx2x *bp)
                REG_WR(bp, rule, BNX2X_PTP_TX_ON_RULE_MASK);
                break;
        case HWTSTAMP_TX_ONESTEP_SYNC:
+       case HWTSTAMP_TX_ONESTEP_P2P:
                BNX2X_ERR("One-step timestamping is not supported\n");
                return -ERANGE;
        }

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
index ec2ff3d..4aaaa49 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ptp.c
@@ -920,6 +920,7 @@ static int mlxsw_sp_ptp_get_message_types(const struct hwtstamp_config *config,
                egr_types = 0xff;
                break;
        case HWTSTAMP_TX_ONESTEP_SYNC:
+       case HWTSTAMP_TX_ONESTEP_P2P:
                return -ERANGE;
        }
 

diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c
index afe5246..9399f6a 100644 (file)
--- a/drivers/net/ethernet/microchip/lan743x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan743x_ptp.c
@@ -1265,6 +1265,9 @@ int lan743x_ptp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
 
                lan743x_ptp_set_sync_ts_insert(adapter, true);
                break;
+       case HWTSTAMP_TX_ONESTEP_P2P:
+               ret = -ERANGE;
+               break;
        default:
                netif_warn(adapter, drv, adapter->netdev,
                           "  tx_type = %d, UNKNOWN\n", config.tx_type);

diff --git a/drivers/net/ethernet/qlogic/qede/qede_ptp.c b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
index f815435..4c7f7a7 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_ptp.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_ptp.c
@@ -247,6 +247,7 @@ static int qede_ptp_cfg_filters(struct qede_dev *edev)
                break;
 
        case HWTSTAMP_TX_ONESTEP_SYNC:
+       case HWTSTAMP_TX_ONESTEP_P2P:
                DP_ERR(edev, "One-step timestamping is not supported\n");
                return -ERANGE;
        }

diff --git a/include/uapi/linux/net_tstamp.h b/include/uapi/linux/net_tstamp.h
index e5b3972..f96e650 100644 (file)
--- a/include/uapi/linux/net_tstamp.h
+++ b/include/uapi/linux/net_tstamp.h
@@ -90,6 +90,14 @@ enum hwtstamp_tx_types {
         * queue.
         */
        HWTSTAMP_TX_ONESTEP_SYNC,
+
+       /*
+        * Same as HWTSTAMP_TX_ONESTEP_SYNC, but also enables time
+        * stamp insertion directly into PDelay_Resp packets. In this
+        * case, neither transmitted Sync nor PDelay_Resp packets will
+        * receive a time stamp via the socket error queue.
+        */
+       HWTSTAMP_TX_ONESTEP_P2P,
 };
 
 /* possible values for hwtstamp_config->rx_filter */

diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
index 5163d90..dbaebbe 100644 (file)
--- a/net/core/dev_ioctl.c
+++ b/net/core/dev_ioctl.c
@@ -187,6 +187,7 @@ static int net_hwtstamp_validate(struct ifreq *ifr)
        case HWTSTAMP_TX_OFF:
        case HWTSTAMP_TX_ON:
        case HWTSTAMP_TX_ONESTEP_SYNC:
+       case HWTSTAMP_TX_ONESTEP_P2P:
                tx_type_valid = 1;
                break;
        }