* [0/1] stmmac: Correctly report PTP capabilities.
@ 2015-10-30 8:43 Phil Reid
2015-10-30 8:43 ` [1/1] " Phil Reid
0 siblings, 1 reply; 4+ messages in thread
From: Phil Reid @ 2015-10-30 8:43 UTC (permalink / raw)
To: peppe.cavallaro, netdev; +Cc: Phil Reid
Phil Reid (1):
stmmac: Correctly report PTP capabilities.
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--
1.8.3.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [1/1] stmmac: Correctly report PTP capabilities.
2015-10-30 8:43 [0/1] stmmac: Correctly report PTP capabilities Phil Reid
@ 2015-10-30 8:43 ` Phil Reid
2015-10-30 10:22 ` Richard Cochran
2015-11-01 22:06 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Phil Reid @ 2015-10-30 8:43 UTC (permalink / raw)
To: peppe.cavallaro, netdev; +Cc: Phil Reid
priv->hwts_*_en indicate if timestamping is enabled/disabled at run
time. But priv->dma_cap.time_stamp and priv->dma_cap.atime_stamp
indicates HW is support for PTPv1/PTPv2.
Signed-off-by: Phil Reid <preid@electromag.com.au>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index 771cda2..2e51b81 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -721,10 +721,13 @@ static int stmmac_get_ts_info(struct net_device *dev,
{
struct stmmac_priv *priv = netdev_priv(dev);
- if ((priv->hwts_tx_en) && (priv->hwts_rx_en)) {
+ if ((priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp)) {
- info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+ info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE |
+ SOF_TIMESTAMPING_TX_HARDWARE |
+ SOF_TIMESTAMPING_RX_SOFTWARE |
SOF_TIMESTAMPING_RX_HARDWARE |
+ SOF_TIMESTAMPING_SOFTWARE |
SOF_TIMESTAMPING_RAW_HARDWARE;
if (priv->ptp_clock)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [1/1] stmmac: Correctly report PTP capabilities.
2015-10-30 8:43 ` [1/1] " Phil Reid
@ 2015-10-30 10:22 ` Richard Cochran
2015-11-01 22:06 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Richard Cochran @ 2015-10-30 10:22 UTC (permalink / raw)
To: Phil Reid; +Cc: peppe.cavallaro, netdev
On Fri, Oct 30, 2015 at 04:43:55PM +0800, Phil Reid wrote:
> priv->hwts_*_en indicate if timestamping is enabled/disabled at run
> time. But priv->dma_cap.time_stamp and priv->dma_cap.atime_stamp
> indicates HW is support for PTPv1/PTPv2.
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
Thanks for catching this bug.
Acked-by: Richard Cochran <richardcochran@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [1/1] stmmac: Correctly report PTP capabilities.
2015-10-30 8:43 ` [1/1] " Phil Reid
2015-10-30 10:22 ` Richard Cochran
@ 2015-11-01 22:06 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2015-11-01 22:06 UTC (permalink / raw)
To: preid; +Cc: peppe.cavallaro, netdev
From: Phil Reid <preid@electromag.com.au>
Date: Fri, 30 Oct 2015 16:43:55 +0800
> priv->hwts_*_en indicate if timestamping is enabled/disabled at run
> time. But priv->dma_cap.time_stamp and priv->dma_cap.atime_stamp
> indicates HW is support for PTPv1/PTPv2.
>
> Signed-off-by: Phil Reid <preid@electromag.com.au>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-01 22:06 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-30 8:43 [0/1] stmmac: Correctly report PTP capabilities Phil Reid
2015-10-30 8:43 ` [1/1] " Phil Reid
2015-10-30 10:22 ` Richard Cochran
2015-11-01 22:06 ` 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).