net/ice/base: add command to LLDP

[dpdk.git] / drivers / net / netvsc / hn_rndis.c

diff --git a/drivers/net/netvsc/hn_rndis.c b/drivers/net/netvsc/hn_rndis.c
index 7947ca2..d186dde 100644 (file)
--- a/drivers/net/netvsc/hn_rndis.c
+++ b/drivers/net/netvsc/hn_rndis.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
+#include <time.h>
 
 #include <rte_ethdev_driver.h>
 #include <rte_ethdev.h>
@@ -17,6 +18,7 @@
 #include <rte_memzone.h>
 #include <rte_malloc.h>
 #include <rte_atomic.h>
+#include <rte_alarm.h>
 #include <rte_branch_prediction.h>
 #include <rte_ether.h>
 #include <rte_common.h>
@@ -33,6 +35,9 @@
 #include "hn_rndis.h"
 #include "ndis.h"
 
+#define RNDIS_TIMEOUT_SEC 5
+#define RNDIS_DELAY_MS    10
+
 #define HN_RNDIS_XFER_SIZE             0x4000
 
 #define HN_NDIS_TXCSUM_CAP_IP4         \
@@ -281,6 +286,15 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan,
                                  &nvs_rndis, sizeof(nvs_rndis), 0U, NULL);
 }
 
+/*
+ * Alarm callback to process link changed notifications.
+ * Can not directly since link_status is discovered while reading ring
+ */
+static void hn_rndis_link_alarm(void *arg)
+{
+       _rte_eth_dev_callback_process(arg, RTE_ETH_EVENT_INTR_LSC, NULL);
+}
+
 void hn_rndis_link_status(struct rte_eth_dev *dev, const void *msg)
 {
        const struct rndis_status_msg *indicate = msg;
@@ -298,11 +312,8 @@ void hn_rndis_link_status(struct rte_eth_dev *dev, const void *msg)
        case RNDIS_STATUS_LINK_SPEED_CHANGE:
        case RNDIS_STATUS_MEDIA_CONNECT:
        case RNDIS_STATUS_MEDIA_DISCONNECT:
-               if (dev->data->dev_conf.intr_conf.lsc &&
-                   hn_dev_link_update(dev, 0) == 0)
-                       _rte_eth_dev_callback_process(dev,
-                                                     RTE_ETH_EVENT_INTR_LSC,
-                                                     NULL);
+               if (dev->data->dev_conf.intr_conf.lsc)
+                       rte_eal_alarm_set(10, hn_rndis_link_alarm, dev);
                break;
        default:
                PMD_DRV_LOG(NOTICE, "unknown RNDIS indication: %#x",
@@ -347,7 +358,7 @@ void hn_rndis_receive_response(struct hn_data *hv,
        rte_smp_wmb();
 
        if (rte_atomic32_cmpset(&hv->rndis_pending, hdr->rid, 0) == 0) {
-               PMD_DRV_LOG(ERR,
+               PMD_DRV_LOG(NOTICE,
                            "received id %#x pending id %#x",
                            hdr->rid, (uint32_t)hv->rndis_pending);
        }
@@ -370,6 +381,11 @@ static int hn_rndis_exec1(struct hn_data *hv,
                return -EIO;
        }
 
+       if (rid == 0) {
+               PMD_DRV_LOG(ERR, "Invalid request id");
+               return -EINVAL;
+       }
+
        if (comp != NULL &&
            rte_atomic32_cmpset(&hv->rndis_pending, 0, rid) == 0) {
                PMD_DRV_LOG(ERR,
@@ -384,9 +400,26 @@ static int hn_rndis_exec1(struct hn_data *hv,
        }
 
        if (comp) {
+               time_t start = time(NULL);
+
                /* Poll primary channel until response received */
-               while (hv->rndis_pending == rid)
+               while (hv->rndis_pending == rid) {
+                       if (hv->closed)
+                               return -ENETDOWN;
+
+                       if (time(NULL) - start > RNDIS_TIMEOUT_SEC) {
+                               PMD_DRV_LOG(ERR,
+                                           "RNDIS response timed out");
+
+                               rte_atomic32_cmpset(&hv->rndis_pending, rid, 0);
+                               return -ETIMEDOUT;
+                       }
+
+                       if (rte_vmbus_chan_rx_empty(hv->primary->chan))
+                               rte_delay_ms(RNDIS_DELAY_MS);
+
                        hn_process_events(hv, 0, 1);
+               }
 
                memcpy(comp, hv->rndis_resp, comp_len);
        }
@@ -1101,6 +1134,10 @@ hn_rndis_attach(struct hn_data *hv)
 void
 hn_rndis_detach(struct hn_data *hv)
 {
+       struct rte_eth_dev *dev = &rte_eth_devices[hv->port_id];
+
+       rte_eal_alarm_cancel(hn_rndis_link_alarm, dev);
+
        /* Halt the RNDIS. */
        hn_rndis_halt(hv);
 }