| Message ID | 1367255287-2664-1-git-send-email-fbl@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 04/29/2013 10:08 AM, Flavio Leitner wrote: > Current tg3 shows hardware timestamping support for all devices > when that is true only for the hardware with PTP_CAPABLE flag > present. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> > --- > drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index ac83c87..ef0b8a6 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) > > 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; > + SOF_TIMESTAMPING_SOFTWARE; > + > + if (tg3_flag(tp, PTP_CAPABLE)) { > + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + } > > if (tp->ptp_clock) > info->phc_index = ptp_clock_index(tp->ptp_clock); > Thanks Flavio. Acked-by: Nithin Nayak Sujir <nsujir@broadcom.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
From: Flavio Leitner <fbl@redhat.com> Date: Mon, 29 Apr 2013 14:08:07 -0300 > Current tg3 shows hardware timestamping support for all devices > when that is true only for the hardware with PTP_CAPABLE flag > present. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> Applied. -- 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 Mon, 29 Apr 2013 14:08:07 -0300, Flavio Leitner wrote: > Current tg3 shows hardware timestamping support for all devices > when that is true only for the hardware with PTP_CAPABLE flag > present. > > Signed-off-by: Flavio Leitner <fbl@redhat.com> > --- > drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index ac83c87..ef0b8a6 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) > > 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; > + SOF_TIMESTAMPING_SOFTWARE; > + > + if (tg3_flag(tp, PTP_CAPABLE)) { > + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | ^^^^ You need |= here. > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + } > > if (tp->ptp_clock) > info->phc_index = ptp_clock_index(tp->ptp_clock); Jiri
On Tue, Apr 30, 2013 at 10:50:15AM +0200, Jiri Benc wrote: > On Mon, 29 Apr 2013 14:08:07 -0300, Flavio Leitner wrote: > > Current tg3 shows hardware timestamping support for all devices > > when that is true only for the hardware with PTP_CAPABLE flag > > present. > > > > Signed-off-by: Flavio Leitner <fbl@redhat.com> > > --- > > drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > > index ac83c87..ef0b8a6 100644 > > --- a/drivers/net/ethernet/broadcom/tg3.c > > +++ b/drivers/net/ethernet/broadcom/tg3.c > > @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) > > > > 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; > > + SOF_TIMESTAMPING_SOFTWARE; > > + > > + if (tg3_flag(tp, PTP_CAPABLE)) { > > + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | > ^^^^ > You need |= here. Of course, I will send a follow up patch. Thanks for reviewing it.
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index ac83c87..ef0b8a6 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) 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; + SOF_TIMESTAMPING_SOFTWARE; + + if (tg3_flag(tp, PTP_CAPABLE)) { + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RAW_HARDWARE; + } if (tp->ptp_clock) info->phc_index = ptp_clock_index(tp->ptp_clock);
Current tg3 shows hardware timestamping support for all devices when that is true only for the hardware with PTP_CAPABLE flag present. Signed-off-by: Flavio Leitner <fbl@redhat.com> --- drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)