Commit f76510b4 authored by Michal Kubecek's avatar Michal Kubecek Committed by David S. Miller
Browse files

ethtool: add timestamping related string sets 



Add three string sets related to timestamping information:

  ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags
  ETH_SS_TS_TX_TYPES:      timestamping Tx types
  ETH_SS_TS_RX_FILTERS:    timestamping Rx filters

These will be used for TIMESTAMP_GET request.

v2: avoid compiler warning ("enumeration value not handled in switch")
    in net_hwtstamp_validate()

v3: omit dash in Tx type names ("one-step-*" -> "onestep-*"), suggested by
    Richard Cochran

Signed-off-by: default avatarMichal Kubecek <mkubecek@suse.cz>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6c5bc8fe

include/uapi/linux/ethtool.h

+6 −0
Original line number Diff line number Diff line
@@ -596,6 +596,9 @@ struct ethtool_pauseparam { 
 * @ETH_SS_LINK_MODES: link mode names

 * @ETH_SS_MSG_CLASSES: debug message class names

 * @ETH_SS_WOL_MODES: wake-on-lan modes

 * @ETH_SS_SOF_TIMESTAMPING: SOF_TIMESTAMPING_* flags

 * @ETH_SS_TS_TX_TYPES: timestamping Tx types

 * @ETH_SS_TS_RX_FILTERS: timestamping Rx filters

 */

enum ethtool_stringset {

	ETH_SS_TEST		= 0,
@@ -610,6 +613,9 @@ enum ethtool_stringset { 
	ETH_SS_LINK_MODES,

	ETH_SS_MSG_CLASSES,

	ETH_SS_WOL_MODES,

	ETH_SS_SOF_TIMESTAMPING,

	ETH_SS_TS_TX_TYPES,

	ETH_SS_TS_RX_FILTERS,



	/* add new constants above here */

	ETH_SS_COUNT

include/uapi/linux/net_tstamp.h

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ enum hwtstamp_tx_types { 
	 * receive a time stamp via the socket error queue.

	 */

	HWTSTAMP_TX_ONESTEP_P2P,



	/* add new constants above here */

	__HWTSTAMP_TX_CNT

};



/* possible values for hwtstamp_config->rx_filter */
@@ -140,6 +143,9 @@ enum hwtstamp_rx_filters { 


	/* NTP, UDP, all versions and packet modes */

	HWTSTAMP_FILTER_NTP_ALL,



	/* add new constants above here */

	__HWTSTAMP_FILTER_CNT

};



/* SCM_TIMESTAMPING_PKTINFO control message */

net/core/dev_ioctl.c

+6 −0
Original line number Diff line number Diff line
@@ -190,6 +190,9 @@ static int net_hwtstamp_validate(struct ifreq *ifr) 
	case HWTSTAMP_TX_ONESTEP_P2P:

		tx_type_valid = 1;

		break;

	case __HWTSTAMP_TX_CNT:

		/* not a real value */

		break;

	}



	switch (rx_filter) {
@@ -211,6 +214,9 @@ static int net_hwtstamp_validate(struct ifreq *ifr) 
	case HWTSTAMP_FILTER_NTP_ALL:

		rx_filter_valid = 1;

		break;

	case __HWTSTAMP_FILTER_CNT:

		/* not a real value */

		break;

	}



	if (!tx_type_valid || !rx_filter_valid)

net/ethtool/common.c

+49 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only



#include <linux/net_tstamp.h>



#include "common.h"



const char netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN] = {
@@ -204,6 +206,53 @@ const char wol_mode_names[][ETH_GSTRING_LEN] = { 
};

static_assert(ARRAY_SIZE(wol_mode_names) == WOL_MODE_COUNT);



const char sof_timestamping_names[][ETH_GSTRING_LEN] = {

	[const_ilog2(SOF_TIMESTAMPING_TX_HARDWARE)]  = "hardware-transmit",

	[const_ilog2(SOF_TIMESTAMPING_TX_SOFTWARE)]  = "software-transmit",

	[const_ilog2(SOF_TIMESTAMPING_RX_HARDWARE)]  = "hardware-receive",

	[const_ilog2(SOF_TIMESTAMPING_RX_SOFTWARE)]  = "software-receive",

	[const_ilog2(SOF_TIMESTAMPING_SOFTWARE)]     = "software-system-clock",

	[const_ilog2(SOF_TIMESTAMPING_SYS_HARDWARE)] = "hardware-legacy-clock",

	[const_ilog2(SOF_TIMESTAMPING_RAW_HARDWARE)] = "hardware-raw-clock",

	[const_ilog2(SOF_TIMESTAMPING_OPT_ID)]       = "option-id",

	[const_ilog2(SOF_TIMESTAMPING_TX_SCHED)]     = "sched-transmit",

	[const_ilog2(SOF_TIMESTAMPING_TX_ACK)]       = "ack-transmit",

	[const_ilog2(SOF_TIMESTAMPING_OPT_CMSG)]     = "option-cmsg",

	[const_ilog2(SOF_TIMESTAMPING_OPT_TSONLY)]   = "option-tsonly",

	[const_ilog2(SOF_TIMESTAMPING_OPT_STATS)]    = "option-stats",

	[const_ilog2(SOF_TIMESTAMPING_OPT_PKTINFO)]  = "option-pktinfo",

	[const_ilog2(SOF_TIMESTAMPING_OPT_TX_SWHW)]  = "option-tx-swhw",

};

static_assert(ARRAY_SIZE(sof_timestamping_names) == __SOF_TIMESTAMPING_CNT);



const char ts_tx_type_names[][ETH_GSTRING_LEN] = {

	[HWTSTAMP_TX_OFF]		= "off",

	[HWTSTAMP_TX_ON]		= "on",

	[HWTSTAMP_TX_ONESTEP_SYNC]	= "onestep-sync",

	[HWTSTAMP_TX_ONESTEP_P2P]	= "onestep-p2p",

};

static_assert(ARRAY_SIZE(ts_tx_type_names) == __HWTSTAMP_TX_CNT);



const char ts_rx_filter_names[][ETH_GSTRING_LEN] = {

	[HWTSTAMP_FILTER_NONE]			= "none",

	[HWTSTAMP_FILTER_ALL]			= "all",

	[HWTSTAMP_FILTER_SOME]			= "some",

	[HWTSTAMP_FILTER_PTP_V1_L4_EVENT]	= "ptpv1-l4-event",

	[HWTSTAMP_FILTER_PTP_V1_L4_SYNC]	= "ptpv1-l4-sync",

	[HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ]	= "ptpv1-l4-delay-req",

	[HWTSTAMP_FILTER_PTP_V2_L4_EVENT]	= "ptpv2-l4-event",

	[HWTSTAMP_FILTER_PTP_V2_L4_SYNC]	= "ptpv2-l4-sync",

	[HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ]	= "ptpv2-l4-delay-req",

	[HWTSTAMP_FILTER_PTP_V2_L2_EVENT]	= "ptpv2-l2-event",

	[HWTSTAMP_FILTER_PTP_V2_L2_SYNC]	= "ptpv2-l2-sync",

	[HWTSTAMP_FILTER_PTP_V2_L2_DELAY_REQ]	= "ptpv2-l2-delay-req",

	[HWTSTAMP_FILTER_PTP_V2_EVENT]		= "ptpv2-event",

	[HWTSTAMP_FILTER_PTP_V2_SYNC]		= "ptpv2-sync",

	[HWTSTAMP_FILTER_PTP_V2_DELAY_REQ]	= "ptpv2-delay-req",

	[HWTSTAMP_FILTER_NTP_ALL]		= "ntp-all",

};

static_assert(ARRAY_SIZE(ts_rx_filter_names) == __HWTSTAMP_FILTER_CNT);



/* return false if legacy contained non-0 deprecated fields

 * maxtxpkt/maxrxpkt. rest of ksettings always updated

 */

net/ethtool/common.h

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#define ETHTOOL_LINK_MODE(speed, type, duplex) \

	ETHTOOL_LINK_MODE_ ## speed ## base ## type ## _ ## duplex ## _BIT



#define __SOF_TIMESTAMPING_CNT (const_ilog2(SOF_TIMESTAMPING_LAST) + 1)



extern const char

netdev_features_strings[NETDEV_FEATURE_COUNT][ETH_GSTRING_LEN];

extern const char
@@ -23,6 +25,9 @@ phy_tunable_strings[__ETHTOOL_PHY_TUNABLE_COUNT][ETH_GSTRING_LEN]; 
extern const char link_mode_names[][ETH_GSTRING_LEN];

extern const char netif_msg_class_names[][ETH_GSTRING_LEN];

extern const char wol_mode_names[][ETH_GSTRING_LEN];

extern const char sof_timestamping_names[][ETH_GSTRING_LEN];

extern const char ts_tx_type_names[][ETH_GSTRING_LEN];

extern const char ts_rx_filter_names[][ETH_GSTRING_LEN];



int __ethtool_get_link(struct net_device *dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE