kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ixp4xx_eth: Support the get_ts_info ethtool method.

Browse source 
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Richard Cochran 2012-04-03 22:59:21 +00:00 committed by David S. Miller
parent a85bbddd08
commit 509a7c2572
3 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-ixp4xx/include/mach/ixp46x_ts.h
View file

@ -75,4 +75,7 @@ struct ixp46x_ts_regs {
#define TX_SNAPSHOT_LOCKED (1<<0) #define TX_SNAPSHOT_LOCKED (1<<0)
#define RX_SNAPSHOT_LOCKED (1<<1) #define RX_SNAPSHOT_LOCKED (1<<1)
/* The ptp_ixp46x module will set this variable */
extern int ixp46x_phc_index;
#endif #endif

29
drivers/net/ethernet/xscale/ixp4xx_eth.c
View file

@ -1002,12 +1002,41 @@ static int ixp4xx_nway_reset(struct net_device *dev)
return phy_start_aneg(port->phydev); 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 = { static const struct ethtool_ops ixp4xx_ethtool_ops = {
.get_drvinfo = ixp4xx_get_drvinfo, .get_drvinfo = ixp4xx_get_drvinfo,
.get_settings = ixp4xx_get_settings, .get_settings = ixp4xx_get_settings,
.set_settings = ixp4xx_set_settings, .set_settings = ixp4xx_set_settings,
.nway_reset = ixp4xx_nway_reset, .nway_reset = ixp4xx_nway_reset,
.get_link = ethtool_op_get_link, .get_link = ethtool_op_get_link,
.get_ts_info = ixp4xx_get_ts_info,
}; };

3
drivers/ptp/ptp_ixp46x.c
View file

@ -284,6 +284,7 @@ static void __exit ptp_ixp_exit(void)
{ {
free_irq(MASTER_IRQ, &ixp_clock); free_irq(MASTER_IRQ, &ixp_clock);
free_irq(SLAVE_IRQ, &ixp_clock); free_irq(SLAVE_IRQ, &ixp_clock);
ixp46x_phc_clock = -1;
ptp_clock_unregister(ixp_clock.ptp_clock); 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)) if (IS_ERR(ixp_clock.ptp_clock))
return PTR_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(DEFAULT_ADDEND, &ixp_clock.regs->addend);
__raw_writel(1, &ixp_clock.regs->trgt_lo); __raw_writel(1, &ixp_clock.regs->trgt_lo);
__raw_writel(0, &ixp_clock.regs->trgt_hi); __raw_writel(0, &ixp_clock.regs->trgt_hi);