* [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value
@ 2020-04-09 9:48 Dirk Behme
2020-04-09 9:48 ` [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros Dirk Behme
2020-04-16 9:52 ` [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Sergei Shtylyov
0 siblings, 2 replies; 4+ messages in thread
From: Dirk Behme @ 2020-04-09 9:48 UTC (permalink / raw)
To: linux-renesas-soc, Sergei Shtylyov
Cc: geert+renesas, dirk.behme, Julia Lawall
In the function ravb_hwtstamp_get() in ravb_main.c with the existing
values for RAVB_RXTSTAMP_TYPE_V2_L2_EVENT (0x2) and RAVB_RXTSTAMP_TYPE_ALL
(0x6)
if (priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE_V2_L2_EVENT)
config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
else if (priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE_ALL)
config.rx_filter = HWTSTAMP_FILTER_ALL;
if the test on RAVB_RXTSTAMP_TYPE_ALL should be true, it will never
be reached. Correct this by changing RAVB_RXTSTAMP_TYPE_ALL to 0x4.
Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
Reported-by: Julia Lawall <julia.lawall@inria.fr>
Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
---
Changes in v2: Split fix and cleanup into two patches.
drivers/net/ethernet/renesas/ravb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 9f88b5db4f89..e921eae82022 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -41,7 +41,7 @@
#define RAVB_RXTSTAMP_VALID 0x00000001 /* RX timestamp valid */
#define RAVB_RXTSTAMP_TYPE 0x00000006 /* RX type mask */
#define RAVB_RXTSTAMP_TYPE_V2_L2_EVENT 0x00000002
-#define RAVB_RXTSTAMP_TYPE_ALL 0x00000006
+#define RAVB_RXTSTAMP_TYPE_ALL 0x00000004
#define RAVB_RXTSTAMP_ENABLED 0x00000010 /* Enable RX timestamping */
enum ravb_reg {
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros
2020-04-09 9:48 [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Dirk Behme
@ 2020-04-09 9:48 ` Dirk Behme
2020-04-16 9:55 ` Sergei Shtylyov
2020-04-16 9:52 ` [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Sergei Shtylyov
1 sibling, 1 reply; 4+ messages in thread
From: Dirk Behme @ 2020-04-09 9:48 UTC (permalink / raw)
To: linux-renesas-soc, Sergei Shtylyov; +Cc: geert+renesas, dirk.behme
These macros are unused, we can safely drop them.
Cleanup only, no functional change.
Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
---
Changes in v2: Split fix and cleanup into two patches.
drivers/net/ethernet/renesas/ravb.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index e921eae82022..5a05b74a6fe6 100644
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -35,10 +35,8 @@
#define RAVB_ALIGN 128
/* Hardware time stamp */
-#define RAVB_TXTSTAMP_VALID 0x00000001 /* TX timestamp valid */
#define RAVB_TXTSTAMP_ENABLED 0x00000010 /* Enable TX timestamping */
-#define RAVB_RXTSTAMP_VALID 0x00000001 /* RX timestamp valid */
#define RAVB_RXTSTAMP_TYPE 0x00000006 /* RX type mask */
#define RAVB_RXTSTAMP_TYPE_V2_L2_EVENT 0x00000002
#define RAVB_RXTSTAMP_TYPE_ALL 0x00000004
--
2.20.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value
2020-04-09 9:48 [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Dirk Behme
2020-04-09 9:48 ` [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros Dirk Behme
@ 2020-04-16 9:52 ` Sergei Shtylyov
1 sibling, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2020-04-16 9:52 UTC (permalink / raw)
To: Dirk Behme, linux-renesas-soc; +Cc: geert+renesas, Julia Lawall
Hello!
On 09.04.2020 12:48, Dirk Behme wrote:
> In the function ravb_hwtstamp_get() in ravb_main.c with the existing
> values for RAVB_RXTSTAMP_TYPE_V2_L2_EVENT (0x2) and RAVB_RXTSTAMP_TYPE_ALL
> (0x6)
>
> if (priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE_V2_L2_EVENT)
> config.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
> else if (priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE_ALL)
> config.rx_filter = HWTSTAMP_FILTER_ALL;
>
> if the test on RAVB_RXTSTAMP_TYPE_ALL should be true, it will never
> be reached. Correct this by changing RAVB_RXTSTAMP_TYPE_ALL to 0x4.
>
> Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
> Reported-by: Julia Lawall <julia.lawall@inria.fr>
> Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Almost forgot about these patches... :-/
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros
2020-04-09 9:48 ` [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros Dirk Behme
@ 2020-04-16 9:55 ` Sergei Shtylyov
0 siblings, 0 replies; 4+ messages in thread
From: Sergei Shtylyov @ 2020-04-16 9:55 UTC (permalink / raw)
To: Dirk Behme, linux-renesas-soc; +Cc: geert+renesas
On 09.04.2020 12:48, Dirk Behme wrote:
> These macros are unused, we can safely drop them.
>
> Cleanup only, no functional change.
>
> Suggested-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> Signed-off-by: Dirk Behme <dirk.behme@de.bosch.com>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> ---
> Changes in v2: Split fix and cleanup into two patches.
Don't mix fixes and cleanups in the same series, especially in the
networking area -- the fixes are merged to the net.git repo and cleanups are
merged to the net-next.git repo...
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-04-16 9:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-09 9:48 [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Dirk Behme
2020-04-09 9:48 ` [PATCH v2 2/2] ravb: Drop unused RAVB_{R,T}XTSTAMP_VALID macros Dirk Behme
2020-04-16 9:55 ` Sergei Shtylyov
2020-04-16 9:52 ` [PATCH v2 1/2] ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value Sergei Shtylyov
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).