* [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool
@ 2013-01-07 2:25 Frank Li
2013-01-07 8:34 ` Sascha Hauer
2013-01-08 3:48 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Frank Li @ 2013-01-07 2:25 UTC (permalink / raw)
To: linux-arm-kernel
Report correct hardware stamping capability by ethtool interface.
The v1.0 ptp4l check it.
Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
Change v1->v2
1. s/capibilty/capability/
2. apply Sascha's feedback
avoid return the return value of ethtool_op_get_ts_info()
when bufdesc_ex == 1
drivers/net/ethernet/freescale/fec.c | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
index a379319..1c117e5 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec.c
@@ -1173,12 +1173,41 @@ 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);
+
+ if (fep->bufdesc_ex) {
+
+ info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_RX_SOFTWARE |
+ SOF_TIMESTAMPING_SOFTWARE |
+ 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);
+ }
+}
+
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)
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool
2013-01-07 2:25 [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool Frank Li
@ 2013-01-07 8:34 ` Sascha Hauer
2013-01-08 3:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2013-01-07 8:34 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 07, 2013 at 10:25:07AM +0800, Frank Li wrote:
> Report correct hardware stamping capability by ethtool interface.
> The v1.0 ptp4l check it.
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha
> ---
> Change v1->v2
> 1. s/capibilty/capability/
> 2. apply Sascha's feedback
> avoid return the return value of ethtool_op_get_ts_info()
> when bufdesc_ex == 1
>
> drivers/net/ethernet/freescale/fec.c | 31 ++++++++++++++++++++++++++++++-
> 1 files changed, 30 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c
> index a379319..1c117e5 100644
> --- a/drivers/net/ethernet/freescale/fec.c
> +++ b/drivers/net/ethernet/freescale/fec.c
> @@ -1173,12 +1173,41 @@ 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);
> +
> + if (fep->bufdesc_ex) {
> +
> + info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
> + SOF_TIMESTAMPING_RX_SOFTWARE |
> + SOF_TIMESTAMPING_SOFTWARE |
> + 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);
> + }
> +}
> +
> 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)
> --
> 1.7.1
>
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool
2013-01-07 2:25 [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool Frank Li
2013-01-07 8:34 ` Sascha Hauer
@ 2013-01-08 3:48 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-01-08 3:48 UTC (permalink / raw)
To: linux-arm-kernel
From: Frank Li <Frank.Li@freescale.com>
Date: Mon, 7 Jan 2013 10:25:07 +0800
> Report correct hardware stamping capability by ethtool interface.
> The v1.0 ptp4l check it.
>
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-08 3:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-07 2:25 [PATCH v2 1/1 net-next] net: fec: report correct hardware stamping info to ethtool Frank Li
2013-01-07 8:34 ` Sascha Hauer
2013-01-08 3:48 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).