| Message ID | 20200409061509.13385-1-dirk.behme@de.bosch.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | ravb: Fix RAVB_RXTSTAMP_TYPE_ALL value | expand |
Hello! On 09.04.2020 9:15, 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. > > While at it, drop two unused macros. Don't do 2 things in 1 patch, especially when you're doing a fix and the other thing is a cleanup. > 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> [...] MBR, Sergei
diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h index 9f88b5db4f89..5a05b74a6fe6 100644 --- a/drivers/net/ethernet/renesas/ravb.h +++ b/drivers/net/ethernet/renesas/ravb.h @@ -35,13 +35,11 @@ #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 0x00000006 +#define RAVB_RXTSTAMP_TYPE_ALL 0x00000004 #define RAVB_RXTSTAMP_ENABLED 0x00000010 /* Enable RX timestamping */ enum ravb_reg {
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. While at it, drop two unused macros. 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> --- drivers/net/ethernet/renesas/ravb.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)