net: ravb: Use common defines for time stamping control

Instead of translating to/from driver specific flags for packet time
stamp control use the common flags directly. This simplifies the driver
as the translating code can be removed while at the same time making it
clear the flags are not flags written to hardware registers.

The change from a device specific bit-field track variable to the common
enum datatypes forces us to touch the ravb_rx_rcar_hwstamp() in a non
trivial way. To make this cleaner and easier to understand expand the
nested conditions.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://patch.msgid.link/20251104222420.882731-8-niklas.soderlund+renesas@ragnatech.se
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index d65cd83ddd16338a44a7e58608a2e90c9bc1fcac..5e56ec9b1013ab83af6129e2cc14d8c8b47338d4 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -35,16 +35,6 @@
 /* Driver's parameters */
 #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_ENABLED  0x00000010      /* Enable RX timestamping */
-
 enum ravb_reg {
        /* AVB-DMAC registers */
        CCC     = 0x0000,
@@ -1114,8 +1104,8 @@ struct ravb_private {
        u32 rx_over_errors;
        u32 rx_fifo_errors;
        struct net_device_stats stats[NUM_RX_QUEUE];
-       u32 tstamp_tx_ctrl;
-       u32 tstamp_rx_ctrl;
+       enum hwtstamp_tx_types tstamp_tx_ctrl;
+       enum hwtstamp_rx_filters tstamp_rx_ctrl;
        struct list_head ts_skb_list;
        u32 ts_skb_tag;
        struct ravb_ptp ptp;

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 5477bb5c69ae60475d26681283e0907664f87d67..1680e94b92425e22f7fb67a4218231b0b4127aa2 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -950,13 +950,14 @@ static void ravb_rx_rcar_hwstamp(struct ravb_private *priv, int q,
                                 struct ravb_ex_rx_desc *desc,
                                 struct sk_buff *skb)
 {
-       u32 get_ts = priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE;
        struct skb_shared_hwtstamps *shhwtstamps;
        struct timespec64 ts;
+       bool get_ts;
 
-       get_ts &= (q == RAVB_NC) ?
-               RAVB_RXTSTAMP_TYPE_V2_L2_EVENT :
-               ~RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;
+       if (q == RAVB_NC)
+               get_ts = priv->tstamp_rx_ctrl == HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
+       else
+               get_ts = priv->tstamp_rx_ctrl != HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
 
        if (!get_ts)
                return;
@@ -2424,18 +2425,8 @@ static int ravb_hwtstamp_get(struct net_device *ndev,
        struct ravb_private *priv = netdev_priv(ndev);
 
        config->flags = 0;
-       config->tx_type = priv->tstamp_tx_ctrl ? HWTSTAMP_TX_ON :
-                                                HWTSTAMP_TX_OFF;
-       switch (priv->tstamp_rx_ctrl & RAVB_RXTSTAMP_TYPE) {
-       case RAVB_RXTSTAMP_TYPE_V2_L2_EVENT:
-               config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
-               break;
-       case RAVB_RXTSTAMP_TYPE_ALL:
-               config->rx_filter = HWTSTAMP_FILTER_ALL;
-               break;
-       default:
-               config->rx_filter = HWTSTAMP_FILTER_NONE;
-       }
+       config->tx_type = priv->tstamp_tx_ctrl;
+       config->rx_filter = priv->tstamp_rx_ctrl;
 
        return 0;
 }
@@ -2446,15 +2437,13 @@ static int ravb_hwtstamp_set(struct net_device *ndev,
                             struct netlink_ext_ack *extack)
 {
        struct ravb_private *priv = netdev_priv(ndev);
-       u32 tstamp_rx_ctrl = RAVB_RXTSTAMP_ENABLED;
-       u32 tstamp_tx_ctrl;
+       enum hwtstamp_rx_filters tstamp_rx_ctrl;
+       enum hwtstamp_tx_types tstamp_tx_ctrl;
 
        switch (config->tx_type) {
        case HWTSTAMP_TX_OFF:
-               tstamp_tx_ctrl = 0;
-               break;
        case HWTSTAMP_TX_ON:
-               tstamp_tx_ctrl = RAVB_TXTSTAMP_ENABLED;
+               tstamp_tx_ctrl = config->tx_type;
                break;
        default:
                return -ERANGE;
@@ -2462,14 +2451,12 @@ static int ravb_hwtstamp_set(struct net_device *ndev,
 
        switch (config->rx_filter) {
        case HWTSTAMP_FILTER_NONE:
-               tstamp_rx_ctrl = 0;
-               break;
        case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
-               tstamp_rx_ctrl |= RAVB_RXTSTAMP_TYPE_V2_L2_EVENT;
+               tstamp_rx_ctrl = config->rx_filter;
                break;
        default:
                config->rx_filter = HWTSTAMP_FILTER_ALL;
-               tstamp_rx_ctrl |= RAVB_RXTSTAMP_TYPE_ALL;
+               tstamp_rx_ctrl = HWTSTAMP_FILTER_ALL;
        }
 
        priv->tstamp_tx_ctrl = tstamp_tx_ctrl;