net/ice: support 1PPS

[dpdk.git] / drivers / net / octeontx2 / otx2_ethdev_ops.c

diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 963cc28..552e6bd 100644 (file)
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -17,7 +17,8 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
        struct nix_frs_cfg *req;
        int rc;
 
-       frame_size += NIX_TIMESYNC_RX_OFFSET * otx2_ethdev_is_ptp_en(dev);
+       if (dev->configured && otx2_ethdev_is_ptp_en(dev))
+               frame_size += NIX_TIMESYNC_RX_OFFSET;
 
        /* Check if MTU is within the allowed range */
        if (frame_size < NIX_MIN_FRS || frame_size > NIX_MAX_FRS)
@@ -453,7 +454,7 @@ otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
        rc = strlcpy(fw_version, (char *)dev->mkex_pfl_name, rc);
 
        rc += 1; /* Add the size of '\0' */
-       if (fw_size < (uint32_t)rc)
+       if (fw_size < (size_t)rc)
                return rc;
 
        return 0;
@@ -471,24 +472,11 @@ otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool)
 }
 
 int
-otx2_nix_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
-                        enum rte_filter_type filter_type,
-                        enum rte_filter_op filter_op, void *arg)
+otx2_nix_dev_flow_ops_get(struct rte_eth_dev *eth_dev __rte_unused,
+                         const struct rte_flow_ops **ops)
 {
-       RTE_SET_USED(eth_dev);
-
-       if (filter_type != RTE_ETH_FILTER_GENERIC) {
-               otx2_err("Unsupported filter type %d", filter_type);
-               return -ENOTSUP;
-       }
-
-       if (filter_op == RTE_ETH_FILTER_GET) {
-               *(const void **)arg = &otx2_flow_ops;
-               return 0;
-       }
-
-       otx2_err("Invalid filter_op %d", filter_op);
-       return -EINVAL;
+       *ops = &otx2_flow_ops;
+       return 0;
 }
 
 static struct cgx_fw_data *
@@ -533,8 +521,7 @@ otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
        struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
        struct cgx_fw_data *rsp;
 
-       if (!info->data || !info->length ||
-           (info->offset + info->length > SFP_EEPROM_SIZE))
+       if (info->offset + info->length > SFP_EEPROM_SIZE)
                return -EINVAL;
 
        rsp = nix_get_fwdata(dev);
@@ -561,6 +548,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)
        devinfo->max_vfs = pci_dev->max_vfs;
        devinfo->max_mtu = devinfo->max_rx_pktlen - NIX_L2_OVERHEAD;
        devinfo->min_mtu = devinfo->min_rx_bufsize - NIX_L2_OVERHEAD;
+       if (dev->configured && otx2_ethdev_is_ptp_en(dev)) {
+               devinfo->max_mtu -=  NIX_TIMESYNC_RX_OFFSET;
+               devinfo->min_mtu -=  NIX_TIMESYNC_RX_OFFSET;
+               devinfo->max_rx_pktlen -= NIX_TIMESYNC_RX_OFFSET;
+       }
 
        devinfo->rx_offload_capa = dev->rx_offload_capa;
        devinfo->tx_offload_capa = dev->tx_offload_capa;