| Message ID | 1357436318-12425-1-git-send-email-Frank.Li@freescale.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Jan 06, 2013 at 09:38:38AM +0800, Frank Li wrote: > Report correct hardware stamping capibilty by ethtool interface. > The v1.0 ptp4l check it. > > Signed-off-by: Frank Li <Frank.Li@freescale.com> > --- > drivers/net/ethernet/freescale/fec.c | 28 +++++++++++++++++++++++++++- > 1 files changed, 27 insertions(+), 1 deletions(-) Thanks for following up to add this. Acked-by: Richard Cochran <richardcochran@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Frank, This also should be fixed in v3.8, but the fix will look different. Would you please submit a patch for that, too? BTW, you should always label the patch to tell which tree it goes into, either "net" or "net-next". This patch is for net-next, but a fix for v3.8 would be for net. Thanks, Richard -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Frank,
You have a bad email address as one of the recipients:
linux-arm-kernel@lists.infradead.or
***
You also did that last time. Please take care and fix it.
Thanks,
Richard
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
2013/1/6 Richard Cochran <richardcochran@gmail.com>: > Frank, > > You have a bad email address as one of the recipients: > > linux-arm-kernel@lists.infradead.or > *** Thank you very much > > You also did that last time. Please take care and fix it. > > Thanks, > Richard -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Jan 06, 2013 at 09:38:38AM +0800, Frank Li wrote: > Report correct hardware stamping capibilty by ethtool interface. s/capibilty/capability/ > The v1.0 ptp4l check it. > > Signed-off-by: Frank Li <Frank.Li@freescale.com> > --- > drivers/net/ethernet/freescale/fec.c | 28 +++++++++++++++++++++++++++- > 1 files changed, 27 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c > index a379319..c713db5 100644 > --- a/drivers/net/ethernet/freescale/fec.c > +++ b/drivers/net/ethernet/freescale/fec.c > @@ -1173,12 +1173,38 @@ static void fec_enet_get_drvinfo(struct net_device *ndev, > strcpy(info->bus_info, dev_name(&ndev->dev)); > } > > +static int fec_enet_get_ts_info(struct net_device *ndev, > + struct ethtool_ts_info *info) > +{ > + struct fec_enet_private *fep = netdev_priv(ndev); > + int ret; > + ret = ethtool_op_get_ts_info(ndev, info); > + > + if (fep->bufdesc_ex) { > + > + info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE | > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + if (fep->ptp_clock) > + info->phc_index = ptp_clock_index(fep->ptp_clock); > + else > + info->phc_index = -1; > + > + info->tx_types = (1 << HWTSTAMP_TX_OFF) | > + (1 << HWTSTAMP_TX_ON); > + > + info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) | > + (1 << HWTSTAMP_FILTER_ALL); return 0; } else { return ethtool_op_get_ts_info(ndev, info); } ? Otherwise you call ethtool_op_get_ts_info() and don't use the result with fep->bufdesc_ex, still you return the return value of ethtool_op_get_ts_info(). Sascha
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index a379319..c713db5 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c @@ -1173,12 +1173,38 @@ static void fec_enet_get_drvinfo(struct net_device *ndev, strcpy(info->bus_info, dev_name(&ndev->dev)); } +static int fec_enet_get_ts_info(struct net_device *ndev, + struct ethtool_ts_info *info) +{ + struct fec_enet_private *fep = netdev_priv(ndev); + int ret; + ret = ethtool_op_get_ts_info(ndev, info); + + if (fep->bufdesc_ex) { + + info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RAW_HARDWARE; + if (fep->ptp_clock) + info->phc_index = ptp_clock_index(fep->ptp_clock); + else + info->phc_index = -1; + + info->tx_types = (1 << HWTSTAMP_TX_OFF) | + (1 << HWTSTAMP_TX_ON); + + info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) | + (1 << HWTSTAMP_FILTER_ALL); + } + return ret; +} + static const struct ethtool_ops fec_enet_ethtool_ops = { .get_settings = fec_enet_get_settings, .set_settings = fec_enet_set_settings, .get_drvinfo = fec_enet_get_drvinfo, .get_link = ethtool_op_get_link, - .get_ts_info = ethtool_op_get_ts_info, + .get_ts_info = fec_enet_get_ts_info, }; static int fec_enet_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
Report correct hardware stamping capibilty by ethtool interface. The v1.0 ptp4l check it. Signed-off-by: Frank Li <Frank.Li@freescale.com> --- drivers/net/ethernet/freescale/fec.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-)