liquidio VF: reduce load time of module

Reduce the load time of the VF driver by decreasing the wait time between
iterations of the loop that polls for a mailbox response from the PF. Also
change the wait time units from jiffies to milliseconds.

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

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c
index 73696b427f068372a747d0689b3828799c2c36d2..201b9875f9bbef778d2687b7750424ba55320de8 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.c
@@ -131,6 +131,7 @@ int octeon_mbox_write(struct octeon_device *oct,
 {
        struct octeon_mbox *mbox = oct->mbox[mbox_cmd->q_no];
        u32 count, i, ret = OCTEON_MBOX_STATUS_SUCCESS;
+       long timeout = LIO_MBOX_WRITE_WAIT_TIME;
        unsigned long flags;
 
        spin_lock_irqsave(&mbox->lock, flags);
@@ -158,7 +159,7 @@ int octeon_mbox_write(struct octeon_device *oct,
        count = 0;
 
        while (readq(mbox->mbox_write_reg) != OCTEON_PFVFSIG) {
-               schedule_timeout_uninterruptible(LIO_MBOX_WRITE_WAIT_TIME);
+               schedule_timeout_uninterruptible(timeout);
                if (count++ == LIO_MBOX_WRITE_WAIT_CNT) {
                        ret = OCTEON_MBOX_STATUS_FAILED;
                        break;
@@ -171,7 +172,7 @@ int octeon_mbox_write(struct octeon_device *oct,
                        count = 0;
                        while (readq(mbox->mbox_write_reg) !=
                               OCTEON_PFVFACK) {
-                               schedule_timeout_uninterruptible(10);
+                               schedule_timeout_uninterruptible(timeout);
                                if (count++ == LIO_MBOX_WRITE_WAIT_CNT) {
                                        ret = OCTEON_MBOX_STATUS_FAILED;
                                        break;

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h
index fe60a3e6247bf0b377ffea038d35d0e7d36bc2ce..c9376fe075bc0afaf74ffc6279c376c7271e8825 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_mailbox.h
@@ -31,8 +31,8 @@
 #define OCTEON_PFVFSIG                 0x1122334455667788
 #define OCTEON_PFVFERR                 0xDEADDEADDEADDEAD
 
-#define LIO_MBOX_WRITE_WAIT_CNT          1000
-#define LIO_MBOX_WRITE_WAIT_TIME           10
+#define LIO_MBOX_WRITE_WAIT_CNT         1000
+#define LIO_MBOX_WRITE_WAIT_TIME        msecs_to_jiffies(1)
 
 enum octeon_mbox_cmd_status {
        OCTEON_MBOX_STATUS_SUCCESS = 0,