net: rtsn: 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.

One thing to note is that the bit-wise and check in rtsn_rx() of
RCAR_GEN4_RXTSTAMP_TYPE_V2_L2_EVENT is replaced with a not set check of
HWTSTAMP_FILTER_NONE. This is okay as the bit of device specific event
replaced was set for all modes except HWTSTAMP_FILTER_NONE.

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

diff --git a/drivers/net/ethernet/renesas/rtsn.c b/drivers/net/ethernet/renesas/rtsn.c
index 958c198084728aae47d7f340f323bcaf9f970b0d..fdb1e7b7fb066d37023e51c4144571855c5f8bd5 100644 (file)
--- a/drivers/net/ethernet/renesas/rtsn.c
+++ b/drivers/net/ethernet/renesas/rtsn.c
@@ -165,8 +165,7 @@ static int rtsn_rx(struct net_device *ndev, int budget)
        unsigned int i;
        bool get_ts;
 
-       get_ts = priv->tstamp_rx_ctrl &
-               RCAR_GEN4_RXTSTAMP_TYPE_V2_L2_EVENT;
+       get_ts = priv->tstamp_rx_ctrl != HWTSTAMP_FILTER_NONE;
 
        ndescriptors = priv->dirty_rx + priv->num_rx_ring - priv->cur_rx;
        rx_packets = 0;
@@ -1133,21 +1132,8 @@ static int rtsn_hwtstamp_get(struct net_device *ndev,
        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 & RCAR_GEN4_RXTSTAMP_TYPE) {
-       case RCAR_GEN4_RXTSTAMP_TYPE_V2_L2_EVENT:
-               config->rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;
-               break;
-       case RCAR_GEN4_RXTSTAMP_TYPE_ALL:
-               config->rx_filter = HWTSTAMP_FILTER_ALL;
-               break;
-       default:
-               config->rx_filter = HWTSTAMP_FILTER_NONE;
-               break;
-       }
+       config->tx_type = priv->tstamp_tx_ctrl;
+       config->rx_filter = priv->tstamp_rx_ctrl;
 
        return 0;
 }
@@ -1156,9 +1142,9 @@ static int rtsn_hwtstamp_set(struct net_device *ndev,
                             struct kernel_hwtstamp_config *config,
                             struct netlink_ext_ack *extack)
 {
+       enum hwtstamp_rx_filters tstamp_rx_ctrl;
+       enum hwtstamp_tx_types tstamp_tx_ctrl;
        struct rtsn_private *priv;
-       u32 tstamp_rx_ctrl;
-       u32 tstamp_tx_ctrl;
 
        if (!netif_running(ndev))
                return -ENODEV;
@@ -1170,10 +1156,8 @@ static int rtsn_hwtstamp_set(struct net_device *ndev,
 
        switch (config->tx_type) {
        case HWTSTAMP_TX_OFF:
-               tstamp_tx_ctrl = 0;
-               break;
        case HWTSTAMP_TX_ON:
-               tstamp_tx_ctrl = RCAR_GEN4_TXTSTAMP_ENABLED;
+               tstamp_tx_ctrl = config->tx_type;
                break;
        default:
                return -ERANGE;
@@ -1181,16 +1165,12 @@ static int rtsn_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 = RCAR_GEN4_RXTSTAMP_ENABLED |
-                       RCAR_GEN4_RXTSTAMP_TYPE_V2_L2_EVENT;
+               tstamp_rx_ctrl = config->rx_filter;
                break;
        default:
                config->rx_filter = HWTSTAMP_FILTER_ALL;
-               tstamp_rx_ctrl = RCAR_GEN4_RXTSTAMP_ENABLED |
-                       RCAR_GEN4_RXTSTAMP_TYPE_ALL;
+               tstamp_rx_ctrl = HWTSTAMP_FILTER_ALL;
                break;
        }