* [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping
@ 2013-12-18 23:35 Vince Bridgers
2013-12-19 11:50 ` Giuseppe CAVALLARO
2013-12-22 23:46 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Vince Bridgers @ 2013-12-18 23:35 UTC (permalink / raw)
To: Giuseppe CAVALLARO, Rayagond K; +Cc: netdev
>From e9278f13a922433adbf3a81ef9d7823a99bd8d88 Mon Sep 17 00:00:00 2001
From: Vince Bridgers <vbridger2013@gmail.com>
Date: Wed, 18 Dec 2013 14:29:26 -0600
Subject: [PATCH 1/1] Fix release of incorrect spinlock in stmmac_ptp.c, and
masked configuration of control variable adv_ts
Two issues addressed with this patch:
1) The functions stmmac_adjust_freq and stmmac_adjust_time were
releasing the incorrect spinlock
at the end of the function - priv->lock instead of priv->ptp_lock.
2) Setting the control data variable priv->adv_ts according to
hardware capabilities was masked
by message level settings, so it was not being set correctly in the
case that the Synopsys
MAC only supported advanced timestamping.
Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20 +++++++++-----------
drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 ++--
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 8a7a23a..797b56a 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -622,17 +622,15 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
return -EOPNOTSUPP;
- if (netif_msg_hw(priv)) {
- if (priv->dma_cap.time_stamp) {
- pr_debug("IEEE 1588-2002 Time Stamp supported\n");
- priv->adv_ts = 0;
- }
- if (priv->dma_cap.atime_stamp && priv->extend_desc) {
- pr_debug
- ("IEEE 1588-2008 Advanced Time Stamp supported\n");
- priv->adv_ts = 1;
- }
- }
+ priv->adv_ts = 0;
+ if (priv->dma_cap.atime_stamp && priv->extend_desc)
+ priv->adv_ts = 1;
+
+ if (netif_msg_hw(priv) && priv->dma_cap.time_stamp)
+ pr_debug("IEEE 1588-2002 Time Stamp supported\n");
+
+ if (netif_msg_hw(priv) && priv->adv_ts)
+ pr_debug("IEEE 1588-2008 Advanced Time Stamp supported\n");
priv->hw->ptp = &stmmac_ptp;
priv->hwts_tx_en = 0;
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
index b8b0eee..7680581 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
@@ -56,7 +56,7 @@ static int stmmac_adjust_freq(struct ptp_clock_info
*ptp, s32 ppb)
priv->hw->ptp->config_addend(priv->ioaddr, addend);
- spin_unlock_irqrestore(&priv->lock, flags);
+ spin_unlock_irqrestore(&priv->ptp_lock, flags);
return 0;
}
@@ -91,7 +91,7 @@ static int stmmac_adjust_time(struct ptp_clock_info
*ptp, s64 delta)
priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj);
- spin_unlock_irqrestore(&priv->lock, flags);
+ spin_unlock_irqrestore(&priv->ptp_lock, flags);
return 0;
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping
2013-12-18 23:35 [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping Vince Bridgers
@ 2013-12-19 11:50 ` Giuseppe CAVALLARO
2013-12-22 23:46 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Giuseppe CAVALLARO @ 2013-12-19 11:50 UTC (permalink / raw)
To: Vince Bridgers, Rayagond K; +Cc: netdev
On 12/19/2013 12:35 AM, Vince Bridgers wrote:
> >From e9278f13a922433adbf3a81ef9d7823a99bd8d88 Mon Sep 17 00:00:00 2001
> From: Vince Bridgers <vbridger2013@gmail.com>
> Date: Wed, 18 Dec 2013 14:29:26 -0600
> Subject: [PATCH 1/1] Fix release of incorrect spinlock in
> stmmac_ptp.c, and
> masked configuration of control variable adv_ts
>
> Two issues addressed with this patch:
> 1) The functions stmmac_adjust_freq and stmmac_adjust_time were
> releasing the incorrect spinlock
> at the end of the function - priv->lock instead of priv->ptp_lock.
> 2) Setting the control data variable priv->adv_ts according to
> hardware capabilities was masked
> by message level settings, so it was not being set correctly in the
> case that the Synopsys
> MAC only supported advanced timestamping.
>
> Signed-off-by: Vince Bridgers <vbridgers2013@gmail.com>
Hello Vince
thanks for the patch that provides useful fixes. Pls can you check if it
applies
fine on net.git master branch? It failed on my side.
peppe
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 20
> +++++++++-----------
> drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 4 ++--
> 2 files changed, 11 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 8a7a23a..797b56a 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -622,17 +622,15 @@ static int stmmac_init_ptp(struct stmmac_priv *priv)
> if (!(priv->dma_cap.time_stamp || priv->dma_cap.atime_stamp))
> return -EOPNOTSUPP;
>
> - if (netif_msg_hw(priv)) {
> - if (priv->dma_cap.time_stamp) {
> - pr_debug("IEEE 1588-2002 Time Stamp supported\n");
> - priv->adv_ts = 0;
> - }
> - if (priv->dma_cap.atime_stamp && priv->extend_desc) {
> - pr_debug
> - ("IEEE 1588-2008 Advanced Time Stamp supported\n");
> - priv->adv_ts = 1;
> - }
> - }
> + priv->adv_ts = 0;
> + if (priv->dma_cap.atime_stamp && priv->extend_desc)
> + priv->adv_ts = 1;
> +
> + if (netif_msg_hw(priv) && priv->dma_cap.time_stamp)
> + pr_debug("IEEE 1588-2002 Time Stamp supported\n");
> +
> + if (netif_msg_hw(priv) && priv->adv_ts)
> + pr_debug("IEEE 1588-2008 Advanced Time Stamp supported\n");
>
> priv->hw->ptp = &stmmac_ptp;
> priv->hwts_tx_en = 0;
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
> index b8b0eee..7680581 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c
> @@ -56,7 +56,7 @@ static int stmmac_adjust_freq(struct ptp_clock_info
> *ptp, s32 ppb)
>
> priv->hw->ptp->config_addend(priv->ioaddr, addend);
>
> - spin_unlock_irqrestore(&priv->lock, flags);
> + spin_unlock_irqrestore(&priv->ptp_lock, flags);
>
> return 0;
> }
> @@ -91,7 +91,7 @@ static int stmmac_adjust_time(struct ptp_clock_info
> *ptp, s64 delta)
>
> priv->hw->ptp->adjust_systime(priv->ioaddr, sec, nsec, neg_adj);
>
> - spin_unlock_irqrestore(&priv->lock, flags);
> + spin_unlock_irqrestore(&priv->ptp_lock, flags);
>
> return 0;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping
2013-12-18 23:35 [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping Vince Bridgers
2013-12-19 11:50 ` Giuseppe CAVALLARO
@ 2013-12-22 23:46 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2013-12-22 23:46 UTC (permalink / raw)
To: vbridgers2013; +Cc: peppe.cavallaro, rayagond, netdev
Your patch and commit message have both been mangled horribly by
your email client.
Please read Documentation/SubmittingPatches to learn how to correct
this.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-22 23:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-18 23:35 [PATCH net] drivers : stmmac : Fixes for IEEE 1588 Timestamping Vince Bridgers
2013-12-19 11:50 ` Giuseppe CAVALLARO
2013-12-22 23:46 ` 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).