cxgb4: convert to ndo_hwtstamp API

Convert to use .ndo_hwtstamp_get()/.ndo_hwtstamp_set() callbacks.

There is some change in the logic as well. Previously, the driver was
storing newly requested configuration regardless of whether it was
applied or not. In case of request validation error, inconsistent
configuration would be returned by the driver. New logic stores
configuration only if was properly validated and applied. It brings the
consistency between reported and actual configuration.

Signed-off-by: Vadim Fedorenko <vadim.fedorenko@linux.dev>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Link: https://patch.msgid.link/20251016152515.3510991-6-vadim.fedorenko@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 0d85198fb03dfba036e55a0b89741e0c00a1b46b..f20f4bc58492b5c3b82f982465c6891a75c5a4b1 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -674,7 +674,7 @@ struct port_info {
        struct cxgb_fcoe fcoe;
 #endif /* CONFIG_CHELSIO_T4_FCOE */
        bool rxtstamp;  /* Enable TS */
-       struct hwtstamp_config tstamp_config;
+       struct kernel_hwtstamp_config tstamp_config;
        bool ptp_enable;
        struct sched_table *sched_tbl;
        u32 eth_flags;

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 392723ef14e5124011115afa4a2c04d4610a2c41..7e2283c95b97d2dda6238a70bdb5c512f9ee53dd 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -3042,12 +3042,87 @@ static void cxgb_get_stats(struct net_device *dev,
                ns->rx_length_errors + stats.rx_len_err + ns->rx_fifo_errors;
 }
 
+static int cxgb_hwtstamp_get(struct net_device *dev,
+                            struct kernel_hwtstamp_config *config)
+{
+       struct port_info *pi = netdev_priv(dev);
+
+       *config = pi->tstamp_config;
+       return 0;
+}
+
+static int cxgb_hwtstamp_set(struct net_device *dev,
+                            struct kernel_hwtstamp_config *config,
+                            struct netlink_ext_ack *extack)
+{
+       struct port_info *pi = netdev_priv(dev);
+       struct adapter *adapter = pi->adapter;
+
+       if (is_t4(adapter->params.chip)) {
+               /* For T4 Adapters */
+               switch (config->rx_filter) {
+               case HWTSTAMP_FILTER_NONE:
+                       pi->rxtstamp = false;
+                       break;
+               case HWTSTAMP_FILTER_ALL:
+                       pi->rxtstamp = true;
+                       break;
+               default:
+                       return -ERANGE;
+               }
+               pi->tstamp_config = *config;
+               return 0;
+       }
+
+       switch (config->tx_type) {
+       case HWTSTAMP_TX_OFF:
+       case HWTSTAMP_TX_ON:
+               break;
+       default:
+               return -ERANGE;
+       }
+
+       switch (config->rx_filter) {
+       case HWTSTAMP_FILTER_NONE:
+               pi->rxtstamp = false;
+               break;
+       case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
+       case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+               cxgb4_ptprx_timestamping(pi, pi->port_id, PTP_TS_L4);
+               break;
+       case HWTSTAMP_FILTER_PTP_V2_EVENT:
+               cxgb4_ptprx_timestamping(pi, pi->port_id, PTP_TS_L2_L4);
+               break;
+       case HWTSTAMP_FILTER_ALL:
+       case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
+       case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
+       case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
+       case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
+               pi->rxtstamp = true;
+               break;
+       default:
+               return -ERANGE;
+       }
+
+       if (config->tx_type == HWTSTAMP_TX_OFF &&
+           config->rx_filter == HWTSTAMP_FILTER_NONE) {
+               if (cxgb4_ptp_txtype(adapter, pi->port_id) >= 0)
+                       pi->ptp_enable = false;
+       }
+
+       if (config->rx_filter != HWTSTAMP_FILTER_NONE) {
+               if (cxgb4_ptp_redirect_rx_packet(adapter, pi) >= 0)
+                       pi->ptp_enable = true;
+       }
+       pi->tstamp_config = *config;
+       return 0;
+}
+
 static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
 {
        unsigned int mbox;
        int ret = 0, prtad, devad;
        struct port_info *pi = netdev_priv(dev);
-       struct adapter *adapter = pi->adapter;
        struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data;
 
        switch (cmd) {
@@ -3076,81 +3151,6 @@ static int cxgb_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
                        ret = t4_mdio_wr(pi->adapter, mbox, prtad, devad,
                                         data->reg_num, data->val_in);
                break;
-       case SIOCGHWTSTAMP:
-               return copy_to_user(req->ifr_data, &pi->tstamp_config,
-                                   sizeof(pi->tstamp_config)) ?
-                       -EFAULT : 0;
-       case SIOCSHWTSTAMP:
-               if (copy_from_user(&pi->tstamp_config, req->ifr_data,
-                                  sizeof(pi->tstamp_config)))
-                       return -EFAULT;
-
-               if (!is_t4(adapter->params.chip)) {
-                       switch (pi->tstamp_config.tx_type) {
-                       case HWTSTAMP_TX_OFF:
-                       case HWTSTAMP_TX_ON:
-                               break;
-                       default:
-                               return -ERANGE;
-                       }
-
-                       switch (pi->tstamp_config.rx_filter) {
-                       case HWTSTAMP_FILTER_NONE:
-                               pi->rxtstamp = false;
-                               break;
-                       case HWTSTAMP_FILTER_PTP_V1_L4_EVENT:
-                       case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
-                               cxgb4_ptprx_timestamping(pi, pi->port_id,
-                                                        PTP_TS_L4);
-                               break;
-                       case HWTSTAMP_FILTER_PTP_V2_EVENT:
-                               cxgb4_ptprx_timestamping(pi, pi->port_id,
-                                                        PTP_TS_L2_L4);
-                               break;
-                       case HWTSTAMP_FILTER_ALL:
-                       case HWTSTAMP_FILTER_PTP_V1_L4_SYNC:
-                       case HWTSTAMP_FILTER_PTP_V1_L4_DELAY_REQ:
-                       case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
-                       case HWTSTAMP_FILTER_PTP_V2_L4_DELAY_REQ:
-                               pi->rxtstamp = true;
-                               break;
-                       default:
-                               pi->tstamp_config.rx_filter =
-                                       HWTSTAMP_FILTER_NONE;
-                               return -ERANGE;
-                       }
-
-                       if ((pi->tstamp_config.tx_type == HWTSTAMP_TX_OFF) &&
-                           (pi->tstamp_config.rx_filter ==
-                               HWTSTAMP_FILTER_NONE)) {
-                               if (cxgb4_ptp_txtype(adapter, pi->port_id) >= 0)
-                                       pi->ptp_enable = false;
-                       }
-
-                       if (pi->tstamp_config.rx_filter !=
-                               HWTSTAMP_FILTER_NONE) {
-                               if (cxgb4_ptp_redirect_rx_packet(adapter,
-                                                                pi) >= 0)
-                                       pi->ptp_enable = true;
-                       }
-               } else {
-                       /* For T4 Adapters */
-                       switch (pi->tstamp_config.rx_filter) {
-                       case HWTSTAMP_FILTER_NONE:
-                       pi->rxtstamp = false;
-                       break;
-                       case HWTSTAMP_FILTER_ALL:
-                       pi->rxtstamp = true;
-                       break;
-                       default:
-                       pi->tstamp_config.rx_filter =
-                       HWTSTAMP_FILTER_NONE;
-                       return -ERANGE;
-                       }
-               }
-               return copy_to_user(req->ifr_data, &pi->tstamp_config,
-                                   sizeof(pi->tstamp_config)) ?
-                       -EFAULT : 0;
        default:
                return -EOPNOTSUPP;
        }
@@ -3875,6 +3875,8 @@ static const struct net_device_ops cxgb4_netdev_ops = {
        .ndo_setup_tc         = cxgb_setup_tc,
        .ndo_features_check   = cxgb_features_check,
        .ndo_fix_features     = cxgb_fix_features,
+       .ndo_hwtstamp_get     = cxgb_hwtstamp_get,
+       .ndo_hwtstamp_set     = cxgb_hwtstamp_set,
 };
 
 #ifdef CONFIG_PCI_IOV