Commit bc6a5efe authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-timestamp-selectable' 

Kory Maincent says:

====================
net: Make timestamping selectable

Up until now, there was no way to let the user select the hardware
PTP provider at which time stamping occurs. The stack assumed that PHY time
stamping is always preferred, but some MAC/PHY combinations were buggy.

This series updates the default MAC/PHY default timestamping and aims to
allow the user to select the desired hwtstamp provider administratively.

Here is few netlink spec usage examples:
./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema
             --dump tsinfo-get
             --json '{"header":{"dev-name":"eth0"}}'
[{'header': {'dev-index': 3, 'dev-name': 'eth0'},
  'hwtst-provider': {'index': 0, 'qualifier': 0},
  'phc-index': 0,
  'rx-filters': {'bits': {'bit': [{'index': 0, 'name': 'none'},
                                  {'index': 2, 'name': 'some'}]},
                 'nomask': True,
                 'size': 16},
  'timestamping': {'bits': {'bit': [{'index': 0, 'name': 'hardware-transmit'},
                                    {'index': 2, 'name': 'hardware-receive'},
                                    {'index': 6,
                                     'name': 'hardware-raw-clock'}]},
                   'nomask': True,
                   'size': 17},
  'tx-types': {'bits': {'bit': [{'index': 0, 'name': 'off'},
                                {'index': 1, 'name': 'on'}]},
               'nomask': True,
               'size': 4}},
 {'header': {'dev-index': 3, 'dev-name': 'eth0'},
  'hwtst-provider': {'index': 2, 'qualifier': 0},
  'phc-index': 2,
  'rx-filters': {'bits': {'bit': [{'index': 0, 'name': 'none'},
                                  {'index': 1, 'name': 'all'}]},
                 'nomask': True,
                 'size': 16},
  'timestamping': {'bits': {'bit': [{'index': 0, 'name': 'hardware-transmit'},
                                    {'index': 1, 'name': 'software-transmit'},
                                    {'index': 2, 'name': 'hardware-receive'},
                                    {'index': 3, 'name': 'software-receive'},
                                    {'index': 4,
                                     'name': 'software-system-clock'},
                                    {'index': 6,
                                     'name': 'hardware-raw-clock'}]},
                   'nomask': True,
                   'size': 17},
  'tx-types': {'bits': {'bit': [{'index': 0, 'name': 'off'},
                                {'index': 1, 'name': 'on'},
                                {'index': 2, 'name': 'onestep-sync'}]},
               'nomask': True,
               'size': 4}}]

./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do tsinfo-get
             --json '{"header":{"dev-name":"eth0"},
                      "hwtst-provider":{"index":0, "qualifier":0 }
}'
{'header': {'dev-index': 3, 'dev-name': 'eth0'},
 'hwtst-provider': {'index': 0, 'qualifier': 0},
 'phc-index': 0,
 'rx-filters': {'bits': {'bit': [{'index': 0, 'name': 'none'},
                                 {'index': 2, 'name': 'some'}]},
                'nomask': True,
                'size': 16},
 'timestamping': {'bits': {'bit': [{'index': 0, 'name': 'hardware-transmit'},
                                   {'index': 2, 'name': 'hardware-receive'},
                                   {'index': 6, 'name': 'hardware-raw-clock'}]},
                  'nomask': True,
                  'size': 17},
 'tx-types': {'bits': {'bit': [{'index': 0, 'name': 'off'},
                               {'index': 1, 'name': 'on'}]},
              'nomask': True,
              'size': 4}}

./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do tsinfo-set
             --json '{"header":{"dev-name":"eth0"},
                      "hwtst-provider":{"index":2, "qualifier":0}}'
None
./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do tsconfig-get
	     --json '{"header":{"dev-name":"eth0"}}'
{'header': {'dev-index': 3, 'dev-name': 'eth0'},
 'hwtstamp-flags': 1,
 'hwtstamp-provider': {'index': 1, 'qualifier': 0},
 'rx-filters': {'bits': {'bit': [{'index': 12, 'name': 'ptpv2-event'}]},
                'nomask': True,
                'size': 16},
 'tx-types': {'bits': {'bit': [{'index': 1, 'name': 'on'}]},
              'nomask': True,
              'size': 4}}

 ./ynl/cli.py --spec netlink/specs/ethtool.yaml --no-schema --do tsconfig-set
	      --json '{"header":{"dev-name":"eth0"},
		       "hwtstamp-provider":{"index":1, "qualifier":0 },
		       "rx-filters":{"bits": {"bit": {"name":"ptpv2-l4-event"}},
				     "nomask": 1},
		       "tx-types":{"bits": {"bit": {"name":"on"}},
				   "nomask": 1}}'
{'header': {'dev-index': 3, 'dev-name': 'eth0'},
 'hwtstamp-flags': 1,
 'hwtstamp-provider': {'index': 1, 'qualifier': 0},
 'rx-filters': {'bits': {'bit': [{'index': 12, 'name': 'ptpv2-event'}]},
                'nomask': True,
                'size': 16},
 'tx-types': {'bits': {'bit': [{'index': 1, 'name': 'on'}]},
              'nomask': True,
              'size': 4}}

Changes in v21:
- NIT fixes.
- Link to v20: https://lore.kernel.org/r/20241204-feature_ptp_netnext-v20-0-9bd99dc8a867@bootlin.com

Changes in v20:
- Change hwtstamp provider design to avoid saving "user" (phy or net) in
  the ptp clock structure.
- Link to v19: https://lore.kernel.org/r/20241030-feature_ptp_netnext-v19-0-94f8aadc9d5c@bootlin.com

Changes in v19:
- Rebase on net-next
- Link to v18: https://lore.kernel.org/r/20241023-feature_ptp_netnext-v18-0-ed948f3b6887@bootlin.com

Changes in v18:
- Few changes in the tsconfig-set ethtool command.
- Add tsconfig-set-reply ethtool netlink socket.
- Add missing netlink tsconfig documentation
- Link to v17: https://lore.kernel.org/r/20240709-feature_ptp_netnext-v17-0-b5317f50df2a@bootlin.com

Changes in v17:
- Fix a documentation nit.
- Add a missing kernel_ethtool_tsinfo update from a new MAC driver.
- Link to v16: https://lore.kernel.org/r/20240705-feature_ptp_netnext-v16-0-5d7153914052@bootlin.com

Changes in v16:
- Add a new patch to separate tsinfo into a new tsconfig command to get
  and set the hwtstamp config.
- Used call_rcu() instead of synchronize_rcu() to free the hwtstamp_provider
- Moved net core changes of patch 12 directly to patch 8.
- Link to v15: https://lore.kernel.org/r/20240612-feature_ptp_netnext-v15-0-b2a086257b63@bootlin.com

Changes in v15:
- Fix uninitialized ethtool_ts_info structure.
- Link to v14: https://lore.kernel.org/r/20240604-feature_ptp_netnext-v14-0-77b6f6efea40@bootlin.com

Changes in v14:
- Add back an EXPORT_SYMBOL() missing.
- Link to v13: https://lore.kernel.org/r/20240529-feature_ptp_netnext-v13-0-6eda4d40fa4f@bootlin.com

Changes in v13:
- Add PTP builtin code to fix build errors when building PTP as a module.
- Fix error spotted by smatch and sparse.
- Link to v12: https://lore.kernel.org/r/20240430-feature_ptp_netnext-v12-0-2c5f24b6a914@bootlin.com

Changes in v12:
- Add missing return description in the kdoc.
- Fix few nit.
- Link to v11: https://lore.kernel.org/r/20240422-feature_ptp_netnext-v11-0-f14441f2a1d8@bootlin.com

Changes in v11:
- Add netlink examples.
- Remove a change of my out of tree marvell_ptp patch in the patch series.
- Remove useless extern.
- Link to v10: https://lore.kernel.org/r/20240409-feature_ptp_netnext-v10-0-0fa2ea5c89a9@bootlin.com

Changes in v10:
- Move declarations to net/core/dev.h instead of netdevice.h
- Add netlink documentation.
- Add ETHTOOL_A_TSINFO_GHWTSTAMP netlink attributes instead of a bit in
  ETHTOOL_A_TSINFO_TIMESTAMPING bitset.
- Send "Move from simple ida to xarray" patch standalone.
- Add tsinfo ntf command.
- Add rcu_lock protection mechanism to avoid memory leak.
- Fixed doc and kdoc issue.
- Link to v9: https://lore.kernel.org/r/20240226-feature_ptp_netnext-v9-0-455611549f21@bootlin.com

Changes in v9:
- Remove the RFC prefix.
- Correct few NIT fixes.
- Link to v8: https://lore.kernel.org/r/20240216-feature_ptp_netnext-v8-0-510f42f444fb@bootlin.com

Changes in v8:
- Drop the 6 first patch as they are now merged.
- Change the full implementation to not be based on the hwtstamp layer
  (MAC/PHY) but on the hwtstamp provider which mean a ptp clock and a
  phc qualifier.
- Made some patch to prepare the new implementation.
- Expand netlink tsinfo instead of a new ts command for new hwtstamp
  configuration uAPI and for dumping tsinfo of specific hwtstamp provider.
- Link to v7: https://lore.kernel.org/r/20231114-feature_ptp_netnext-v7-0-472e77951e40@bootlin.com

Changes in v7:
- Fix a temporary build error.
- Link to v6: https://lore.kernel.org/r/20231019-feature_ptp_netnext-v6-0-71affc27b0e5@bootlin.com

Changes in v6:
- Few fixes from the reviews.
- Replace the allowlist to default_timestamp flag to know which phy is
  using old API behavior.
- Rename the timestamping layer enum values.
- Move to a simple enum instead of the mix between enum and bitfield.
- Update ts_info and ts-set in software timestamping case.

Changes in v5:
- Update to ndo_hwstamp_get/set. This bring several new patches.
- Add few patches to make the glue.
- Convert macb to ndo_hwstamp_get/set.
- Add netlink specs description of new ethtool commands.
- Removed netdev notifier.
- Split the patches that expose the timestamping to userspace to separate
  the core and ethtool development.
- Add description of software timestamping.
- Convert PHYs hwtstamp callback to use kernel_hwtstamp_config.

Changes in v4:
- Move on to ethtool netlink instead of ioctl.
- Add a netdev notifier to allow packet trapping by the MAC in case of PHY
  time stamping.
- Add a PHY whitelist to not break the old PHY default time-stamping
  preference API.

Changes in v3:
- Expose the PTP choice to ethtool instead of sysfs.
  You can test it with the ethtool source on branch feature_ptp of:
  https://github.com/kmaincent/ethtool


- Added a devicetree binding to select the preferred timestamp.

Changes in v2:
- Move selected_timestamping_layer variable of the concerned patch.
- Use sysfs_streq instead of strmcmp.
- Use the PHY timestamp only if available.
====================

Signed-off-by: default avatarKory Maincent <kory.maincent@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents da3e3186 6e9e2eed

Documentation/netlink/specs/ethtool.yaml

+76 −0
Original line number Diff line number Diff line
@@ -836,6 +836,20 @@ attribute-sets: 
      -

        name: tx-err

        type: uint

  -

    name: ts-hwtstamp-provider

    attr-cnt-name: __ethtool-a-ts-hwtstamp-provider-cnt

    attributes:

      -

        name: unspec

        type: unused

        value: 0

      -

        name: index

        type: u32

      -

        name: qualifier

        type: u32

  -

    name: tsinfo

    attr-cnt-name: __ethtool-a-tsinfo-cnt
@@ -867,6 +881,10 @@ attribute-sets: 
        name: stats

        type: nest

        nested-attributes: ts-stat

      -

        name: hwtstamp-provider

        type: nest

        nested-attributes: ts-hwtstamp-provider

  -

    name: cable-result

    attr-cnt-name: __ethtool-a-cable-result-cnt
@@ -1471,6 +1489,33 @@ attribute-sets: 
      -

        name: downstream-sfp-name

        type: string

  -

    name: tsconfig

    attr-cnt-name: __ethtool-a-tsconfig-cnt

    attributes:

      -

        name: unspec

        type: unused

        value: 0

      -

        name: header

        type: nest

        nested-attributes: header

      -

        name: hwtstamp-provider

        type: nest

        nested-attributes: ts-hwtstamp-provider

      -

        name: tx-types

        type: nest

        nested-attributes: bitset

      -

        name: rx-filters

        type: nest

        nested-attributes: bitset

      -

        name: hwtstamp-flags

        type: u32



operations:

  enum-model: directional
@@ -1912,6 +1957,7 @@ operations: 
        request:

          attributes:

            - header

            - hwtstamp-provider

        reply:

          attributes:

            - header
@@ -1920,6 +1966,7 @@ operations: 
            - rx-filters

            - phc-index

            - stats

            - hwtstamp-provider

      dump: *tsinfo-get-op

    -

      name: cable-test-act
@@ -2294,3 +2341,32 @@ operations: 
      name: phy-ntf

      doc: Notification for change in PHY devices.

      notify: phy-get

    -

      name: tsconfig-get

      doc: Get hwtstamp config.



      attribute-set: tsconfig



      do: &tsconfig-get-op

        request:

          attributes:

            - header

        reply:

          attributes: &tsconfig

            - header

            - hwtstamp-provider

            - tx-types

            - rx-filters

            - hwtstamp-flags

      dump: *tsconfig-get-op

    -

      name: tsconfig-set

      doc: Set hwtstamp config.



      attribute-set: tsconfig



      do:

        request:

          attributes: *tsconfig

        reply:

          attributes: *tsconfig

Documentation/networking/ethtool-netlink.rst

+79 −3
Original line number Diff line number Diff line
@@ -237,6 +237,8 @@ Userspace to kernel: 
  ``ETHTOOL_MSG_MM_SET``                set MAC merge layer parameters

  ``ETHTOOL_MSG_MODULE_FW_FLASH_ACT``   flash transceiver module firmware

  ``ETHTOOL_MSG_PHY_GET``               get Ethernet PHY information

  ``ETHTOOL_MSG_TSCONFIG_GET``          get hw timestamping configuration

  ``ETHTOOL_MSG_TSCONFIG_SET``          set hw timestamping configuration

  ===================================== =================================



Kernel to userspace:
@@ -286,6 +288,8 @@ Kernel to userspace: 
  ``ETHTOOL_MSG_MODULE_FW_FLASH_NTF``      transceiver module flash updates

  ``ETHTOOL_MSG_PHY_GET_REPLY``            Ethernet PHY information

  ``ETHTOOL_MSG_PHY_NTF``                  Ethernet PHY information change

  ``ETHTOOL_MSG_TSCONFIG_GET_REPLY``       hw timestamping configuration

  ``ETHTOOL_MSG_TSCONFIG_SET_REPLY``       new hw timestamping configuration

  ======================================== =================================



``GET`` requests are sent by userspace applications to retrieve device
@@ -1245,9 +1249,10 @@ Gets timestamping information like ``ETHTOOL_GET_TS_INFO`` ioctl request. 


Request contents:



  =====================================  ======  ==========================

  ========================================  ======  ============================

  ``ETHTOOL_A_TSINFO_HEADER``               nested  request header

  =====================================  ======  ==========================

  ``ETHTOOL_A_TSINFO_HWTSTAMP_PROVIDER``    nested  PTP hw clock provider

  ========================================  ======  ============================



Kernel response contents:
@@ -2243,6 +2248,75 @@ Kernel response contents: 
When ``ETHTOOL_A_PHY_UPSTREAM_TYPE`` is PHY_UPSTREAM_PHY, the PHY's parent is

another PHY.



TSCONFIG_GET

============



Retrieves the information about the current hardware timestamping source and

configuration.



It is similar to the deprecated ``SIOCGHWTSTAMP`` ioctl request.



Request contents:



  ====================================  ======  ==========================

  ``ETHTOOL_A_TSCONFIG_HEADER``         nested  request header

  ====================================  ======  ==========================



Kernel response contents:



  ======================================== ======  ============================

  ``ETHTOOL_A_TSCONFIG_HEADER``            nested  request header

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested  PTP hw clock provider

  ``ETHTOOL_A_TSCONFIG_TX_TYPES``          bitset  hwtstamp Tx type

  ``ETHTOOL_A_TSCONFIG_RX_FILTERS``        bitset  hwtstamp Rx filter

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS``	   u32     hwtstamp flags

  ======================================== ======  ============================



When set the ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` attribute identifies the

source of the hw timestamping provider. It is composed by

``ETHTOOL_A_TS_HWTSTAMP_PROVIDER_INDEX`` attribute which describe the index of

the PTP device and ``ETHTOOL_A_TS_HWTSTAMP_PROVIDER_QUALIFIER`` which describe

the qualifier of the timestamp.



When set the ``ETHTOOL_A_TSCONFIG_TX_TYPES``, ``ETHTOOL_A_TSCONFIG_RX_FILTERS``

and the ``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` attributes identify the Tx

type, the Rx filter and the flags configured for the current hw timestamping

provider. The attributes are propagated to the driver through the following

structure:



.. kernel-doc:: include/linux/net_tstamp.h

    :identifiers: kernel_hwtstamp_config



TSCONFIG_SET

============



Set the information about the current hardware timestamping source and

configuration.



It is similar to the deprecated ``SIOCSHWTSTAMP`` ioctl request.



Request contents:



  ======================================== ======  ============================

  ``ETHTOOL_A_TSCONFIG_HEADER``            nested  request header

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested  PTP hw clock provider

  ``ETHTOOL_A_TSCONFIG_TX_TYPES``          bitset  hwtstamp Tx type

  ``ETHTOOL_A_TSCONFIG_RX_FILTERS``        bitset  hwtstamp Rx filter

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS``	   u32     hwtstamp flags

  ======================================== ======  ============================



Kernel response contents:



  ======================================== ======  ============================

  ``ETHTOOL_A_TSCONFIG_HEADER``            nested  request header

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` nested  PTP hw clock provider

  ``ETHTOOL_A_TSCONFIG_TX_TYPES``          bitset  hwtstamp Tx type

  ``ETHTOOL_A_TSCONFIG_RX_FILTERS``        bitset  hwtstamp Rx filter

  ``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS``	   u32     hwtstamp flags

  ======================================== ======  ============================



For a description of each attribute, see ``TSCONFIG_GET``.



Request translation

===================
@@ -2351,4 +2425,6 @@ are netlink only. 
  n/a                                 ``ETHTOOL_MSG_MM_SET``

  n/a                                 ``ETHTOOL_MSG_MODULE_FW_FLASH_ACT``

  n/a                                 ``ETHTOOL_MSG_PHY_GET``

  ``SIOCGHWTSTAMP``                   ``ETHTOOL_MSG_TSCONFIG_GET``

  ``SIOCSHWTSTAMP``                   ``ETHTOOL_MSG_TSCONFIG_SET``

  =================================== =====================================

Documentation/networking/timestamping.rst

+24 −14
Original line number Diff line number Diff line
@@ -525,8 +525,8 @@ implicitly defined. ts[0] holds a software timestamp if set, ts[1] 
is again deprecated and ts[2] holds a hardware timestamp if set.





3. Hardware Timestamping configuration: SIOCSHWTSTAMP and SIOCGHWTSTAMP

=======================================================================

3. Hardware Timestamping configuration: ETHTOOL_MSG_TSCONFIG_SET/GET

====================================================================



Hardware time stamping must also be initialized for each device driver

that is expected to do hardware time stamping. The parameter is defined in
@@ -539,12 +539,14 @@ include/uapi/linux/net_tstamp.h as:: 
	};



Desired behavior is passed into the kernel and to a specific device by

calling ioctl(SIOCSHWTSTAMP) with a pointer to a struct ifreq whose

ifr_data points to a struct hwtstamp_config. The tx_type and

rx_filter are hints to the driver what it is expected to do. If

the requested fine-grained filtering for incoming packets is not

supported, the driver may time stamp more than just the requested types

of packets.

calling the tsconfig netlink socket ``ETHTOOL_MSG_TSCONFIG_SET``.

The ``ETHTOOL_A_TSCONFIG_TX_TYPES``, ``ETHTOOL_A_TSCONFIG_RX_FILTERS`` and

``ETHTOOL_A_TSCONFIG_HWTSTAMP_FLAGS`` netlink attributes are then used to set

the struct hwtstamp_config accordingly.



The ``ETHTOOL_A_TSCONFIG_HWTSTAMP_PROVIDER`` netlink nested attribute is used

to select the source of the hardware time stamping. It is composed of an index

for the device source and a qualifier for the type of time stamping.



Drivers are free to use a more permissive configuration than the requested

configuration. It is expected that drivers should only implement directly the
@@ -563,9 +565,16 @@ Only a processes with admin rights may change the configuration. User 
space is responsible to ensure that multiple processes don't interfere

with each other and that the settings are reset.



Any process can read the actual configuration by passing this

structure to ioctl(SIOCGHWTSTAMP) in the same way.  However, this has

not been implemented in all drivers.

Any process can read the actual configuration by requesting tsconfig netlink

socket ``ETHTOOL_MSG_TSCONFIG_GET``.



The legacy configuration is the use of the ioctl(SIOCSHWTSTAMP) with a pointer

to a struct ifreq whose ifr_data points to a struct hwtstamp_config.

The tx_type and rx_filter are hints to the driver what it is expected to do.

If the requested fine-grained filtering for incoming packets is not

supported, the driver may time stamp more than just the requested types

of packets. ioctl(SIOCGHWTSTAMP) is used in the same way as the

ioctl(SIOCSHWTSTAMP). However, this has not been implemented in all drivers.



::
@@ -610,9 +619,10 @@ not been implemented in all drivers. 
--------------------------------------------------------



A driver which supports hardware time stamping must support the

SIOCSHWTSTAMP ioctl and update the supplied struct hwtstamp_config with

the actual values as described in the section on SIOCSHWTSTAMP.  It

should also support SIOCGHWTSTAMP.

ndo_hwtstamp_set NDO or the legacy SIOCSHWTSTAMP ioctl and update the

supplied struct hwtstamp_config with the actual values as described in

the section on SIOCSHWTSTAMP. It should also support ndo_hwtstamp_get or

the legacy SIOCGHWTSTAMP.



Time stamps for received packets must be stored in the skb. To get a pointer

to the shared time stamp structure of the skb call skb_hwtstamps(). Then

drivers/net/phy/phy_device.c

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/phy_link_topology.h>

#include <linux/pse-pd/pse.h>

#include <linux/property.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/rtnetlink.h>

#include <linux/sfp.h>

#include <linux/skbuff.h>
@@ -1998,6 +1999,15 @@ void phy_detach(struct phy_device *phydev) 


	phy_suspend(phydev);

	if (dev) {

		struct hwtstamp_provider *hwprov;



		hwprov = rtnl_dereference(dev->hwprov);

		/* Disable timestamp if it is the one selected */

		if (hwprov && hwprov->phydev == phydev) {

			rcu_assign_pointer(dev->hwprov, NULL);

			kfree_rcu(hwprov, rcu_head);

		}



		phydev->attached_dev->phydev = NULL;

		phydev->attached_dev = NULL;

		phy_link_topo_del_phy(dev, phydev);

include/linux/ethtool.h

+4 −0
Original line number Diff line number Diff line
@@ -711,6 +711,7 @@ struct ethtool_rxfh_param { 
 * @cmd: command number = %ETHTOOL_GET_TS_INFO

 * @so_timestamping: bit mask of the sum of the supported SO_TIMESTAMPING flags

 * @phc_index: device index of the associated PHC, or -1 if there is none

 * @phc_qualifier: qualifier of the associated PHC

 * @tx_types: bit mask of the supported hwtstamp_tx_types enumeration values

 * @rx_filters: bit mask of the supported hwtstamp_rx_filters enumeration values

 */
@@ -718,6 +719,7 @@ struct kernel_ethtool_ts_info { 
	u32 cmd;

	u32 so_timestamping;

	int phc_index;

	enum hwtstamp_provider_qualifier phc_qualifier;

	enum hwtstamp_tx_types tx_types;

	enum hwtstamp_rx_filters rx_filters;

};
@@ -749,6 +751,7 @@ struct kernel_ethtool_ts_info { 
 *	@rss_context argument to @create_rxfh_context and friends.

 * @supported_coalesce_params: supported types of interrupt coalescing.

 * @supported_ring_params: supported ring params.

 * @supported_hwtstamp_qualifiers: bitfield of supported hwtstamp qualifier.

 * @get_drvinfo: Report driver/device information. Modern drivers no

 *	longer have to implement this callback. Most fields are

 *	correctly filled in by the core using system information, or
@@ -966,6 +969,7 @@ struct ethtool_ops { 
	u32	rxfh_max_num_contexts;

	u32	supported_coalesce_params;

	u32	supported_ring_params;

	u32	supported_hwtstamp_qualifiers;

	void	(*get_drvinfo)(struct net_device *, struct ethtool_drvinfo *);

	int	(*get_regs_len)(struct net_device *);

	void	(*get_regs)(struct net_device *, struct ethtool_regs *, void *);