ixp4xx_eth: Support the get_ts_info ethtool method.

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

2 files changed, 32 insertions, 0 deletions

diff --git a/drivers/net/ethernet/xscale/ixp4xx_eth.c b/drivers/net/ethernet/xscale/ixp4xx_eth.c
index 41a8b5a9849e..482648fcf0b6 100644
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -1002,12 +1002,41 @@ static int ixp4xx_nway_reset(struct net_device *dev)
         return phy_start_aneg(port->phydev);
 }
 
+int ixp46x_phc_index = -1;
+
+static int ixp4xx_get_ts_info(struct net_device *dev,
+                              struct ethtool_ts_info *info)
+{
+        if (!cpu_is_ixp46x()) {
+                info->so_timestamping =
+                        SOF_TIMESTAMPING_TX_SOFTWARE |
+                        SOF_TIMESTAMPING_RX_SOFTWARE |
+                        SOF_TIMESTAMPING_SOFTWARE;
+                info->phc_index = -1;
+                return 0;
+        }
+        info->so_timestamping =
+                SOF_TIMESTAMPING_TX_HARDWARE |
+                SOF_TIMESTAMPING_RX_HARDWARE |
+                SOF_TIMESTAMPING_RAW_HARDWARE;
+        info->phc_index = ixp46x_phc_index;
+        info->tx_types =
+                (1 << HWTSTAMP_TX_OFF) |
+                (1 << HWTSTAMP_TX_ON);
+        info->rx_filters =
+                (1 << HWTSTAMP_FILTER_NONE) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_SYNC) |
+                (1 << HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ);
+        return 0;
+}
+
 static const struct ethtool_ops ixp4xx_ethtool_ops = {
         .get_drvinfo = ixp4xx_get_drvinfo,
         .get_settings = ixp4xx_get_settings,
         .set_settings = ixp4xx_set_settings,
         .nway_reset = ixp4xx_nway_reset,
         .get_link = ethtool_op_get_link,
+        .get_ts_info = ixp4xx_get_ts_info,
 };
 
 
diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index 6f2782bb5f41..9d13a71c5367 100644
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -284,6 +284,7 @@ static void __exit ptp_ixp_exit(void)
 {
         free_irq(MASTER_IRQ, &ixp_clock);
         free_irq(SLAVE_IRQ, &ixp_clock);
+        ixp46x_phc_clock = -1;
         ptp_clock_unregister(ixp_clock.ptp_clock);
 }
 
@@ -302,6 +303,8 @@ static int __init ptp_ixp_init(void)
         if (IS_ERR(ixp_clock.ptp_clock))
                 return PTR_ERR(ixp_clock.ptp_clock);
 
+        ixp46x_phc_clock = ptp_clock_index(ixp_clock.ptp_clock);
+
         __raw_writel(DEFAULT_ADDEND, &ixp_clock.regs->addend);
         __raw_writel(1, &ixp_clock.regs->trgt_lo);
         __raw_writel(0, &ixp_clock.regs->trgt_hi);