net/dpaa: fix getting link status
[dpdk.git] / drivers / net / mlx5 / linux / mlx5_os.c
index 917d6be..2dc0797 100644 (file)
@@ -16,8 +16,8 @@
 #include <fcntl.h>
 
 #include <rte_malloc.h>
-#include <rte_ethdev_driver.h>
-#include <rte_ethdev_pci.h>
+#include <ethdev_driver.h>
+#include <ethdev_pci.h>
 #include <rte_pci.h>
 #include <rte_bus_pci.h>
 #include <rte_common.h>
@@ -116,7 +116,12 @@ mlx5_os_get_dev_attr(void *ctx, struct mlx5_dev_attr *device_attr)
        device_attr->max_qp_wr = attr_ex.orig_attr.max_qp_wr;
        device_attr->max_sge = attr_ex.orig_attr.max_sge;
        device_attr->max_cq = attr_ex.orig_attr.max_cq;
+       device_attr->max_cqe = attr_ex.orig_attr.max_cqe;
+       device_attr->max_mr = attr_ex.orig_attr.max_mr;
+       device_attr->max_pd = attr_ex.orig_attr.max_pd;
        device_attr->max_qp = attr_ex.orig_attr.max_qp;
+       device_attr->max_srq = attr_ex.orig_attr.max_srq;
+       device_attr->max_srq_wr = attr_ex.orig_attr.max_srq_wr;
        device_attr->raw_packet_caps = attr_ex.raw_packet_caps;
        device_attr->max_rwq_indirection_table_size =
                attr_ex.rss_caps.max_rwq_indirection_table_size;
@@ -671,8 +676,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
        int err = 0;
        unsigned int hw_padding = 0;
        unsigned int mps;
-       unsigned int cqe_comp;
-       unsigned int cqe_pad = 0;
        unsigned int tunnel_en = 0;
        unsigned int mpls_en = 0;
        unsigned int swp = 0;
@@ -752,7 +755,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
                                rte_eth_devices[priv->sh->bond_dev].device;
                else
                        eth_dev->device = dpdk_dev;
-               eth_dev->dev_ops = &mlx5_os_dev_sec_ops;
+               eth_dev->dev_ops = &mlx5_dev_sec_ops;
                eth_dev->rx_descriptor_status = mlx5_rx_descriptor_status;
                eth_dev->tx_descriptor_status = mlx5_tx_descriptor_status;
                err = mlx5_proc_priv_init(eth_dev);
@@ -864,17 +867,8 @@ err_secondary:
                        mprq_caps.max_single_wqe_log_num_of_strides;
        }
 #endif
-       if (RTE_CACHE_LINE_SIZE == 128 &&
-           !(dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP))
-               cqe_comp = 0;
-       else
-               cqe_comp = 1;
-       config->cqe_comp = cqe_comp;
-#ifdef HAVE_IBV_MLX5_MOD_CQE_128B_PAD
-       /* Whether device supports 128B Rx CQE padding. */
-       cqe_pad = RTE_CACHE_LINE_SIZE == 128 &&
-                 (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_PAD);
-#endif
+       /* Rx CQE compression is enabled by default. */
+       config->cqe_comp = 1;
 #ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
        if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
                tunnel_en = ((dv_attr.tunnel_offloads_caps &
@@ -931,8 +925,6 @@ err_secondary:
        priv->dev_port = spawn->phys_port;
        priv->pci_dev = spawn->pci_dev;
        priv->mtu = RTE_ETHER_MTU;
-       priv->mp_id.port_id = port_id;
-       strlcpy(priv->mp_id.name, MLX5_MP_NAME, RTE_MP_MAX_NAME_LEN);
        /* Some internal functions rely on Netlink sockets, open them now. */
        priv->nl_socket_rdma = mlx5_nl_init(NETLINK_RDMA);
        priv->nl_socket_route = mlx5_nl_init(NETLINK_ROUTE);
@@ -1107,16 +1099,6 @@ err_secondary:
                config->mps == MLX5_MPW_ENHANCED ? "enhanced " :
                config->mps == MLX5_MPW ? "legacy " : "",
                config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
-       if (config->cqe_comp && !cqe_comp) {
-               DRV_LOG(WARNING, "Rx CQE compression isn't supported");
-               config->cqe_comp = 0;
-       }
-       if (config->cqe_pad && !cqe_pad) {
-               DRV_LOG(WARNING, "Rx CQE padding isn't supported");
-               config->cqe_pad = 0;
-       } else if (config->cqe_pad) {
-               DRV_LOG(INFO, "Rx CQE padding is enabled");
-       }
        if (config->devx) {
                err = mlx5_devx_cmd_query_hca_attr(sh->ctx, &config->hca_attr);
                if (err) {
@@ -1154,7 +1136,7 @@ err_secondary:
                }
 #if defined(HAVE_MLX5DV_DR) && defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER)
                if (config->hca_attr.qos.sup &&
-                   config->hca_attr.qos.srtcm_sup &&
+                   config->hca_attr.qos.flow_meter_old &&
                    config->dv_flow_en) {
                        uint8_t reg_c_mask =
                                config->hca_attr.qos.flow_meter_reg_c_ids;
@@ -1182,7 +1164,7 @@ err_secondary:
                                                              - 1 + REG_C_0;
                                priv->mtr_en = 1;
                                priv->mtr_reg_share =
-                                     config->hca_attr.qos.flow_meter_reg_share;
+                                     config->hca_attr.qos.flow_meter;
                                DRV_LOG(DEBUG, "The REG_C meter uses is %d",
                                        priv->mtr_color_reg);
                        }
@@ -1215,6 +1197,25 @@ err_secondary:
                }
 #endif
        }
+       if (config->cqe_comp && RTE_CACHE_LINE_SIZE == 128 &&
+           !(dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP)) {
+               DRV_LOG(WARNING, "Rx CQE 128B compression is not supported");
+               config->cqe_comp = 0;
+       }
+       if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_FTAG_STRIDX &&
+           (!config->devx || !config->hca_attr.mini_cqe_resp_flow_tag)) {
+               DRV_LOG(WARNING, "Flow Tag CQE compression"
+                                " format isn't supported.");
+               config->cqe_comp = 0;
+       }
+       if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_L34H_STRIDX &&
+           (!config->devx || !config->hca_attr.mini_cqe_resp_l3_l4_tag)) {
+               DRV_LOG(WARNING, "L3/L4 Header CQE compression"
+                                " format isn't supported.");
+               config->cqe_comp = 0;
+       }
+       DRV_LOG(DEBUG, "Rx CQE compression is %ssupported",
+                       config->cqe_comp ? "" : "not ");
        if (config->tx_pp) {
                DRV_LOG(DEBUG, "Timestamp counter frequency %u kHz",
                        config->hca_attr.dev_freq_khz);
@@ -1354,6 +1355,8 @@ err_secondary:
                eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR;
                eth_dev->data->representor_id = priv->representor_id;
        }
+       priv->mp_id.port_id = eth_dev->data->port_id;
+       strlcpy(priv->mp_id.name, MLX5_MP_NAME, RTE_MP_MAX_NAME_LEN);
        /*
         * Store associated network device interface index. This index
         * is permanent throughout the lifetime of device. So, we may store
@@ -1406,7 +1409,7 @@ err_secondary:
                mac.addr_bytes[4], mac.addr_bytes[5]);
 #ifdef RTE_LIBRTE_MLX5_DEBUG
        {
-               char ifname[IF_NAMESIZE];
+               char ifname[MLX5_NAMESIZE];
 
                if (mlx5_get_ifname(eth_dev, &ifname) == 0)
                        DRV_LOG(DEBUG, "port %u ifname is \"%s\"",
@@ -1427,7 +1430,7 @@ err_secondary:
        /* Initialize burst functions to prevent crashes before link-up. */
        eth_dev->rx_pkt_burst = removed_rx_burst;
        eth_dev->tx_pkt_burst = removed_tx_burst;
-       eth_dev->dev_ops = &mlx5_os_dev_ops;
+       eth_dev->dev_ops = &mlx5_dev_ops;
        eth_dev->rx_descriptor_status = mlx5_rx_descriptor_status;
        eth_dev->tx_descriptor_status = mlx5_tx_descriptor_status;
        eth_dev->rx_queue_count = mlx5_rx_queue_count;
@@ -2473,8 +2476,8 @@ void
 mlx5_os_set_reg_mr_cb(mlx5_reg_mr_t *reg_mr_cb,
                      mlx5_dereg_mr_t *dereg_mr_cb)
 {
-       *reg_mr_cb = mlx5_verbs_ops.reg_mr;
-       *dereg_mr_cb = mlx5_verbs_ops.dereg_mr;
+       *reg_mr_cb = mlx5_mr_verbs_ops.reg_mr;
+       *dereg_mr_cb = mlx5_mr_verbs_ops.dereg_mr;
 }
 
 /**
@@ -2606,153 +2609,3 @@ mlx5_os_mac_addr_flush(struct rte_eth_dev *dev)
                               dev->data->mac_addrs,
                               MLX5_MAX_MAC_ADDRESSES, priv->mac_own);
 }
-
-const struct eth_dev_ops mlx5_os_dev_ops = {
-       .dev_configure = mlx5_dev_configure,
-       .dev_start = mlx5_dev_start,
-       .dev_stop = mlx5_dev_stop,
-       .dev_set_link_down = mlx5_set_link_down,
-       .dev_set_link_up = mlx5_set_link_up,
-       .dev_close = mlx5_dev_close,
-       .promiscuous_enable = mlx5_promiscuous_enable,
-       .promiscuous_disable = mlx5_promiscuous_disable,
-       .allmulticast_enable = mlx5_allmulticast_enable,
-       .allmulticast_disable = mlx5_allmulticast_disable,
-       .link_update = mlx5_link_update,
-       .stats_get = mlx5_stats_get,
-       .stats_reset = mlx5_stats_reset,
-       .xstats_get = mlx5_xstats_get,
-       .xstats_reset = mlx5_xstats_reset,
-       .xstats_get_names = mlx5_xstats_get_names,
-       .fw_version_get = mlx5_fw_version_get,
-       .dev_infos_get = mlx5_dev_infos_get,
-       .read_clock = mlx5_txpp_read_clock,
-       .dev_supported_ptypes_get = mlx5_dev_supported_ptypes_get,
-       .vlan_filter_set = mlx5_vlan_filter_set,
-       .rx_queue_setup = mlx5_rx_queue_setup,
-       .rx_hairpin_queue_setup = mlx5_rx_hairpin_queue_setup,
-       .tx_queue_setup = mlx5_tx_queue_setup,
-       .tx_hairpin_queue_setup = mlx5_tx_hairpin_queue_setup,
-       .rx_queue_release = mlx5_rx_queue_release,
-       .tx_queue_release = mlx5_tx_queue_release,
-       .rx_queue_start = mlx5_rx_queue_start,
-       .rx_queue_stop = mlx5_rx_queue_stop,
-       .tx_queue_start = mlx5_tx_queue_start,
-       .tx_queue_stop = mlx5_tx_queue_stop,
-       .flow_ctrl_get = mlx5_dev_get_flow_ctrl,
-       .flow_ctrl_set = mlx5_dev_set_flow_ctrl,
-       .mac_addr_remove = mlx5_mac_addr_remove,
-       .mac_addr_add = mlx5_mac_addr_add,
-       .mac_addr_set = mlx5_mac_addr_set,
-       .set_mc_addr_list = mlx5_set_mc_addr_list,
-       .mtu_set = mlx5_dev_set_mtu,
-       .vlan_strip_queue_set = mlx5_vlan_strip_queue_set,
-       .vlan_offload_set = mlx5_vlan_offload_set,
-       .reta_update = mlx5_dev_rss_reta_update,
-       .reta_query = mlx5_dev_rss_reta_query,
-       .rss_hash_update = mlx5_rss_hash_update,
-       .rss_hash_conf_get = mlx5_rss_hash_conf_get,
-       .filter_ctrl = mlx5_dev_filter_ctrl,
-       .rxq_info_get = mlx5_rxq_info_get,
-       .txq_info_get = mlx5_txq_info_get,
-       .rx_burst_mode_get = mlx5_rx_burst_mode_get,
-       .tx_burst_mode_get = mlx5_tx_burst_mode_get,
-       .rx_queue_intr_enable = mlx5_rx_intr_enable,
-       .rx_queue_intr_disable = mlx5_rx_intr_disable,
-       .is_removed = mlx5_is_removed,
-       .udp_tunnel_port_add  = mlx5_udp_tunnel_port_add,
-       .get_module_info = mlx5_get_module_info,
-       .get_module_eeprom = mlx5_get_module_eeprom,
-       .hairpin_cap_get = mlx5_hairpin_cap_get,
-       .mtr_ops_get = mlx5_flow_meter_ops_get,
-       .hairpin_bind = mlx5_hairpin_bind,
-       .hairpin_unbind = mlx5_hairpin_unbind,
-       .hairpin_get_peer_ports = mlx5_hairpin_get_peer_ports,
-       .hairpin_queue_peer_update = mlx5_hairpin_queue_peer_update,
-       .hairpin_queue_peer_bind = mlx5_hairpin_queue_peer_bind,
-       .hairpin_queue_peer_unbind = mlx5_hairpin_queue_peer_unbind,
-};
-
-/* Available operations from secondary process. */
-const struct eth_dev_ops mlx5_os_dev_sec_ops = {
-       .stats_get = mlx5_stats_get,
-       .stats_reset = mlx5_stats_reset,
-       .xstats_get = mlx5_xstats_get,
-       .xstats_reset = mlx5_xstats_reset,
-       .xstats_get_names = mlx5_xstats_get_names,
-       .fw_version_get = mlx5_fw_version_get,
-       .dev_infos_get = mlx5_dev_infos_get,
-       .read_clock = mlx5_txpp_read_clock,
-       .rx_queue_start = mlx5_rx_queue_start,
-       .rx_queue_stop = mlx5_rx_queue_stop,
-       .tx_queue_start = mlx5_tx_queue_start,
-       .tx_queue_stop = mlx5_tx_queue_stop,
-       .rxq_info_get = mlx5_rxq_info_get,
-       .txq_info_get = mlx5_txq_info_get,
-       .rx_burst_mode_get = mlx5_rx_burst_mode_get,
-       .tx_burst_mode_get = mlx5_tx_burst_mode_get,
-       .get_module_info = mlx5_get_module_info,
-       .get_module_eeprom = mlx5_get_module_eeprom,
-};
-
-/* Available operations in flow isolated mode. */
-const struct eth_dev_ops mlx5_os_dev_ops_isolate = {
-       .dev_configure = mlx5_dev_configure,
-       .dev_start = mlx5_dev_start,
-       .dev_stop = mlx5_dev_stop,
-       .dev_set_link_down = mlx5_set_link_down,
-       .dev_set_link_up = mlx5_set_link_up,
-       .dev_close = mlx5_dev_close,
-       .promiscuous_enable = mlx5_promiscuous_enable,
-       .promiscuous_disable = mlx5_promiscuous_disable,
-       .allmulticast_enable = mlx5_allmulticast_enable,
-       .allmulticast_disable = mlx5_allmulticast_disable,
-       .link_update = mlx5_link_update,
-       .stats_get = mlx5_stats_get,
-       .stats_reset = mlx5_stats_reset,
-       .xstats_get = mlx5_xstats_get,
-       .xstats_reset = mlx5_xstats_reset,
-       .xstats_get_names = mlx5_xstats_get_names,
-       .fw_version_get = mlx5_fw_version_get,
-       .dev_infos_get = mlx5_dev_infos_get,
-       .read_clock = mlx5_txpp_read_clock,
-       .dev_supported_ptypes_get = mlx5_dev_supported_ptypes_get,
-       .vlan_filter_set = mlx5_vlan_filter_set,
-       .rx_queue_setup = mlx5_rx_queue_setup,
-       .rx_hairpin_queue_setup = mlx5_rx_hairpin_queue_setup,
-       .tx_queue_setup = mlx5_tx_queue_setup,
-       .tx_hairpin_queue_setup = mlx5_tx_hairpin_queue_setup,
-       .rx_queue_release = mlx5_rx_queue_release,
-       .tx_queue_release = mlx5_tx_queue_release,
-       .rx_queue_start = mlx5_rx_queue_start,
-       .rx_queue_stop = mlx5_rx_queue_stop,
-       .tx_queue_start = mlx5_tx_queue_start,
-       .tx_queue_stop = mlx5_tx_queue_stop,
-       .flow_ctrl_get = mlx5_dev_get_flow_ctrl,
-       .flow_ctrl_set = mlx5_dev_set_flow_ctrl,
-       .mac_addr_remove = mlx5_mac_addr_remove,
-       .mac_addr_add = mlx5_mac_addr_add,
-       .mac_addr_set = mlx5_mac_addr_set,
-       .set_mc_addr_list = mlx5_set_mc_addr_list,
-       .mtu_set = mlx5_dev_set_mtu,
-       .vlan_strip_queue_set = mlx5_vlan_strip_queue_set,
-       .vlan_offload_set = mlx5_vlan_offload_set,
-       .filter_ctrl = mlx5_dev_filter_ctrl,
-       .rxq_info_get = mlx5_rxq_info_get,
-       .txq_info_get = mlx5_txq_info_get,
-       .rx_burst_mode_get = mlx5_rx_burst_mode_get,
-       .tx_burst_mode_get = mlx5_tx_burst_mode_get,
-       .rx_queue_intr_enable = mlx5_rx_intr_enable,
-       .rx_queue_intr_disable = mlx5_rx_intr_disable,
-       .is_removed = mlx5_is_removed,
-       .get_module_info = mlx5_get_module_info,
-       .get_module_eeprom = mlx5_get_module_eeprom,
-       .hairpin_cap_get = mlx5_hairpin_cap_get,
-       .mtr_ops_get = mlx5_flow_meter_ops_get,
-       .hairpin_bind = mlx5_hairpin_bind,
-       .hairpin_unbind = mlx5_hairpin_unbind,
-       .hairpin_get_peer_ports = mlx5_hairpin_get_peer_ports,
-       .hairpin_queue_peer_update = mlx5_hairpin_queue_peer_update,
-       .hairpin_queue_peer_bind = mlx5_hairpin_queue_peer_bind,
-       .hairpin_queue_peer_unbind = mlx5_hairpin_queue_peer_unbind,
-};