liquidio: softcommand delay

This patch updates the delay constant for softcommands in
accrodance with new requirements.

Signed-off-by: Derek Chickles <derek.chickles@caviumnetworks.com>
Signed-off-by: Satanand Burla <satananda.burla@caviumnetworks.com>
Signed-off-by: Felix Manlunas <felix.manlunas@caviumnetworks.com>
Signed-off-by: Raghu Vatsavayi <raghu.vatsavayi@caviumnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 3d229c0b427cfe680d9ca63a659a52ac7bbcc219..906d32e72be631c66a0914d559e67dc87297b3d5 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -3555,7 +3555,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
                sc->callback = if_cfg_callback;
                sc->callback_arg = sc;
-               sc->wait_time = 1000;
+               sc->wait_time = 3000;
 
                retval = octeon_send_soft_command(octeon_dev, sc);
                if (retval == IQ_SEND_FAILED) {

diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
index ef0bdd869688a7ba61bbad378a4e28c03beb387c..3f7044ceabf2d6ef5e2874bb5a6601c55ee44053 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
@@ -523,9 +523,10 @@ static void check_db_timeout(struct work_struct *work)
        struct octeon_device *oct = (struct octeon_device *)wk->ctxptr;
        unsigned long iq_no = wk->ctxul;
        struct cavium_wq *db_wq = &oct->check_db_wq[iq_no];
+       u32 delay = 10;
 
        __check_db_timeout(oct, iq_no);
-       queue_delayed_work(db_wq->wq, &db_wq->wk.work, msecs_to_jiffies(1));
+       queue_delayed_work(db_wq->wq, &db_wq->wk.work, msecs_to_jiffies(delay));
 }
 
 int

diff --git a/drivers/net/ethernet/cavium/liquidio/response_manager.c b/drivers/net/ethernet/cavium/liquidio/response_manager.c
index 0cc2f66c1b051b7bb6a4eb61d2b53842132d1a0a..709049e366276de7da2bf025ba4af4ede80a4de1 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/response_manager.c
+++ b/drivers/net/ethernet/cavium/liquidio/response_manager.c
@@ -52,7 +52,7 @@ int octeon_setup_response_list(struct octeon_device *oct)
        INIT_DELAYED_WORK(&cwq->wk.work, oct_poll_req_completion);
        cwq->wk.ctxptr = oct;
        oct->cmd_resp_state = OCT_DRV_ONLINE;
-       queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(100));
+       queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(50));
 
        return ret;
 }
@@ -162,6 +162,5 @@ static void oct_poll_req_completion(struct work_struct *work)
        struct cavium_wq *cwq = &oct->dma_comp_wq;
 
        lio_process_ordered_list(oct, 0);
-
-       queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(100));
+       queue_delayed_work(cwq->wq, &cwq->wk.work, msecs_to_jiffies(50));
 }