net: Introduce a new MII time stamping interface.

Currently the stack supports time stamping in PHY devices. However, there are newer, non-PHY devices that can snoop an MII bus and provide time stamps. In order to support such devices, this patch introduces a new interface to be used by both PHY and non-PHY devices. In addition, the one and only user of the old PHY time stamping API is converted to the new interface.

Richard Cochran committed 6 years ago

Commit 4715f651 parent 12d0efb6 files · +106 −58Browse files

Showing the changes to include/linux (2 of 6 files). Show all

Unified · Split

2 files

include/linux/mii_timestamper.h +58 −0
include/linux/phy.h +10 −31

include/linux/mii_timestamper.h+58−0

@@ -0,0 +1,58 @@
	1	/* SPDX-License-Identifier: GPL-2.0 */
	2	/*
	3	* Support for generic time stamping devices on MII buses.
	4	* Copyright (C) 2018 Richard Cochran <richardcochran@gmail.com>
	5	*/
	6	#ifndef _LINUX_MII_TIMESTAMPER_H
	7	#define _LINUX_MII_TIMESTAMPER_H
	8
	9	#include <linux/device.h>
	10	#include <linux/ethtool.h>
	11	#include <linux/skbuff.h>
	12
	13	struct phy_device;
	14
	15	/**
	16	* struct mii_timestamper - Callback interface to MII time stamping devices.
	17	*
	18	* @rxtstamp: Requests a Rx timestamp for 'skb'. If the skb is accepted,
	19	* the MII time stamping device promises to deliver it using
	20	* netif_rx() as soon as a timestamp becomes available. One of
	21	* the PTP_CLASS_ values is passed in 'type'. The function
	22	* must return true if the skb is accepted for delivery.
	23	*
	24	* @txtstamp: Requests a Tx timestamp for 'skb'. The MII time stamping
	25	* device promises to deliver it using skb_complete_tx_timestamp()
	26	* as soon as a timestamp becomes available. One of the PTP_CLASS_
	27	* values is passed in 'type'.
	28	*
	29	* @hwtstamp: Handles SIOCSHWTSTAMP ioctl for hardware time stamping.
	30	*
	31	* @link_state: Allows the device to respond to changes in the link
	32	* state. The caller invokes this function while holding
	33	* the phy_device mutex.
	34	*
	35	* @ts_info: Handles ethtool queries for hardware time stamping.
	36	*
	37	* Drivers for PHY time stamping devices should embed their
	38	* mii_timestamper within a private structure, obtaining a reference
	39	* to it using container_of().
	40	*/
	41	struct mii_timestamper {
	42	bool (rxtstamp)(struct mii_timestamper mii_ts,
	43	struct sk_buff *skb, int type);
	44
	45	void (txtstamp)(struct mii_timestamper mii_ts,
	46	struct sk_buff *skb, int type);
	47
	48	int (hwtstamp)(struct mii_timestamper mii_ts,
	49	struct ifreq *ifreq);
	50
	51	void (link_state)(struct mii_timestamper mii_ts,
	52	struct phy_device *phydev);
	53
	54	int (ts_info)(struct mii_timestamper mii_ts,
	55	struct ethtool_ts_info *ts_info);
	56	};
	57
	58	#endif

include/linux/phy.h+10−31

 #include <linux/linkmode.h>
 #include <linux/mdio.h>
 #include <linux/mii.h>
+#include <linux/mii_timestamper.h>
 #include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 	struct sfp_bus *sfp_bus;
 	struct phylink *phylink;
 	struct net_device *attached_dev;
+	struct mii_timestamper *mii_ts;
 	u8 mdix;
 	u8 mdix_ctrl;
 	 */
 	int (*match_phy_device)(struct phy_device *phydev);
-	/* Handles ethtool queries for hardware time stamping. */
-	int (*ts_info)(struct phy_device *phydev, struct ethtool_ts_info *ti);
-	/* Handles SIOCSHWTSTAMP ioctl for hardware time stamping. */
-	int  (*hwtstamp)(struct phy_device *phydev, struct ifreq *ifr);
-	/*
-	 * Requests a Rx timestamp for 'skb'. If the skb is accepted,
-	 * the phy driver promises to deliver it using netif_rx() as
-	 * soon as a timestamp becomes available. One of the
-	 * PTP_CLASS_ values is passed in 'type'. The function must
-	 * return true if the skb is accepted for delivery.
-	 */
-	bool (*rxtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
-	/*
-	 * Requests a Tx timestamp for 'skb'. The phy driver promises
-	 * to deliver it using skb_complete_tx_timestamp() as soon as a
-	 * timestamp becomes available. One of the PTP_CLASS_ values
-	 * is passed in 'type'.
-	 */
-	void (*txtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
 	/* Some devices (e.g. qnap TS-119P II) require PHY register changes to
 	 * enable Wake on LAN, so set_wol is provided to be called in the
 	 * ethernet driver's set_wol function. */
  */
 static inline bool phy_has_hwtstamp(struct phy_device *phydev)
 {
-	return phydev && phydev->drv && phydev->drv->hwtstamp;
+	return phydev && phydev->mii_ts && phydev->mii_ts->hwtstamp;
 }
 /**
  */
 static inline bool phy_has_rxtstamp(struct phy_device *phydev)
 {
-	return phydev && phydev->drv && phydev->drv->rxtstamp;
+	return phydev && phydev->mii_ts && phydev->mii_ts->rxtstamp;
 }
 /**
  */
 static inline bool phy_has_tsinfo(struct phy_device *phydev)
 {
-	return phydev && phydev->drv && phydev->drv->ts_info;
+	return phydev && phydev->mii_ts && phydev->mii_ts->ts_info;
 }
 /**
  */
 static inline bool phy_has_txtstamp(struct phy_device *phydev)
 {
-	return phydev && phydev->drv && phydev->drv->txtstamp;
+	return phydev && phydev->mii_ts && phydev->mii_ts->txtstamp;
 }
 static inline int phy_hwtstamp(struct phy_device *phydev, struct ifreq *ifr)
 {
-	return phydev->drv->hwtstamp(phydev, ifr);
+	return phydev->mii_ts->hwtstamp(phydev->mii_ts, ifr);
 }
 static inline bool phy_rxtstamp(struct phy_device *phydev, struct sk_buff *skb,
 				int type)
 {
-	return phydev->drv->rxtstamp(phydev, skb, type);
+	return phydev->mii_ts->rxtstamp(phydev->mii_ts, skb, type);
 }
 static inline int phy_ts_info(struct phy_device *phydev,
 			      struct ethtool_ts_info *tsinfo)
 {
-	return phydev->drv->ts_info(phydev, tsinfo);
+	return phydev->mii_ts->ts_info(phydev->mii_ts, tsinfo);
 }
 static inline void phy_txtstamp(struct phy_device *phydev, struct sk_buff *skb,
 				int type)
 {
-	phydev->drv->txtstamp(phydev, skb, type);
+	phydev->mii_ts->txtstamp(phydev->mii_ts, skb, type);
 }
 /**

net: Introduce a new MII time stamping interface.

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code