* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method. [not found] ` <88e5b2cfcabda03826bb576b21e2e1d990f07117.1333529506.git.richardcochran@gmail.com> @ 2012-04-06 4:08 ` Paul Gortmaker 2012-04-06 4:18 ` David Miller 0 siblings, 1 reply; 5+ messages in thread From: Paul Gortmaker @ 2012-04-06 4:08 UTC (permalink / raw) To: Richard Cochran Cc: netdev, David Miller, Ben Hutchings, Martin Porter, Jacob Keller, Jeff Kirsher, John Ronciak, e1000-devel, linux-next On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran <richardcochran@gmail.com> wrote: > Signed-off-by: Richard Cochran <richardcochran@gmail.com> > --- > drivers/net/ethernet/adi/bfin_mac.c | 20 ++++++++++++++++++++ > 1 files changed, 20 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c > index ab4daec..db22278 100644 > --- a/drivers/net/ethernet/adi/bfin_mac.c > +++ b/drivers/net/ethernet/adi/bfin_mac.c > @@ -548,6 +548,25 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev, > return 0; > } > > +static int bfin_mac_ethtool_get_ts_info(struct net_device *dev, > + struct ethtool_ts_info *info); -----------------------------------> ^^^^^^^ Trailing semicolon. Compile fail in linux-next due to a85bbddd. http://kisskb.ellerman.id.au/kisskb/buildresult/6040086/ http://kisskb.ellerman.id.au/kisskb/buildresult/6040080/ http://kisskb.ellerman.id.au/kisskb/buildresult/6040087/ Thanks. Paul. > +{ > + info->so_timestamping = > + SOF_TIMESTAMPING_TX_HARDWARE | > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_SYS_HARDWARE; > + 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_PTP_V1_L4_EVENT) | > + (1 << HWTSTAMP_FILTER_PTP_V2_L2_EVENT) | > + (1 << HWTSTAMP_FILTER_PTP_V2_L4_EVENT); > + return 0; > +} > + > static const struct ethtool_ops bfin_mac_ethtool_ops = { > .get_settings = bfin_mac_ethtool_getsettings, > .set_settings = bfin_mac_ethtool_setsettings, > @@ -555,6 +574,7 @@ static const struct ethtool_ops bfin_mac_ethtool_ops = { > .get_drvinfo = bfin_mac_ethtool_getdrvinfo, > .get_wol = bfin_mac_ethtool_getwol, > .set_wol = bfin_mac_ethtool_setwol, > + .get_ts_info = bfin_mac_ethtool_get_ts_info, > }; > > /**************************************************************************/ > -- > 1.7.2.5 > > -- > 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method. 2012-04-06 4:08 ` [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method Paul Gortmaker @ 2012-04-06 4:18 ` David Miller 2012-04-06 7:04 ` Richard Cochran 0 siblings, 1 reply; 5+ messages in thread From: David Miller @ 2012-04-06 4:18 UTC (permalink / raw) To: paul.gortmaker Cc: mporter, e1000-devel, netdev, jacob.e.keller, john.ronciak, bhutchings, linux-next From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri, 6 Apr 2012 00:08:52 -0400 > On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran > <richardcochran@gmail.com> wrote: >> Signed-off-by: Richard Cochran <richardcochran@gmail.com> >> --- >> drivers/net/ethernet/adi/bfin_mac.c | 20 ++++++++++++++++++++ >> 1 files changed, 20 insertions(+), 0 deletions(-) >> >> diff --git a/drivers/net/ethernet/adi/bfin_mac.c b/drivers/net/ethernet/adi/bfin_mac.c >> index ab4daec..db22278 100644 >> --- a/drivers/net/ethernet/adi/bfin_mac.c >> +++ b/drivers/net/ethernet/adi/bfin_mac.c >> @@ -548,6 +548,25 @@ static int bfin_mac_ethtool_setwol(struct net_device *dev, >> return 0; >> } >> >> +static int bfin_mac_ethtool_get_ts_info(struct net_device *dev, >> + struct ethtool_ts_info *info); > > -----------------------------------> ^^^^^^^ > > Trailing semicolon. Compile fail in linux-next due to a85bbddd. I just pushed out the obvious fix for this. ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ E1000-devel mailing list E1000-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method. 2012-04-06 4:18 ` David Miller @ 2012-04-06 7:04 ` Richard Cochran 0 siblings, 0 replies; 5+ messages in thread From: Richard Cochran @ 2012-04-06 7:04 UTC (permalink / raw) To: David Miller Cc: paul.gortmaker, netdev, bhutchings, mporter, jacob.e.keller, jeffrey.t.kirsher, john.ronciak, e1000-devel, linux-next On Fri, Apr 06, 2012 at 12:18:05AM -0400, David Miller wrote: > > Trailing semicolon. Compile fail in linux-next due to a85bbddd. > > I just pushed out the obvious fix for this. Paul, thanks for compile testing, and David, thanks for fixing these. Next time I promise to do at least the compile testing for the various different architectures. Richard ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <c268d71203b066b9052a8cabd5f6c71de2a8fa77.1333529506.git.richardcochran@gmail.com>]
* Re: [PATCH V4 net-next 04/26] gianfar: Support the get_ts_info ethtool method. [not found] ` <c268d71203b066b9052a8cabd5f6c71de2a8fa77.1333529506.git.richardcochran@gmail.com> @ 2012-04-06 4:25 ` Paul Gortmaker 2012-04-06 4:35 ` David Miller 0 siblings, 1 reply; 5+ messages in thread From: Paul Gortmaker @ 2012-04-06 4:25 UTC (permalink / raw) To: Richard Cochran Cc: netdev, David Miller, Ben Hutchings, Martin Porter, Jacob Keller, Jeff Kirsher, John Ronciak, e1000-devel, linux-next On Wed, Apr 4, 2012 at 4:59 AM, Richard Cochran <richardcochran@gmail.com> wrote: > Signed-off-by: Richard Cochran <richardcochran@gmail.com> > --- > drivers/net/ethernet/freescale/gianfar.h | 3 ++ > drivers/net/ethernet/freescale/gianfar_ethtool.c | 29 ++++++++++++++++++++++ > drivers/net/ethernet/freescale/gianfar_ptp.c | 2 + > 3 files changed, 34 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/gianfar.h b/drivers/net/ethernet/freescale/gianfar.h > index 4c9f8d4..2136c7f 100644 > --- a/drivers/net/ethernet/freescale/gianfar.h > +++ b/drivers/net/ethernet/freescale/gianfar.h > @@ -1210,4 +1210,7 @@ struct filer_table { > struct gfar_filer_entry fe[MAX_FILER_CACHE_IDX + 20]; > }; > > +/* The gianfar_ptp module will set this variable */ > +extern int gfar_phc_index; > + > #endif /* __GIANFAR_H */ > diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c > index 8d74efd..27f49c7 100644 > --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c > +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c > @@ -1739,6 +1739,34 @@ static int gfar_get_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd, > return ret; > } > > +int gfar_phc_index = -1; > + > +static int gfar_get_ts_info(struct net_device *dev, > + struct ethtool_ts_info *info) > +{ > + struct gfar_private *priv = netdev_priv(dev); > + > + if (!(priv->device_flags & FSL_GIANFAR_DEV_HAS_TIMER)) { > + info->so_timestamping = > + SOF_TIMESTAMPING_RX_SOFTWARE | > + SOF_TIMESTAMPING_SOFTWARE; Commit 66636287 in linux-next appears to cause this: drivers/net/ethernet/freescale/gianfar_ethtool.c:1751:4: error: 'SOF_TIMESTAMPING_RX_SOFTWARE' undeclared (first use in this function) drivers/net/ethernet/freescale/gianfar_ethtool.c:1752:4: error: 'SOF_TIMESTAMPING_SOFTWARE' undeclared (first use in this function) Needs an include of <linux/net_tstamp.h> ? http://kisskb.ellerman.id.au/kisskb/buildresult/6039723/ http://kisskb.ellerman.id.au/kisskb/buildresult/6039704/ http://kisskb.ellerman.id.au/kisskb/buildresult/6040028/ I'd normally just provide a tested and signed off patch, but I'm kind of limited to just browsing the build results at this particular moment. Sorry about that. Paul. > + info->phc_index = -1; > + return 0; > + } > + info->so_timestamping = > + SOF_TIMESTAMPING_TX_HARDWARE | > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + info->phc_index = gfar_phc_index; > + info->tx_types = > + (1 << HWTSTAMP_TX_OFF) | > + (1 << HWTSTAMP_TX_ON); > + info->rx_filters = > + (1 << HWTSTAMP_FILTER_NONE) | > + (1 << HWTSTAMP_FILTER_ALL); > + return 0; > +} > + > const struct ethtool_ops gfar_ethtool_ops = { > .get_settings = gfar_gsettings, > .set_settings = gfar_ssettings, > @@ -1761,4 +1789,5 @@ const struct ethtool_ops gfar_ethtool_ops = { > #endif > .set_rxnfc = gfar_set_nfc, > .get_rxnfc = gfar_get_nfc, > + .get_ts_info = gfar_get_ts_info, > }; > diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c > index 5fd620b..c08e5d4 100644 > --- a/drivers/net/ethernet/freescale/gianfar_ptp.c > +++ b/drivers/net/ethernet/freescale/gianfar_ptp.c > @@ -515,6 +515,7 @@ static int gianfar_ptp_probe(struct platform_device *dev) > err = PTR_ERR(etsects->clock); > goto no_clock; > } > + gfar_phc_clock = ptp_clock_index(etsects->clock); > > dev_set_drvdata(&dev->dev, etsects); > > @@ -538,6 +539,7 @@ static int gianfar_ptp_remove(struct platform_device *dev) > gfar_write(&etsects->regs->tmr_temask, 0); > gfar_write(&etsects->regs->tmr_ctrl, 0); > > + gfar_phc_clock = -1; > ptp_clock_unregister(etsects->clock); > iounmap(etsects->regs); > release_resource(etsects->rsrc); > -- > 1.7.2.5 > > -- > 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH V4 net-next 04/26] gianfar: Support the get_ts_info ethtool method. 2012-04-06 4:25 ` [PATCH V4 net-next 04/26] gianfar: " Paul Gortmaker @ 2012-04-06 4:35 ` David Miller 0 siblings, 0 replies; 5+ messages in thread From: David Miller @ 2012-04-06 4:35 UTC (permalink / raw) To: paul.gortmaker Cc: mporter, e1000-devel, netdev, jacob.e.keller, john.ronciak, bhutchings, linux-next From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Fri, 6 Apr 2012 00:25:32 -0400 > Needs an include of <linux/net_tstamp.h> ? I've pushed out that fix. ------------------------------------------------------------------------------ For Developers, A Lot Can Happen In A Second. Boundary is the first to Know...and Tell You. Monitor Your Applications in Ultra-Fine Resolution. Try it FREE! http://p.sf.net/sfu/Boundary-d2dvs2 _______________________________________________ E1000-devel mailing list E1000-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/e1000-devel To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-04-06 7:04 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1333529504.git.richardcochran@gmail.com>
[not found] ` <88e5b2cfcabda03826bb576b21e2e1d990f07117.1333529506.git.richardcochran@gmail.com>
2012-04-06 4:08 ` [PATCH V4 net-next 05/26] bfin_mac: Support the get_ts_info ethtool method Paul Gortmaker
2012-04-06 4:18 ` David Miller
2012-04-06 7:04 ` Richard Cochran
[not found] ` <c268d71203b066b9052a8cabd5f6c71de2a8fa77.1333529506.git.richardcochran@gmail.com>
2012-04-06 4:25 ` [PATCH V4 net-next 04/26] gianfar: " Paul Gortmaker
2012-04-06 4:35 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox