log: register with standardized names

[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 6a850ce..e3f7e63 100644 (file)
--- a/drivers/net/netvsc/hn_rndis.c
+++ b/drivers/net/netvsc/hn_rndis.c
@@ -10,8 +10,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
+#include <time.h>
 
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_ethdev.h>
 #include <rte_string_fns.h>
 #include <rte_memzone.h>
@@ -34,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         \
@@ -63,7 +67,7 @@ hn_rndis_rid(struct hn_data *hv)
 
 static void *hn_rndis_alloc(size_t size)
 {
-       return rte_zmalloc("RNDIS", size, PAGE_SIZE);
+       return rte_zmalloc("RNDIS", size, rte_mem_page_size());
 }
 
 #ifdef RTE_LIBRTE_NETVSC_DEBUG_DUMP
@@ -261,18 +265,18 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan,
                return -EINVAL;
        }
 
-       if (unlikely(reqlen > PAGE_SIZE)) {
+       if (unlikely(reqlen > rte_mem_page_size())) {
                PMD_DRV_LOG(ERR, "RNDIS request %u greater than page size",
                            reqlen);
                return -EINVAL;
        }
 
-       sg.page = addr / PAGE_SIZE;
+       sg.page = addr / rte_mem_page_size();
        sg.ofs  = addr & PAGE_MASK;
        sg.len  = reqlen;
 
-       if (sg.ofs + reqlen >  PAGE_SIZE) {
-               PMD_DRV_LOG(ERR, "RNDIS request crosses page bounary");
+       if (sg.ofs + reqlen >  rte_mem_page_size()) {
+               PMD_DRV_LOG(ERR, "RNDIS request crosses page boundary");
                return -EINVAL;
        }
 
@@ -288,7 +292,7 @@ static int hn_nvs_send_rndis_ctrl(struct vmbus_channel *chan,
  */
 static void hn_rndis_link_alarm(void *arg)
 {
-       _rte_eth_dev_callback_process(arg, RTE_ETH_EVENT_INTR_LSC, NULL);
+       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)
@@ -354,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);
        }
@@ -377,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,
@@ -391,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);
        }
@@ -453,7 +479,7 @@ hn_rndis_query(struct hn_data *hv, uint32_t oid,
                return -ENOMEM;
 
        comp_len = sizeof(*comp) + odlen;
-       comp = rte_zmalloc("QUERY", comp_len, PAGE_SIZE);
+       comp = rte_zmalloc("QUERY", comp_len, rte_mem_page_size());
        if (!comp) {
                error = -ENOMEM;
                goto done;
@@ -710,7 +736,7 @@ hn_rndis_set(struct hn_data *hv, uint32_t oid, const void *data, uint32_t dlen)
        int error;
 
        reqlen = sizeof(*req) + dlen;
-       req = rte_zmalloc("RNDIS_SET", reqlen, PAGE_SIZE);
+       req = rte_zmalloc("RNDIS_SET", reqlen, rte_mem_page_size());
        if (!req)
                return -ENOMEM;