net/i40e: remove duplicate tunnel type check

[dpdk.git] / drivers / net / iavf / iavf_vchnl.c

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 805d308..33acea5 100644 (file)
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -130,6 +130,44 @@ iavf_execute_vf_cmd(struct iavf_adapter *adapter, struct iavf_cmd_info *args)
        return err;
 }
 
+static uint32_t
+iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed)
+{
+       uint32_t speed;
+
+       switch (virt_link_speed) {
+       case VIRTCHNL_LINK_SPEED_100MB:
+               speed = 100;
+               break;
+       case VIRTCHNL_LINK_SPEED_1GB:
+               speed = 1000;
+               break;
+       case VIRTCHNL_LINK_SPEED_10GB:
+               speed = 10000;
+               break;
+       case VIRTCHNL_LINK_SPEED_40GB:
+               speed = 40000;
+               break;
+       case VIRTCHNL_LINK_SPEED_20GB:
+               speed = 20000;
+               break;
+       case VIRTCHNL_LINK_SPEED_25GB:
+               speed = 25000;
+               break;
+       case VIRTCHNL_LINK_SPEED_2_5GB:
+               speed = 2500;
+               break;
+       case VIRTCHNL_LINK_SPEED_5GB:
+               speed = 5000;
+               break;
+       default:
+               speed = 0;
+               break;
+       }
+
+       return speed;
+}
+
 static void
 iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
                        uint16_t msglen)
@@ -151,7 +189,14 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
        case VIRTCHNL_EVENT_LINK_CHANGE:
                PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_LINK_CHANGE event");
                vf->link_up = pf_msg->event_data.link_event.link_status;
-               vf->link_speed = pf_msg->event_data.link_event_adv.link_speed;
+               if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_CAP_ADV_LINK_SPEED) {
+                       vf->link_speed =
+                               pf_msg->event_data.link_event_adv.link_speed;
+               } else {
+                       enum virtchnl_link_speed speed;
+                       speed = pf_msg->event_data.link_event.link_speed;
+                       vf->link_speed = iavf_convert_link_speed(speed);
+               }
                iavf_dev_link_update(dev, 0);
                _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC,
                                              NULL);
@@ -335,13 +380,10 @@ iavf_get_vf_resource(struct iavf_adapter *adapter)
        args.out_buffer = vf->aq_resp;
        args.out_size = IAVF_AQ_BUF_SZ;
 
-       /* TODO: basic offload capabilities, need to
-        * add advanced/optional offload capabilities
-        */
-
        caps = IAVF_BASIC_OFFLOAD_CAPS | VIRTCHNL_VF_CAP_ADV_LINK_SPEED |
                VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC |
-               VIRTCHNL_VF_OFFLOAD_FDIR_PF;
+               VIRTCHNL_VF_OFFLOAD_FDIR_PF |
+               VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF;
 
        args.in_args = (uint8_t *)∩︀
        args.in_args_size = sizeof(caps);
@@ -596,32 +638,32 @@ iavf_configure_queues(struct iavf_adapter *adapter)
                        vc_qp->rxq.ring_len = rxq[i]->nb_rx_desc;
                        vc_qp->rxq.dma_ring_addr = rxq[i]->rx_ring_phys_addr;
                        vc_qp->rxq.databuffer_size = rxq[i]->rx_buf_len;
+               }
 
 #ifndef RTE_LIBRTE_IAVF_16BYTE_RX_DESC
-                       if (vf->vf_res->vf_cap_flags &
-                           VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
-                           vf->supported_rxdid & BIT(IAVF_RXDID_COMMS_OVS_1)) {
-                               vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1;
-                               PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                           "Queue[%d]", vc_qp->rxq.rxdid, i);
-                       } else {
-                               vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_1;
-                               PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                           "Queue[%d]", vc_qp->rxq.rxdid, i);
-                       }
+               if (vf->vf_res->vf_cap_flags &
+                       VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
+                       vf->supported_rxdid & BIT(IAVF_RXDID_COMMS_OVS_1)) {
+                       vc_qp->rxq.rxdid = IAVF_RXDID_COMMS_OVS_1;
+                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
+                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
+               } else {
+                       vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_1;
+                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
+                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
+               }
 #else
-                       if (vf->vf_res->vf_cap_flags &
-                           VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
-                           vf->supported_rxdid & BIT(IAVF_RXDID_LEGACY_0)) {
-                               vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_0;
-                               PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
-                                           "Queue[%d]", vc_qp->rxq.rxdid, i);
-                       } else {
-                               PMD_DRV_LOG(ERR, "RXDID == 0 is not supported");
-                               return -1;
-                       }
-#endif
+               if (vf->vf_res->vf_cap_flags &
+                       VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC &&
+                       vf->supported_rxdid & BIT(IAVF_RXDID_LEGACY_0)) {
+                       vc_qp->rxq.rxdid = IAVF_RXDID_LEGACY_0;
+                       PMD_DRV_LOG(NOTICE, "request RXDID == %d in "
+                                       "Queue[%d]", vc_qp->rxq.rxdid, i);
+               } else {
+                       PMD_DRV_LOG(ERR, "RXDID == 0 is not supported");
+                       return -1;
                }
+#endif
        }
 
        memset(&args, 0, sizeof(args));
@@ -1007,3 +1049,29 @@ iavf_fdir_check(struct iavf_adapter *adapter,
 
        return 0;
 }
+
+int
+iavf_add_del_rss_cfg(struct iavf_adapter *adapter,
+                    struct virtchnl_rss_cfg *rss_cfg, bool add)
+{
+       struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+       struct iavf_cmd_info args;
+       int err;
+
+       memset(&args, 0, sizeof(args));
+       args.ops = add ? VIRTCHNL_OP_ADD_RSS_CFG :
+               VIRTCHNL_OP_DEL_RSS_CFG;
+       args.in_args = (u8 *)rss_cfg;
+       args.in_args_size = sizeof(*rss_cfg);
+       args.out_buffer = vf->aq_resp;
+       args.out_size = IAVF_AQ_BUF_SZ;
+
+       err = iavf_execute_vf_cmd(adapter, &args);
+       if (err)
+               PMD_DRV_LOG(ERR,
+                           "Failed to execute command of %s",
+                           add ? "OP_ADD_RSS_CFG" :
+                           "OP_DEL_RSS_INPUT_CFG");
+
+       return err;
+}