net: ti: am65-cpsw: move hw timestamping to ndo callback

Migrate driver to new API for HW timestamping.

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

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 110eb2da8dbc1d1d18e315f94f118f78349c1a11..d5f358ec982050751a63039e73887bf6e7f684e7 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -1788,28 +1788,28 @@ static int am65_cpsw_nuss_ndo_slave_set_mac_address(struct net_device *ndev,
 }
 
 static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev,
-                                      struct ifreq *ifr)
+                                      struct kernel_hwtstamp_config *cfg,
+                                      struct netlink_ext_ack *extack)
 {
        struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
        u32 ts_ctrl, seq_id, ts_ctrl_ltype2, ts_vlan_ltype;
-       struct hwtstamp_config cfg;
 
-       if (!IS_ENABLED(CONFIG_TI_K3_AM65_CPTS))
+       if (!IS_ENABLED(CONFIG_TI_K3_AM65_CPTS)) {
+               NL_SET_ERR_MSG(extack, "Time stamping is not supported");
                return -EOPNOTSUPP;
-
-       if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
-               return -EFAULT;
+       }
 
        /* TX HW timestamp */
-       switch (cfg.tx_type) {
+       switch (cfg->tx_type) {
        case HWTSTAMP_TX_OFF:
        case HWTSTAMP_TX_ON:
                break;
        default:
+               NL_SET_ERR_MSG(extack, "TX mode is not supported");
                return -ERANGE;
        }
 
-       switch (cfg.rx_filter) {
+       switch (cfg->rx_filter) {
        case HWTSTAMP_FILTER_NONE:
                port->rx_ts_enabled = false;
                break;
@@ -1826,17 +1826,19 @@ static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev,
        case HWTSTAMP_FILTER_PTP_V2_SYNC:
        case HWTSTAMP_FILTER_PTP_V2_DELAY_REQ:
                port->rx_ts_enabled = true;
-               cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT | HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
+               cfg->rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT | HWTSTAMP_FILTER_PTP_V1_L4_EVENT;
                break;
        case HWTSTAMP_FILTER_ALL:
        case HWTSTAMP_FILTER_SOME:
        case HWTSTAMP_FILTER_NTP_ALL:
+               NL_SET_ERR_MSG(extack, "RX filter is not supported");
                return -EOPNOTSUPP;
        default:
+               NL_SET_ERR_MSG(extack, "RX filter is not supported");
                return -ERANGE;
        }
 
-       port->tx_ts_enabled = (cfg.tx_type == HWTSTAMP_TX_ON);
+       port->tx_ts_enabled = (cfg->tx_type == HWTSTAMP_TX_ON);
 
        /* cfg TX timestamp */
        seq_id = (AM65_CPSW_TS_SEQ_ID_OFFSET <<
@@ -1872,25 +1874,24 @@ static int am65_cpsw_nuss_hwtstamp_set(struct net_device *ndev,
               AM65_CPSW_PORTN_REG_TS_CTL_LTYPE2);
        writel(ts_ctrl, port->port_base + AM65_CPSW_PORTN_REG_TS_CTL);
 
-       return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;
+       return 0;
 }
 
 static int am65_cpsw_nuss_hwtstamp_get(struct net_device *ndev,
-                                      struct ifreq *ifr)
+                                      struct kernel_hwtstamp_config *cfg)
 {
        struct am65_cpsw_port *port = am65_ndev_to_port(ndev);
-       struct hwtstamp_config cfg;
 
        if (!IS_ENABLED(CONFIG_TI_K3_AM65_CPTS))
                return -EOPNOTSUPP;
 
-       cfg.flags = 0;
-       cfg.tx_type = port->tx_ts_enabled ?
+       cfg->flags = 0;
+       cfg->tx_type = port->tx_ts_enabled ?
                      HWTSTAMP_TX_ON : HWTSTAMP_TX_OFF;
-       cfg.rx_filter = port->rx_ts_enabled ? HWTSTAMP_FILTER_PTP_V2_EVENT |
+       cfg->rx_filter = port->rx_ts_enabled ? HWTSTAMP_FILTER_PTP_V2_EVENT |
                        HWTSTAMP_FILTER_PTP_V1_L4_EVENT : HWTSTAMP_FILTER_NONE;
 
-       return copy_to_user(ifr->ifr_data, &cfg, sizeof(cfg)) ? -EFAULT : 0;
+       return 0;
 }
 
 static int am65_cpsw_nuss_ndo_slave_ioctl(struct net_device *ndev,
@@ -1901,13 +1902,6 @@ static int am65_cpsw_nuss_ndo_slave_ioctl(struct net_device *ndev,
        if (!netif_running(ndev))
                return -EINVAL;
 
-       switch (cmd) {
-       case SIOCSHWTSTAMP:
-               return am65_cpsw_nuss_hwtstamp_set(ndev, req);
-       case SIOCGHWTSTAMP:
-               return am65_cpsw_nuss_hwtstamp_get(ndev, req);
-       }
-
        return phylink_mii_ioctl(port->slave.phylink, req, cmd);
 }
 
@@ -1991,6 +1985,8 @@ static const struct net_device_ops am65_cpsw_nuss_netdev_ops = {
        .ndo_set_tx_maxrate     = am65_cpsw_qos_ndo_tx_p0_set_maxrate,
        .ndo_bpf                = am65_cpsw_ndo_bpf,
        .ndo_xdp_xmit           = am65_cpsw_ndo_xdp_xmit,
+       .ndo_hwtstamp_get       = am65_cpsw_nuss_hwtstamp_get,
+       .ndo_hwtstamp_set       = am65_cpsw_nuss_hwtstamp_set,
 };
 
 static void am65_cpsw_disable_phy(struct phy *phy)