liquidio: remove obsolete functions and data structures

1. Remove unused functions and data structures.
2. Change the sending of the remaining soft commands to synchronous.

Signed-off-by: Weilin Chang <redacted>
Signed-off-by: Felix Manlunas <redacted>
Signed-off-by: David S. Miller <redacted>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_core.c b/drivers/net/ethernet/cavium/liquidio/lio_core.c
index 27b3655912bef99a572ef7ee7401d0831c5bfbab..30b4a6066bc97c600cce9893060871e9f2a973c1 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_core.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_core.c
@@ -31,38 +31,6 @@
 
 #define OCTNIC_MAX_SG  MAX_SKB_FRAGS
 
 
 #define OCTNIC_MAX_SG  MAX_SKB_FRAGS
 

-/**
- * \brief Callback for getting interface configuration
- * @param status status of request
- * @param buf pointer to resp structure
- */
-void lio_if_cfg_callback(struct octeon_device *oct,
-                        u32 status __attribute__((unused)), void *buf)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-       struct liquidio_if_cfg_context *ctx;
-       struct liquidio_if_cfg_resp *resp;
-
-       resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;
-       ctx = (struct liquidio_if_cfg_context *)sc->ctxptr;
-
-       oct = lio_get_device(ctx->octeon_id);
-       if (resp->status)
-               dev_err(&oct->pci_dev->dev, "nic if cfg instruction failed. Status: %llx\n",
-                       CVM_CAST64(resp->status));
-       WRITE_ONCE(ctx->cond, 1);
-
-       snprintf(oct->fw_info.liquidio_firmware_version, 32, "%s",
-                resp->cfg_info.liquidio_firmware_version);
-
-       /* This barrier is required to be sure that the response has been
-        * written fully before waking up the handler
-        */
-       wmb();
-
-       wake_up_interruptible(&ctx->wc);
-}
-

 /**
  * \brief Delete gather lists
  * @param lio per-network private data
 /**
  * \brief Delete gather lists
  * @param lio per-network private data


@@ -1211,30 +1179,6 @@ int octeon_setup_interrupt(struct octeon_device *oct, u32 num_ioqs)
        return 0;
 }
 
        return 0;
 }
 

-static void liquidio_change_mtu_completion(struct octeon_device *oct,
-                                          u32 status, void *buf)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-       struct liquidio_if_cfg_context *ctx;
-
-       ctx  = (struct liquidio_if_cfg_context *)sc->ctxptr;
-
-       if (status) {
-               dev_err(&oct->pci_dev->dev, "MTU change failed. Status: %llx\n",
-                       CVM_CAST64(status));
-               WRITE_ONCE(ctx->cond, LIO_CHANGE_MTU_FAIL);
-       } else {
-               WRITE_ONCE(ctx->cond, LIO_CHANGE_MTU_SUCCESS);
-       }
-
-       /* This barrier is required to be sure that the response has been
-        * written fully before waking up the handler
-        */
-       wmb();
-
-       wake_up_interruptible(&ctx->wc);
-}
-

 /**
  * \brief Net device change_mtu
  * @param netdev network device
 /**
  * \brief Net device change_mtu
  * @param netdev network device


@@ -1243,22 +1187,17 @@ int liquidio_change_mtu(struct net_device *netdev, int new_mtu)
 {
        struct lio *lio = GET_LIO(netdev);
        struct octeon_device *oct = lio->oct_dev;
 {
        struct lio *lio = GET_LIO(netdev);
        struct octeon_device *oct = lio->oct_dev;

-       struct liquidio_if_cfg_context *ctx;

        struct octeon_soft_command *sc;
        union octnet_cmd *ncmd;
        struct octeon_soft_command *sc;
        union octnet_cmd *ncmd;

-       int ctx_size;

        int ret = 0;
 
        int ret = 0;
 

-       ctx_size = sizeof(struct liquidio_if_cfg_context);

        sc = (struct octeon_soft_command *)
        sc = (struct octeon_soft_command *)

-               octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, ctx_size);
+               octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE, 16, 0);

 
        ncmd = (union octnet_cmd *)sc->virtdptr;
 
        ncmd = (union octnet_cmd *)sc->virtdptr;

-       ctx  = (struct liquidio_if_cfg_context *)sc->ctxptr;

 
 

-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct);
-       init_waitqueue_head(&ctx->wc);
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_CHANGE_MTU;
 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_CHANGE_MTU;


@@ -1271,28 +1210,28 @@ int liquidio_change_mtu(struct net_device *netdev, int new_mtu)
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 

-       sc->callback = liquidio_change_mtu_completion;
-       sc->callback_arg = sc;
-       sc->wait_time = 100;
-

        ret = octeon_send_soft_command(oct, sc);
        if (ret == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to change MTU\n");
        ret = octeon_send_soft_command(oct, sc);
        if (ret == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to change MTU\n");

+               octeon_free_soft_command(oct, sc);

                return -EINVAL;
        }
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */
                return -EINVAL;
        }
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */

-       if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR ||
-           ctx->cond == LIO_CHANGE_MTU_FAIL) {
-               octeon_free_soft_command(oct, sc);
+       ret = wait_for_sc_completion_timeout(oct, sc, 0);
+       if (ret)
+               return ret;
+
+       if (sc->sc_status) {
+               WRITE_ONCE(sc->caller_is_done, true);

                return -EINVAL;
        }
 
        netdev->mtu = new_mtu;
        lio->mtu = new_mtu;
 
                return -EINVAL;
        }
 
        netdev->mtu = new_mtu;
        lio->mtu = new_mtu;
 

-       octeon_free_soft_command(oct, sc);
+       WRITE_ONCE(sc->caller_is_done, true);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index d374c44dfcaca2c2acc5405b9747c5a555c67159..46d8379d8c7c8f52cf7bebad6289e97e592d1ec6 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -33,25 +33,12 @@
 
 static int lio_reset_queues(struct net_device *netdev, uint32_t num_qs);
 
 
 static int lio_reset_queues(struct net_device *netdev, uint32_t num_qs);
 

-struct oct_intrmod_context {
-       int octeon_id;
-       wait_queue_head_t wc;
-       int cond;
-       int status;
-};
-

 struct oct_intrmod_resp {
        u64     rh;
        struct oct_intrmod_cfg intrmod;
        u64     status;
 };
 
 struct oct_intrmod_resp {
        u64     rh;
        struct oct_intrmod_cfg intrmod;
        u64     status;
 };
 

-struct oct_mdio_cmd_context {
-       int octeon_id;
-       wait_queue_head_t wc;
-       int cond;
-};
-

 struct oct_mdio_cmd_resp {
        u64 rh;
        struct oct_mdio_cmd resp;
 struct oct_mdio_cmd_resp {
        u64 rh;
        struct oct_mdio_cmd resp;


@@ -746,28 +733,6 @@ static int octnet_id_active(struct net_device *netdev, int val)
        return 0;
 }
 
        return 0;
 }
 

-/* Callback for when mdio command response arrives
- */
-static void octnet_mdio_resp_callback(struct octeon_device *oct,
-                                     u32 status,
-                                     void *buf)
-{
-       struct oct_mdio_cmd_context *mdio_cmd_ctx;
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-
-       mdio_cmd_ctx = (struct oct_mdio_cmd_context *)sc->ctxptr;
-
-       oct = lio_get_device(mdio_cmd_ctx->octeon_id);
-       if (status) {
-               dev_err(&oct->pci_dev->dev, "MIDO instruction failed. Status: %llx\n",
-                       CVM_CAST64(status));
-               WRITE_ONCE(mdio_cmd_ctx->cond, -1);
-       } else {
-               WRITE_ONCE(mdio_cmd_ctx->cond, 1);
-       }
-       wake_up_interruptible(&mdio_cmd_ctx->wc);
-}
-

 /* This routine provides PHY access routines for
  * mdio  clause45 .
  */
 /* This routine provides PHY access routines for
  * mdio  clause45 .
  */


@@ -777,25 +742,20 @@ octnet_mdio45_access(struct lio *lio, int op, int loc, int *value)
        struct octeon_device *oct_dev = lio->oct_dev;
        struct octeon_soft_command *sc;
        struct oct_mdio_cmd_resp *mdio_cmd_rsp;
        struct octeon_device *oct_dev = lio->oct_dev;
        struct octeon_soft_command *sc;
        struct oct_mdio_cmd_resp *mdio_cmd_rsp;

-       struct oct_mdio_cmd_context *mdio_cmd_ctx;

        struct oct_mdio_cmd *mdio_cmd;
        int retval = 0;
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          sizeof(struct oct_mdio_cmd),
        struct oct_mdio_cmd *mdio_cmd;
        int retval = 0;
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          sizeof(struct oct_mdio_cmd),

-                                         sizeof(struct oct_mdio_cmd_resp),
-                                         sizeof(struct oct_mdio_cmd_context));
+                                         sizeof(struct oct_mdio_cmd_resp), 0);

 
        if (!sc)
                return -ENOMEM;
 
 
        if (!sc)
                return -ENOMEM;
 

-       mdio_cmd_ctx = (struct oct_mdio_cmd_context *)sc->ctxptr;

        mdio_cmd_rsp = (struct oct_mdio_cmd_resp *)sc->virtrptr;
        mdio_cmd = (struct oct_mdio_cmd *)sc->virtdptr;
 
        mdio_cmd_rsp = (struct oct_mdio_cmd_resp *)sc->virtrptr;
        mdio_cmd = (struct oct_mdio_cmd *)sc->virtdptr;
 

-       WRITE_ONCE(mdio_cmd_ctx->cond, 0);
-       mdio_cmd_ctx->octeon_id = lio_get_device_id(oct_dev);

        mdio_cmd->op = op;
        mdio_cmd->mdio_addr = loc;
        if (op)
        mdio_cmd->op = op;
        mdio_cmd->mdio_addr = loc;
        if (op)


@@ -807,42 +767,40 @@ octnet_mdio45_access(struct lio *lio, int op, int loc, int *value)
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC, OPCODE_NIC_MDIO45,
                                    0, 0, 0);
 
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC, OPCODE_NIC_MDIO45,
                                    0, 0, 0);
 

-       sc->wait_time = 1000;
-       sc->callback = octnet_mdio_resp_callback;
-       sc->callback_arg = sc;
-
-       init_waitqueue_head(&mdio_cmd_ctx->wc);
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct_dev, sc);
 
        retval = octeon_send_soft_command(oct_dev, sc);

-

        if (retval == IQ_SEND_FAILED) {
                dev_err(&oct_dev->pci_dev->dev,
                        "octnet_mdio45_access instruction failed status: %x\n",
                        retval);
        if (retval == IQ_SEND_FAILED) {
                dev_err(&oct_dev->pci_dev->dev,
                        "octnet_mdio45_access instruction failed status: %x\n",
                        retval);

-               retval = -EBUSY;
+               octeon_free_soft_command(oct_dev, sc);
+               return -EBUSY;

        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived
                 */
        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived
                 */

-               sleep_cond(&mdio_cmd_ctx->wc, &mdio_cmd_ctx->cond);
+               retval = wait_for_sc_completion_timeout(oct_dev, sc, 0);
+               if (retval)
+                       return retval;
+

                retval = mdio_cmd_rsp->status;
                if (retval) {
                retval = mdio_cmd_rsp->status;
                if (retval) {

-                       dev_err(&oct_dev->pci_dev->dev, "octnet mdio45 access failed\n");
-                       retval = -EBUSY;
-               } else {
-                       octeon_swap_8B_data((u64 *)(&mdio_cmd_rsp->resp),
-                                           sizeof(struct oct_mdio_cmd) / 8);
-
-                       if (READ_ONCE(mdio_cmd_ctx->cond) == 1) {
-                               if (!op)
-                                       *value = mdio_cmd_rsp->resp.value1;
-                       } else {
-                               retval = -EINVAL;
-                       }
+                       dev_err(&oct_dev->pci_dev->dev,
+                               "octnet mdio45 access failed: %x\n", retval);
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       return -EBUSY;

                }
                }

-       }

 
 

-       octeon_free_soft_command(oct_dev, sc);
+               octeon_swap_8B_data((u64 *)(&mdio_cmd_rsp->resp),
+                                   sizeof(struct oct_mdio_cmd) / 8);
+
+               if (!op)
+                       *value = mdio_cmd_rsp->resp.value1;
+
+               WRITE_ONCE(sc->caller_is_done, true);
+       }

 
        return retval;
 }
 
        return retval;
 }


@@ -1006,8 +964,7 @@ lio_ethtool_get_ringparam(struct net_device *netdev,
 static int lio_23xx_reconfigure_queue_count(struct lio *lio)
 {
        struct octeon_device *oct = lio->oct_dev;
 static int lio_23xx_reconfigure_queue_count(struct lio *lio)
 {
        struct octeon_device *oct = lio->oct_dev;

-       struct liquidio_if_cfg_context *ctx;
-       u32 resp_size, ctx_size, data_size;
+       u32 resp_size, data_size;

        struct liquidio_if_cfg_resp *resp;
        struct octeon_soft_command *sc;
        union oct_nic_if_cfg if_cfg;
        struct liquidio_if_cfg_resp *resp;
        struct octeon_soft_command *sc;
        union oct_nic_if_cfg if_cfg;


@@ -1017,11 +974,10 @@ static int lio_23xx_reconfigure_queue_count(struct lio *lio)
        int j;
 
        resp_size = sizeof(struct liquidio_if_cfg_resp);
        int j;
 
        resp_size = sizeof(struct liquidio_if_cfg_resp);

-       ctx_size = sizeof(struct liquidio_if_cfg_context);

        data_size = sizeof(struct lio_version);
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, data_size,
        data_size = sizeof(struct lio_version);
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, data_size,

-                                         resp_size, ctx_size);
+                                         resp_size, 0);

        if (!sc) {
                dev_err(&oct->pci_dev->dev, "%s: Failed to allocate soft command\n",
                        __func__);
        if (!sc) {
                dev_err(&oct->pci_dev->dev, "%s: Failed to allocate soft command\n",
                        __func__);


@@ -1029,7 +985,6 @@ static int lio_23xx_reconfigure_queue_count(struct lio *lio)
        }
 
        resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;
        }
 
        resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

-       ctx  = (struct liquidio_if_cfg_context *)sc->ctxptr;

        vdata = (struct lio_version *)sc->virtdptr;
 
        vdata->major = (__force u16)cpu_to_be16(LIQUIDIO_BASE_MAJOR_VERSION);
        vdata = (struct lio_version *)sc->virtdptr;
 
        vdata->major = (__force u16)cpu_to_be16(LIQUIDIO_BASE_MAJOR_VERSION);


@@ -1037,9 +992,6 @@ static int lio_23xx_reconfigure_queue_count(struct lio *lio)
        vdata->micro = (__force u16)cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION);
 
        ifidx_or_pfnum = oct->pf_num;
        vdata->micro = (__force u16)cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION);
 
        ifidx_or_pfnum = oct->pf_num;

-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct);
-       init_waitqueue_head(&ctx->wc);

 
        if_cfg.u64 = 0;
        if_cfg.s.num_iqueues = oct->sriov_info.num_pf_rings;
 
        if_cfg.u64 = 0;
        if_cfg.s.num_iqueues = oct->sriov_info.num_pf_rings;


@@ -1051,27 +1003,29 @@ static int lio_23xx_reconfigure_queue_count(struct lio *lio)
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_QCOUNT_UPDATE, 0,
                                    if_cfg.u64, 0);
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_QCOUNT_UPDATE, 0,
                                    if_cfg.u64, 0);

-       sc->callback = lio_if_cfg_callback;
-       sc->callback_arg = sc;
-       sc->wait_time = LIO_IFCFG_WAIT_TIME;
+
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                dev_err(&oct->pci_dev->dev,
 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                dev_err(&oct->pci_dev->dev,

-                       "iq/oq config failed status: %x\n",
+                       "Sending iq/oq config failed status: %x\n",

                        retval);
                        retval);

-               goto qcount_update_fail;
+               octeon_free_soft_command(oct, sc);
+               return -EIO;

        }
 
        }
 

-       if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) {
-               dev_err(&oct->pci_dev->dev, "Wait interrupted\n");
-               return -1;
-       }
+       retval = wait_for_sc_completion_timeout(oct, sc, 0);
+       if (retval)
+               return retval;

 
        retval = resp->status;
        if (retval) {
 
        retval = resp->status;
        if (retval) {

-               dev_err(&oct->pci_dev->dev, "iq/oq config failed\n");
-               goto qcount_update_fail;
+               dev_err(&oct->pci_dev->dev,
+                       "iq/oq config failed: %x\n", retval);
+               WRITE_ONCE(sc->caller_is_done, true);
+               return -1;

        }
 
        octeon_swap_8B_data((u64 *)(&resp->cfg_info),
        }
 
        octeon_swap_8B_data((u64 *)(&resp->cfg_info),


@@ -1096,16 +1050,12 @@ static int lio_23xx_reconfigure_queue_count(struct lio *lio)
        lio->txq = lio->linfo.txpciq[0].s.q_no;
        lio->rxq = lio->linfo.rxpciq[0].s.q_no;
 
        lio->txq = lio->linfo.txpciq[0].s.q_no;
        lio->rxq = lio->linfo.rxpciq[0].s.q_no;
 

-       octeon_free_soft_command(oct, sc);

        dev_info(&oct->pci_dev->dev, "Queue count updated to %d\n",
                 lio->linfo.num_rxpciq);
 
        dev_info(&oct->pci_dev->dev, "Queue count updated to %d\n",
                 lio->linfo.num_rxpciq);
 

-       return 0;
-
-qcount_update_fail:
-       octeon_free_soft_command(oct, sc);
+       WRITE_ONCE(sc->caller_is_done, true);

 
 

-       return -1;
+       return 0;

 }
 
 static int lio_reset_queues(struct net_device *netdev, uint32_t num_qs)
 }
 
 static int lio_reset_queues(struct net_device *netdev, uint32_t num_qs)


@@ -2012,34 +1962,11 @@ static int lio_vf_get_sset_count(struct net_device *netdev, int sset)
        }
 }
 
        }
 }
 

-/* Callback function for intrmod */
-static void octnet_intrmod_callback(struct octeon_device *oct_dev,
-                                   u32 status,
-                                   void *ptr)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)ptr;
-       struct oct_intrmod_context *ctx;
-
-       ctx  = (struct oct_intrmod_context *)sc->ctxptr;
-
-       ctx->status = status;
-
-       WRITE_ONCE(ctx->cond, 1);
-
-       /* This barrier is required to be sure that the response has been
-        * written fully before waking up the handler
-        */
-       wmb();
-
-       wake_up_interruptible(&ctx->wc);
-}
-

 /*  get interrupt moderation parameters */
 static int octnet_get_intrmod_cfg(struct lio *lio,
                                  struct oct_intrmod_cfg *intr_cfg)
 {
        struct octeon_soft_command *sc;
 /*  get interrupt moderation parameters */
 static int octnet_get_intrmod_cfg(struct lio *lio,
                                  struct oct_intrmod_cfg *intr_cfg)
 {
        struct octeon_soft_command *sc;

-       struct oct_intrmod_context *ctx;

        struct oct_intrmod_resp *resp;
        int retval;
        struct octeon_device *oct_dev = lio->oct_dev;
        struct oct_intrmod_resp *resp;
        int retval;
        struct octeon_device *oct_dev = lio->oct_dev;


@@ -2048,8 +1975,7 @@ static int octnet_get_intrmod_cfg(struct lio *lio,
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          0,
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          0,

-                                         sizeof(struct oct_intrmod_resp),
-                                         sizeof(struct oct_intrmod_context));
+                                         sizeof(struct oct_intrmod_resp), 0);

 
        if (!sc)
                return -ENOMEM;
 
        if (!sc)
                return -ENOMEM;


@@ -2057,20 +1983,13 @@ static int octnet_get_intrmod_cfg(struct lio *lio,
        resp = (struct oct_intrmod_resp *)sc->virtrptr;
        memset(resp, 0, sizeof(struct oct_intrmod_resp));
 
        resp = (struct oct_intrmod_resp *)sc->virtrptr;
        memset(resp, 0, sizeof(struct oct_intrmod_resp));
 

-       ctx = (struct oct_intrmod_context *)sc->ctxptr;
-       memset(ctx, 0, sizeof(struct oct_intrmod_context));
-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct_dev);
-       init_waitqueue_head(&ctx->wc);
-

        sc->iq_no = lio->linfo.txpciq[0].s.q_no;
 
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC,
                                    OPCODE_NIC_INTRMOD_PARAMS, 0, 0, 0);
 
        sc->iq_no = lio->linfo.txpciq[0].s.q_no;
 
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC,
                                    OPCODE_NIC_INTRMOD_PARAMS, 0, 0, 0);
 

-       sc->callback = octnet_intrmod_callback;
-       sc->callback_arg = sc;
-       sc->wait_time = 1000;
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct_dev, sc);
        if (retval == IQ_SEND_FAILED) {
 
        retval = octeon_send_soft_command(oct_dev, sc);
        if (retval == IQ_SEND_FAILED) {


@@ -2081,32 +2000,23 @@ static int octnet_get_intrmod_cfg(struct lio *lio,
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */

-       if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) {
-               dev_err(&oct_dev->pci_dev->dev, "Wait interrupted\n");
-               goto intrmod_info_wait_intr;
-       }
+       retval = wait_for_sc_completion_timeout(oct_dev, sc, 0);
+       if (retval)
+               return -ENODEV;

 
 

-       retval = ctx->status || resp->status;
-       if (retval) {
+       if (resp->status) {

                dev_err(&oct_dev->pci_dev->dev,
                        "Get interrupt moderation parameters failed\n");
                dev_err(&oct_dev->pci_dev->dev,
                        "Get interrupt moderation parameters failed\n");

-               goto intrmod_info_wait_fail;
+               WRITE_ONCE(sc->caller_is_done, true);
+               return -ENODEV;

        }
 
        octeon_swap_8B_data((u64 *)&resp->intrmod,
                            (sizeof(struct oct_intrmod_cfg)) / 8);
        memcpy(intr_cfg, &resp->intrmod, sizeof(struct oct_intrmod_cfg));
        }
 
        octeon_swap_8B_data((u64 *)&resp->intrmod,
                            (sizeof(struct oct_intrmod_cfg)) / 8);
        memcpy(intr_cfg, &resp->intrmod, sizeof(struct oct_intrmod_cfg));

-       octeon_free_soft_command(oct_dev, sc);
+       WRITE_ONCE(sc->caller_is_done, true);

 
        return 0;
 
        return 0;

-
-intrmod_info_wait_fail:
-
-       octeon_free_soft_command(oct_dev, sc);
-
-intrmod_info_wait_intr:
-
-       return -ENODEV;

 }
 
 /*  Configure interrupt moderation parameters */
 }
 
 /*  Configure interrupt moderation parameters */


@@ -2114,7 +2024,6 @@ static int octnet_set_intrmod_cfg(struct lio *lio,
                                  struct oct_intrmod_cfg *intr_cfg)
 {
        struct octeon_soft_command *sc;
                                  struct oct_intrmod_cfg *intr_cfg)
 {
        struct octeon_soft_command *sc;

-       struct oct_intrmod_context *ctx;

        struct oct_intrmod_cfg *cfg;
        int retval;
        struct octeon_device *oct_dev = lio->oct_dev;
        struct oct_intrmod_cfg *cfg;
        int retval;
        struct octeon_device *oct_dev = lio->oct_dev;


@@ -2123,18 +2032,11 @@ static int octnet_set_intrmod_cfg(struct lio *lio,
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          sizeof(struct oct_intrmod_cfg),
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct_dev,
                                          sizeof(struct oct_intrmod_cfg),

-                                         0,
-                                         sizeof(struct oct_intrmod_context));
+                                         16, 0);

 
        if (!sc)
                return -ENOMEM;
 
 
        if (!sc)
                return -ENOMEM;
 

-       ctx = (struct oct_intrmod_context *)sc->ctxptr;
-
-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct_dev);
-       init_waitqueue_head(&ctx->wc);
-

        cfg = (struct oct_intrmod_cfg *)sc->virtdptr;
 
        memcpy(cfg, intr_cfg, sizeof(struct oct_intrmod_cfg));
        cfg = (struct oct_intrmod_cfg *)sc->virtdptr;
 
        memcpy(cfg, intr_cfg, sizeof(struct oct_intrmod_cfg));


@@ -2145,9 +2047,8 @@ static int octnet_set_intrmod_cfg(struct lio *lio,
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC,
                                    OPCODE_NIC_INTRMOD_CFG, 0, 0, 0);
 
        octeon_prepare_soft_command(oct_dev, sc, OPCODE_NIC,
                                    OPCODE_NIC_INTRMOD_CFG, 0, 0, 0);
 

-       sc->callback = octnet_intrmod_callback;
-       sc->callback_arg = sc;
-       sc->wait_time = 1000;
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct_dev, sc);
        if (retval == IQ_SEND_FAILED) {
 
        retval = octeon_send_soft_command(oct_dev, sc);
        if (retval == IQ_SEND_FAILED) {


@@ -2158,26 +2059,24 @@ static int octnet_set_intrmod_cfg(struct lio *lio,
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */
        /* Sleep on a wait queue till the cond flag indicates that the
         * response arrived or timed-out.
         */

-       if (sleep_cond(&ctx->wc, &ctx->cond) != -EINTR) {
-               retval = ctx->status;
-               if (retval)
-                       dev_err(&oct_dev->pci_dev->dev,
-                               "intrmod config failed. Status: %llx\n",
-                               CVM_CAST64(retval));
-               else
-                       dev_info(&oct_dev->pci_dev->dev,
-                                "Rx-Adaptive Interrupt moderation %s\n",
-                                (intr_cfg->rx_enable) ?
-                                "enabled" : "disabled");
-
-               octeon_free_soft_command(oct_dev, sc);
-
-               return ((retval) ? -ENODEV : 0);
+       retval = wait_for_sc_completion_timeout(oct_dev, sc, 0);
+       if (retval)
+               return retval;
+
+       retval = sc->sc_status;
+       if (retval == 0) {
+               dev_info(&oct_dev->pci_dev->dev,
+                        "Rx-Adaptive Interrupt moderation %s\n",
+                        (intr_cfg->rx_enable) ?
+                        "enabled" : "disabled");
+               WRITE_ONCE(sc->caller_is_done, true);
+               return 0;

        }
 
        }
 

-       dev_err(&oct_dev->pci_dev->dev, "iq/oq config failed\n");
-
-       return -EINTR;
+       dev_err(&oct_dev->pci_dev->dev,
+               "intrmod config failed. Status: %x\n", retval);
+       WRITE_ONCE(sc->caller_is_done, true);
+       return -ENODEV;

 }
 
 static int lio_get_intr_coalesce(struct net_device *netdev,
 }
 
 static int lio_get_intr_coalesce(struct net_device *netdev,

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 9c5a53d74dd1bf5c2076918eed4abe2f4678c9e8..ed5fc6ec11ec56f73a5c37dcc37f2f93f7ca1c15 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -99,14 +99,6 @@ struct lio_trusted_vf_ctx {
        int status;
 };
 
        int status;
 };
 

-struct liquidio_rx_ctl_context {
-       int octeon_id;
-
-       wait_queue_head_t wc;
-
-       int cond;
-};
-

 struct oct_link_status_resp {
        u64 rh;
        struct oct_link_info link_info;
 struct oct_link_status_resp {
        u64 rh;
        struct oct_link_info link_info;


@@ -641,26 +633,6 @@ static inline void update_link_status(struct net_device *netdev,
        }
 }
 
        }
 }
 

-/**
- * lio_sync_octeon_time_cb - callback that is invoked when soft command
- * sent by lio_sync_octeon_time() has completed successfully or failed
- *
- * @oct - octeon device structure
- * @status - indicates success or failure
- * @buf - pointer to the command that was sent to firmware
- **/
-static void lio_sync_octeon_time_cb(struct octeon_device *oct,
-                                   u32 status, void *buf)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-
-       if (status)
-               dev_err(&oct->pci_dev->dev,
-                       "Failed to sync time to octeon; error=%d\n", status);
-
-       octeon_free_soft_command(oct, sc);
-}
-

 /**
  * lio_sync_octeon_time - send latest localtime to octeon firmware so that
  * firmware will correct it's time, in case there is a time skew
 /**
  * lio_sync_octeon_time - send latest localtime to octeon firmware so that
  * firmware will correct it's time, in case there is a time skew


@@ -677,7 +649,7 @@ static void lio_sync_octeon_time(struct work_struct *work)
        struct lio_time *lt;
        int ret;
 
        struct lio_time *lt;
        int ret;
 

-       sc = octeon_alloc_soft_command(oct, sizeof(struct lio_time), 0, 0);
+       sc = octeon_alloc_soft_command(oct, sizeof(struct lio_time), 16, 0);

        if (!sc) {
                dev_err(&oct->pci_dev->dev,
                        "Failed to sync time to octeon: soft command allocation failed\n");
        if (!sc) {
                dev_err(&oct->pci_dev->dev,
                        "Failed to sync time to octeon: soft command allocation failed\n");


@@ -696,15 +668,16 @@ static void lio_sync_octeon_time(struct work_struct *work)
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_SYNC_OCTEON_TIME, 0, 0, 0);
 
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_SYNC_OCTEON_TIME, 0, 0, 0);
 

-       sc->callback = lio_sync_octeon_time_cb;
-       sc->callback_arg = sc;
-       sc->wait_time = 1000;
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        ret = octeon_send_soft_command(oct, sc);
        if (ret == IQ_SEND_FAILED) {
                dev_err(&oct->pci_dev->dev,
                        "Failed to sync time to octeon: failed to send soft command\n");
                octeon_free_soft_command(oct, sc);
 
        ret = octeon_send_soft_command(oct, sc);
        if (ret == IQ_SEND_FAILED) {
                dev_err(&oct->pci_dev->dev,
                        "Failed to sync time to octeon: failed to send soft command\n");
                octeon_free_soft_command(oct, sc);

+       } else {
+               WRITE_ONCE(sc->caller_is_done, true);

        }
 
        queue_delayed_work(lio->sync_octeon_time_wq.wq,
        }
 
        queue_delayed_work(lio->sync_octeon_time_wq.wq,


@@ -1202,34 +1175,6 @@ static void octeon_destroy_resources(struct octeon_device *oct)
        tasklet_kill(&oct_priv->droq_tasklet);
 }
 
        tasklet_kill(&oct_priv->droq_tasklet);
 }
 

-/**
- * \brief Callback for rx ctrl
- * @param status status of request
- * @param buf pointer to resp structure
- */
-static void rx_ctl_callback(struct octeon_device *oct,
-                           u32 status,
-                           void *buf)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-       struct liquidio_rx_ctl_context *ctx;
-
-       ctx  = (struct liquidio_rx_ctl_context *)sc->ctxptr;
-
-       oct = lio_get_device(ctx->octeon_id);
-       if (status)
-               dev_err(&oct->pci_dev->dev, "rx ctl instruction failed. Status: %llx\n",
-                       CVM_CAST64(status));
-       WRITE_ONCE(ctx->cond, 1);
-
-       /* This barrier is required to be sure that the response has been
-        * written fully before waking up the handler
-        */
-       wmb();
-
-       wake_up_interruptible(&ctx->wc);
-}
-

 /**
  * \brief Send Rx control command
  * @param lio per-network private data
 /**
  * \brief Send Rx control command
  * @param lio per-network private data


@@ -1238,9 +1183,7 @@ static void rx_ctl_callback(struct octeon_device *oct,
 static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 {
        struct octeon_soft_command *sc;
 static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 {
        struct octeon_soft_command *sc;

-       struct liquidio_rx_ctl_context *ctx;

        union octnet_cmd *ncmd;
        union octnet_cmd *ncmd;

-       int ctx_size = sizeof(struct liquidio_rx_ctl_context);

        struct octeon_device *oct = (struct octeon_device *)lio->oct_dev;
        int retval;
 
        struct octeon_device *oct = (struct octeon_device *)lio->oct_dev;
        int retval;
 


@@ -1249,14 +1192,9 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,

-                                         16, ctx_size);
+                                         16, 0);

 
        ncmd = (union octnet_cmd *)sc->virtdptr;
 
        ncmd = (union octnet_cmd *)sc->virtdptr;

-       ctx  = (struct liquidio_rx_ctl_context *)sc->ctxptr;
-
-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct);
-       init_waitqueue_head(&ctx->wc);

 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_RX_CTL;
 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_RX_CTL;


@@ -1269,23 +1207,25 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 

-       sc->callback = rx_ctl_callback;
-       sc->callback_arg = sc;
-       sc->wait_time = 5000;
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to send RX Control message\n");
 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to send RX Control message\n");

+               octeon_free_soft_command(oct, sc);
+               return;

        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */
        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */

-               if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR)
+               retval = wait_for_sc_completion_timeout(oct, sc, 0);
+               if (retval)

                        return;
                        return;

+

                oct->props[lio->ifidx].rx_on = start_stop;
                oct->props[lio->ifidx].rx_on = start_stop;

+               WRITE_ONCE(sc->caller_is_done, true);

        }
        }

-
-       octeon_free_soft_command(oct, sc);

 }
 
 /**
 }
 
 /**


@@ -3336,7 +3276,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
        unsigned long micro;
        u32 cur_ver;
        struct octeon_soft_command *sc;
        unsigned long micro;
        u32 cur_ver;
        struct octeon_soft_command *sc;

-       struct liquidio_if_cfg_context *ctx;

        struct liquidio_if_cfg_resp *resp;
        struct octdev_props *props;
        int retval, num_iqueues, num_oqueues;
        struct liquidio_if_cfg_resp *resp;
        struct octdev_props *props;
        int retval, num_iqueues, num_oqueues;


@@ -3344,7 +3283,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
        union oct_nic_if_cfg if_cfg;
        unsigned int base_queue;
        unsigned int gmx_port_id;
        union oct_nic_if_cfg if_cfg;
        unsigned int base_queue;
        unsigned int gmx_port_id;

-       u32 resp_size, ctx_size, data_size;
+       u32 resp_size, data_size;

        u32 ifidx_or_pfnum;
        struct lio_version *vdata;
        struct devlink *devlink;
        u32 ifidx_or_pfnum;
        struct lio_version *vdata;
        struct devlink *devlink;


@@ -3369,13 +3308,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
        for (i = 0; i < octeon_dev->ifcount; i++) {
                resp_size = sizeof(struct liquidio_if_cfg_resp);
 
        for (i = 0; i < octeon_dev->ifcount; i++) {
                resp_size = sizeof(struct liquidio_if_cfg_resp);

-               ctx_size = sizeof(struct liquidio_if_cfg_context);

                data_size = sizeof(struct lio_version);
                sc = (struct octeon_soft_command *)
                        octeon_alloc_soft_command(octeon_dev, data_size,
                data_size = sizeof(struct lio_version);
                sc = (struct octeon_soft_command *)
                        octeon_alloc_soft_command(octeon_dev, data_size,

-                                                 resp_size, ctx_size);
+                                                 resp_size, 0);

                resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;
                resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

-               ctx  = (struct liquidio_if_cfg_context *)sc->ctxptr;

                vdata = (struct lio_version *)sc->virtdptr;
 
                *((u64 *)vdata) = 0;
                vdata = (struct lio_version *)sc->virtdptr;
 
                *((u64 *)vdata) = 0;


@@ -3405,9 +3342,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "requesting config for interface %d, iqs %d, oqs %d\n",
                        ifidx_or_pfnum, num_iqueues, num_oqueues);
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "requesting config for interface %d, iqs %d, oqs %d\n",
                        ifidx_or_pfnum, num_iqueues, num_oqueues);

-               WRITE_ONCE(ctx->cond, 0);
-               ctx->octeon_id = lio_get_device_id(octeon_dev);
-               init_waitqueue_head(&ctx->wc);

 
                if_cfg.u64 = 0;
                if_cfg.s.num_iqueues = num_iqueues;
 
                if_cfg.u64 = 0;
                if_cfg.s.num_iqueues = num_iqueues;


@@ -3421,9 +3355,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                            OPCODE_NIC_IF_CFG, 0,
                                            if_cfg.u64, 0);
 
                                            OPCODE_NIC_IF_CFG, 0,
                                            if_cfg.u64, 0);
 

-               sc->callback = lio_if_cfg_callback;
-               sc->callback_arg = sc;
-               sc->wait_time = LIO_IFCFG_WAIT_TIME;
+               init_completion(&sc->complete);
+               sc->sc_status = OCTEON_REQUEST_PENDING;

 
                retval = octeon_send_soft_command(octeon_dev, sc);
                if (retval == IQ_SEND_FAILED) {
 
                retval = octeon_send_soft_command(octeon_dev, sc);
                if (retval == IQ_SEND_FAILED) {


@@ -3431,22 +3364,26 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                "iq/oq config failed status: %x\n",
                                retval);
                        /* Soft instr is freed by driver in case of failure. */
                                "iq/oq config failed status: %x\n",
                                retval);
                        /* Soft instr is freed by driver in case of failure. */

-                       goto setup_nic_dev_fail;
+                       octeon_free_soft_command(octeon_dev, sc);
+                       return(-EIO);

                }
 
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */
                }
 
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */

-               if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) {
-                       dev_err(&octeon_dev->pci_dev->dev, "Wait interrupted\n");
-                       goto setup_nic_wait_intr;
-               }
+               retval = wait_for_sc_completion_timeout(octeon_dev, sc, 0);
+               if (retval)
+                       return retval;

 
                retval = resp->status;
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev, "iq/oq config failed\n");
 
                retval = resp->status;
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev, "iq/oq config failed\n");

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                }
                }

+               snprintf(octeon_dev->fw_info.liquidio_firmware_version,
+                        32, "%s",
+                        resp->cfg_info.liquidio_firmware_version);

 
                /* Verify f/w version (in case of 'auto' loading from flash) */
                fw_ver = octeon_dev->fw_info.liquidio_firmware_version;
 
                /* Verify f/w version (in case of 'auto' loading from flash) */
                fw_ver = octeon_dev->fw_info.liquidio_firmware_version;


@@ -3456,7 +3393,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Unmatched firmware version. Expected %s.x, got %s.\n",
                                LIQUIDIO_BASE_VERSION, fw_ver);
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Unmatched firmware version. Expected %s.x, got %s.\n",
                                LIQUIDIO_BASE_VERSION, fw_ver);

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                } else if (atomic_read(octeon_dev->adapter_fw_state) ==
                           FW_IS_PRELOADED) {
                        dev_info(&octeon_dev->pci_dev->dev,
                } else if (atomic_read(octeon_dev->adapter_fw_state) ==
                           FW_IS_PRELOADED) {
                        dev_info(&octeon_dev->pci_dev->dev,


@@ -3483,7 +3421,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                "Got bad iqueues (%016llx) or oqueues (%016llx) from firmware.\n",
                                resp->cfg_info.iqmask,
                                resp->cfg_info.oqmask);
                                "Got bad iqueues (%016llx) or oqueues (%016llx) from firmware.\n",
                                resp->cfg_info.iqmask,
                                resp->cfg_info.oqmask);

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                }
 
                if (OCTEON_CN6XXX(octeon_dev)) {
                }
 
                if (OCTEON_CN6XXX(octeon_dev)) {


@@ -3502,7 +3441,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
                if (!netdev) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device allocation failed\n");
 
                if (!netdev) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device allocation failed\n");

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                }
 
                SET_NETDEV_DEV(netdev, &octeon_dev->pci_dev->dev);
                }
 
                SET_NETDEV_DEV(netdev, &octeon_dev->pci_dev->dev);


@@ -3517,14 +3457,16 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "setting real number rx failed\n");
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "setting real number rx failed\n");

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_free;

                }
 
                retval = netif_set_real_num_tx_queues(netdev, num_iqueues);
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "setting real number tx failed\n");
                }
 
                retval = netif_set_real_num_tx_queues(netdev, num_iqueues);
                if (retval) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "setting real number tx failed\n");

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_free;

                }
 
                lio = GET_LIO(netdev);
                }
 
                lio = GET_LIO(netdev);


@@ -3551,6 +3493,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                lio->linfo.gmxport = resp->cfg_info.linfo.gmxport;
                lio->linfo.link.u64 = resp->cfg_info.linfo.link.u64;
 
                lio->linfo.gmxport = resp->cfg_info.linfo.gmxport;
                lio->linfo.link.u64 = resp->cfg_info.linfo.link.u64;
 

+               WRITE_ONCE(sc->caller_is_done, true);
+

                lio->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
 
                if (OCTEON_CN23XX_PF(octeon_dev) ||
                lio->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
 
                if (OCTEON_CN23XX_PF(octeon_dev) ||


@@ -3617,7 +3561,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                dev_err(&octeon_dev->pci_dev->dev,
                                        "Error setting VF%d MAC address\n",
                                        j);
                                dev_err(&octeon_dev->pci_dev->dev,
                                        "Error setting VF%d MAC address\n",
                                        j);

-                               goto setup_nic_dev_fail;
+                               goto setup_nic_dev_free;

                        }
                }
 
                        }
                }
 


@@ -3639,7 +3583,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                             lio->linfo.num_txpciq,
                                             lio->linfo.num_rxpciq)) {
                        dev_err(&octeon_dev->pci_dev->dev, "I/O queues creation failed\n");
                                             lio->linfo.num_txpciq,
                                             lio->linfo.num_rxpciq)) {
                        dev_err(&octeon_dev->pci_dev->dev, "I/O queues creation failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                ifstate_set(lio, LIO_IFSTATE_DROQ_OPS);
                }
 
                ifstate_set(lio, LIO_IFSTATE_DROQ_OPS);


@@ -3650,7 +3594,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                if (lio_setup_glists(octeon_dev, lio, num_iqueues)) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Gather list allocation failed\n");
                if (lio_setup_glists(octeon_dev, lio, num_iqueues)) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Gather list allocation failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                /* Register ethtool support */
                }
 
                /* Register ethtool support */


@@ -3672,20 +3616,20 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                             OCTNET_CMD_VERBOSE_ENABLE, 0);
 
                if (setup_link_status_change_wq(netdev))
                                             OCTNET_CMD_VERBOSE_ENABLE, 0);
 
                if (setup_link_status_change_wq(netdev))

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

 
                if ((octeon_dev->fw_info.app_cap_flags &
                     LIQUIDIO_TIME_SYNC_CAP) &&
                    setup_sync_octeon_time_wq(netdev))
 
                if ((octeon_dev->fw_info.app_cap_flags &
                     LIQUIDIO_TIME_SYNC_CAP) &&
                    setup_sync_octeon_time_wq(netdev))

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

 
                if (setup_rx_oom_poll_fn(netdev))
 
                if (setup_rx_oom_poll_fn(netdev))

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

 
                /* Register the network device with the OS */
                if (register_netdev(netdev)) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device registration failed\n");
 
                /* Register the network device with the OS */
                if (register_netdev(netdev)) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device registration failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                dev_dbg(&octeon_dev->pci_dev->dev,
                }
 
                dev_dbg(&octeon_dev->pci_dev->dev,


@@ -3708,8 +3652,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup successful\n", i);
 
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup successful\n", i);
 

-               octeon_free_soft_command(octeon_dev, sc);
-

                if (octeon_dev->subsystem_id ==
                        OCTEON_CN2350_25GB_SUBSYS_ID ||
                    octeon_dev->subsystem_id ==
                if (octeon_dev->subsystem_id ==
                        OCTEON_CN2350_25GB_SUBSYS_ID ||
                    octeon_dev->subsystem_id ==


@@ -3743,7 +3685,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                sizeof(struct lio_devlink_priv));
        if (!devlink) {
                dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n");
                                sizeof(struct lio_devlink_priv));
        if (!devlink) {
                dev_err(&octeon_dev->pci_dev->dev, "devlink alloc failed\n");

-               goto setup_nic_wait_intr;
+               goto setup_nic_dev_free;

        }
 
        lio_devlink = devlink_priv(devlink);
        }
 
        lio_devlink = devlink_priv(devlink);


@@ -3753,7 +3695,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                devlink_free(devlink);
                dev_err(&octeon_dev->pci_dev->dev,
                        "devlink registration failed\n");
                devlink_free(devlink);
                dev_err(&octeon_dev->pci_dev->dev,
                        "devlink registration failed\n");

-               goto setup_nic_wait_intr;
+               goto setup_nic_dev_free;

        }
 
        octeon_dev->devlink = devlink;
        }
 
        octeon_dev->devlink = devlink;


@@ -3761,17 +3703,16 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
        return 0;
 
 
        return 0;
 

-setup_nic_dev_fail:
-
-       octeon_free_soft_command(octeon_dev, sc);
-
-setup_nic_wait_intr:
+setup_nic_dev_free:

 
        while (i--) {
                dev_err(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup failed\n", i);
                liquidio_destroy_nic_device(octeon_dev, i);
        }
 
        while (i--) {
                dev_err(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup failed\n", i);
                liquidio_destroy_nic_device(octeon_dev, i);
        }

+
+setup_nic_dev_done:
+

        return -ENODEV;
 }
 
        return -ENODEV;
 }
 

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
index f6bed6ebb3447dbd89a801974da492bb8aee8825..9c267b4c774d8f3c80f41fefcf07b1698ab2ccc9 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_main.c
@@ -40,14 +40,6 @@ MODULE_PARM_DESC(debug, "NETIF_MSG debug bits");
 
 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
 
 
 #define DEFAULT_MSG_ENABLE (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK)
 

-struct liquidio_rx_ctl_context {
-       int octeon_id;
-
-       wait_queue_head_t wc;
-
-       int cond;
-};
-

 struct oct_timestamp_resp {
        u64 rh;
        u64 timestamp;
 struct oct_timestamp_resp {
        u64 rh;
        u64 timestamp;


@@ -597,33 +589,6 @@ static void octeon_destroy_resources(struct octeon_device *oct)
        }
 }
 
        }
 }
 

-/**
- * \brief Callback for rx ctrl
- * @param status status of request
- * @param buf pointer to resp structure
- */
-static void rx_ctl_callback(struct octeon_device *oct,
-                           u32 status, void *buf)
-{
-       struct octeon_soft_command *sc = (struct octeon_soft_command *)buf;
-       struct liquidio_rx_ctl_context *ctx;
-
-       ctx  = (struct liquidio_rx_ctl_context *)sc->ctxptr;
-
-       oct = lio_get_device(ctx->octeon_id);
-       if (status)
-               dev_err(&oct->pci_dev->dev, "rx ctl instruction failed. Status: %llx\n",
-                       CVM_CAST64(status));
-       WRITE_ONCE(ctx->cond, 1);
-
-       /* This barrier is required to be sure that the response has been
-        * written fully before waking up the handler
-        */
-       wmb();
-
-       wake_up_interruptible(&ctx->wc);
-}
-

 /**
  * \brief Send Rx control command
  * @param lio per-network private data
 /**
  * \brief Send Rx control command
  * @param lio per-network private data


@@ -632,8 +597,6 @@ static void rx_ctl_callback(struct octeon_device *oct,
 static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 {
        struct octeon_device *oct = (struct octeon_device *)lio->oct_dev;
 static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 {
        struct octeon_device *oct = (struct octeon_device *)lio->oct_dev;

-       int ctx_size = sizeof(struct liquidio_rx_ctl_context);
-       struct liquidio_rx_ctl_context *ctx;

        struct octeon_soft_command *sc;
        union octnet_cmd *ncmd;
        int retval;
        struct octeon_soft_command *sc;
        union octnet_cmd *ncmd;
        int retval;


@@ -643,14 +606,9 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,
 
        sc = (struct octeon_soft_command *)
                octeon_alloc_soft_command(oct, OCTNET_CMD_SIZE,

-                                         16, ctx_size);
+                                         16, 0);

 
        ncmd = (union octnet_cmd *)sc->virtdptr;
 
        ncmd = (union octnet_cmd *)sc->virtdptr;

-       ctx  = (struct liquidio_rx_ctl_context *)sc->ctxptr;
-
-       WRITE_ONCE(ctx->cond, 0);
-       ctx->octeon_id = lio_get_device_id(oct);
-       init_waitqueue_head(&ctx->wc);

 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_RX_CTL;
 
        ncmd->u64 = 0;
        ncmd->s.cmd = OCTNET_CMD_RX_CTL;


@@ -663,23 +621,24 @@ static void send_rx_ctrl_cmd(struct lio *lio, int start_stop)
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 
        octeon_prepare_soft_command(oct, sc, OPCODE_NIC,
                                    OPCODE_NIC_CMD, 0, 0, 0);
 

-       sc->callback = rx_ctl_callback;
-       sc->callback_arg = sc;
-       sc->wait_time = 5000;
+       init_completion(&sc->complete);
+       sc->sc_status = OCTEON_REQUEST_PENDING;

 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to send RX Control message\n");
 
        retval = octeon_send_soft_command(oct, sc);
        if (retval == IQ_SEND_FAILED) {
                netif_info(lio, rx_err, lio->netdev, "Failed to send RX Control message\n");

+               octeon_free_soft_command(oct, sc);

        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */
        } else {
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */

-               if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR)
+               retval = wait_for_sc_completion_timeout(oct, sc, 0);
+               if (retval)

                        return;
                        return;

+

                oct->props[lio->ifidx].rx_on = start_stop;
                oct->props[lio->ifidx].rx_on = start_stop;

+               WRITE_ONCE(sc->caller_is_done, true);

        }
        }

-
-       octeon_free_soft_command(oct, sc);

 }
 
 /**
 }
 
 /**


@@ -1938,8 +1897,7 @@ nic_info_err:
 static int setup_nic_devices(struct octeon_device *octeon_dev)
 {
        int retval, num_iqueues, num_oqueues;
 static int setup_nic_devices(struct octeon_device *octeon_dev)
 {
        int retval, num_iqueues, num_oqueues;

-       struct liquidio_if_cfg_context *ctx;
-       u32 resp_size, ctx_size, data_size;
+       u32 resp_size, data_size;

        struct liquidio_if_cfg_resp *resp;
        struct octeon_soft_command *sc;
        union oct_nic_if_cfg if_cfg;
        struct liquidio_if_cfg_resp *resp;
        struct octeon_soft_command *sc;
        union oct_nic_if_cfg if_cfg;


@@ -1970,13 +1928,11 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
        for (i = 0; i < octeon_dev->ifcount; i++) {
                resp_size = sizeof(struct liquidio_if_cfg_resp);
 
        for (i = 0; i < octeon_dev->ifcount; i++) {
                resp_size = sizeof(struct liquidio_if_cfg_resp);

-               ctx_size = sizeof(struct liquidio_if_cfg_context);

                data_size = sizeof(struct lio_version);
                sc = (struct octeon_soft_command *)
                        octeon_alloc_soft_command(octeon_dev, data_size,
                data_size = sizeof(struct lio_version);
                sc = (struct octeon_soft_command *)
                        octeon_alloc_soft_command(octeon_dev, data_size,

-                                                 resp_size, ctx_size);
+                                                 resp_size, 0);

                resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;
                resp = (struct liquidio_if_cfg_resp *)sc->virtrptr;

-               ctx  = (struct liquidio_if_cfg_context *)sc->ctxptr;

                vdata = (struct lio_version *)sc->virtdptr;
 
                *((u64 *)vdata) = 0;
                vdata = (struct lio_version *)sc->virtdptr;
 
                *((u64 *)vdata) = 0;


@@ -1984,10 +1940,6 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                vdata->minor = cpu_to_be16(LIQUIDIO_BASE_MINOR_VERSION);
                vdata->micro = cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION);
 
                vdata->minor = cpu_to_be16(LIQUIDIO_BASE_MINOR_VERSION);
                vdata->micro = cpu_to_be16(LIQUIDIO_BASE_MICRO_VERSION);
 

-               WRITE_ONCE(ctx->cond, 0);
-               ctx->octeon_id = lio_get_device_id(octeon_dev);
-               init_waitqueue_head(&ctx->wc);
-

                if_cfg.u64 = 0;
 
                if_cfg.s.num_iqueues = octeon_dev->sriov_info.rings_per_vf;
                if_cfg.u64 = 0;
 
                if_cfg.s.num_iqueues = octeon_dev->sriov_info.rings_per_vf;


@@ -2000,32 +1952,37 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                            OPCODE_NIC_IF_CFG, 0, if_cfg.u64,
                                            0);
 
                                            OPCODE_NIC_IF_CFG, 0, if_cfg.u64,
                                            0);
 

-               sc->callback = lio_if_cfg_callback;
-               sc->callback_arg = sc;
-               sc->wait_time = 5000;
+               init_completion(&sc->complete);
+               sc->sc_status = OCTEON_REQUEST_PENDING;

 
                retval = octeon_send_soft_command(octeon_dev, sc);
                if (retval == IQ_SEND_FAILED) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "iq/oq config failed status: %x\n", retval);
                        /* Soft instr is freed by driver in case of failure. */
 
                retval = octeon_send_soft_command(octeon_dev, sc);
                if (retval == IQ_SEND_FAILED) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "iq/oq config failed status: %x\n", retval);
                        /* Soft instr is freed by driver in case of failure. */

-                       goto setup_nic_dev_fail;
+                       octeon_free_soft_command(octeon_dev, sc);
+                       return(-EIO);

                }
 
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */
                }
 
                /* Sleep on a wait queue till the cond flag indicates that the
                 * response arrived or timed-out.
                 */

-               if (sleep_cond(&ctx->wc, &ctx->cond) == -EINTR) {
-                       dev_err(&octeon_dev->pci_dev->dev, "Wait interrupted\n");
-                       goto setup_nic_wait_intr;
-               }
+               retval = wait_for_sc_completion_timeout(octeon_dev, sc, 0);
+               if (retval)
+                       return retval;

 
                retval = resp->status;
                if (retval) {
 
                retval = resp->status;
                if (retval) {

-                       dev_err(&octeon_dev->pci_dev->dev, "iq/oq config failed\n");
-                       goto setup_nic_dev_fail;
+                       dev_err(&octeon_dev->pci_dev->dev,
+                               "iq/oq config failed, retval = %d\n", retval);
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       return -EIO;

                }
 
                }
 

+               snprintf(octeon_dev->fw_info.liquidio_firmware_version,
+                        32, "%s",
+                        resp->cfg_info.liquidio_firmware_version);
+

                octeon_swap_8B_data((u64 *)(&resp->cfg_info),
                                    (sizeof(struct liquidio_if_cfg_info)) >> 3);
 
                octeon_swap_8B_data((u64 *)(&resp->cfg_info),
                                    (sizeof(struct liquidio_if_cfg_info)) >> 3);
 


@@ -2036,7 +1993,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Got bad iqueues (%016llx) or oqueues (%016llx) from firmware.\n",
                                resp->cfg_info.iqmask, resp->cfg_info.oqmask);
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Got bad iqueues (%016llx) or oqueues (%016llx) from firmware.\n",
                                resp->cfg_info.iqmask, resp->cfg_info.oqmask);

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                }
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "interface %d, iqmask %016llx, oqmask %016llx, numiqueues %d, numoqueues %d\n",
                }
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "interface %d, iqmask %016llx, oqmask %016llx, numiqueues %d, numoqueues %d\n",


@@ -2047,7 +2005,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
 
                if (!netdev) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device allocation failed\n");
 
                if (!netdev) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device allocation failed\n");

-                       goto setup_nic_dev_fail;
+                       WRITE_ONCE(sc->caller_is_done, true);
+                       goto setup_nic_dev_done;

                }
 
                SET_NETDEV_DEV(netdev, &octeon_dev->pci_dev->dev);
                }
 
                SET_NETDEV_DEV(netdev, &octeon_dev->pci_dev->dev);


@@ -2123,6 +2082,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                netdev->min_mtu = LIO_MIN_MTU_SIZE;
                netdev->max_mtu = LIO_MAX_MTU_SIZE;
 
                netdev->min_mtu = LIO_MIN_MTU_SIZE;
                netdev->max_mtu = LIO_MAX_MTU_SIZE;
 

+               WRITE_ONCE(sc->caller_is_done, true);
+

                /* Point to the  properties for octeon device to which this
                 * interface belongs.
                 */
                /* Point to the  properties for octeon device to which this
                 * interface belongs.
                 */


@@ -2146,7 +2107,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                             lio->linfo.num_txpciq,
                                             lio->linfo.num_rxpciq)) {
                        dev_err(&octeon_dev->pci_dev->dev, "I/O queues creation failed\n");
                                             lio->linfo.num_txpciq,
                                             lio->linfo.num_rxpciq)) {
                        dev_err(&octeon_dev->pci_dev->dev, "I/O queues creation failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                ifstate_set(lio, LIO_IFSTATE_DROQ_OPS);
                }
 
                ifstate_set(lio, LIO_IFSTATE_DROQ_OPS);


@@ -2169,7 +2130,7 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                if (lio_setup_glists(octeon_dev, lio, num_iqueues)) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Gather list allocation failed\n");
                if (lio_setup_glists(octeon_dev, lio, num_iqueues)) {
                        dev_err(&octeon_dev->pci_dev->dev,
                                "Gather list allocation failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                /* Register ethtool support */
                }
 
                /* Register ethtool support */


@@ -2184,15 +2145,15 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                                             OCTNIC_LROIPV4 | OCTNIC_LROIPV6);
 
                if (setup_link_status_change_wq(netdev))
                                             OCTNIC_LROIPV4 | OCTNIC_LROIPV6);
 
                if (setup_link_status_change_wq(netdev))

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

 
                if (setup_rx_oom_poll_fn(netdev))
 
                if (setup_rx_oom_poll_fn(netdev))

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

 
                /* Register the network device with the OS */
                if (register_netdev(netdev)) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device registration failed\n");
 
                /* Register the network device with the OS */
                if (register_netdev(netdev)) {
                        dev_err(&octeon_dev->pci_dev->dev, "Device registration failed\n");

-                       goto setup_nic_dev_fail;
+                       goto setup_nic_dev_free;

                }
 
                dev_dbg(&octeon_dev->pci_dev->dev,
                }
 
                dev_dbg(&octeon_dev->pci_dev->dev,


@@ -2215,24 +2176,21 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup successful\n", i);
 
                dev_dbg(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup successful\n", i);
 

-               octeon_free_soft_command(octeon_dev, sc);
-

                octeon_dev->no_speed_setting = 1;
        }
 
        return 0;
 
                octeon_dev->no_speed_setting = 1;
        }
 
        return 0;
 

-setup_nic_dev_fail:
-
-       octeon_free_soft_command(octeon_dev, sc);
-
-setup_nic_wait_intr:
+setup_nic_dev_free:

 
        while (i--) {
                dev_err(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup failed\n", i);
                liquidio_destroy_nic_device(octeon_dev, i);
        }
 
        while (i--) {
                dev_err(&octeon_dev->pci_dev->dev,
                        "NIC ifidx:%d Setup failed\n", i);
                liquidio_destroy_nic_device(octeon_dev, i);
        }

+
+setup_nic_dev_done:
+

        return -ENODEV;
 }
 
        return -ENODEV;
 }
 

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
index dfd4d10302385550e808f2e62bc6f8af2a2661e8..a9306164dbcdf20f10a87e8aaf4c8c601d2c49ad 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c
@@ -386,7 +386,7 @@ lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev)
        }
 
        sc = (struct octeon_soft_command *)
        }
 
        sc = (struct octeon_soft_command *)

-               octeon_alloc_soft_command(oct, 0, 0, 0);
+               octeon_alloc_soft_command(oct, 0, 16, 0);

        if (!sc) {
                dev_err(&oct->pci_dev->dev, "VF rep: Soft command alloc failed\n");
                goto xmit_failed;
        if (!sc) {
                dev_err(&oct->pci_dev->dev, "VF rep: Soft command alloc failed\n");
                goto xmit_failed;


@@ -395,6 +395,7 @@ lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev)
        /* Multiple buffers are not used for vf_rep packets. */
        if (skb_shinfo(skb)->nr_frags != 0) {
                dev_err(&oct->pci_dev->dev, "VF rep: nr_frags != 0. Dropping packet\n");
        /* Multiple buffers are not used for vf_rep packets. */
        if (skb_shinfo(skb)->nr_frags != 0) {
                dev_err(&oct->pci_dev->dev, "VF rep: nr_frags != 0. Dropping packet\n");

+               octeon_free_soft_command(oct, sc);

                goto xmit_failed;
        }
 
                goto xmit_failed;
        }
 


@@ -402,6 +403,7 @@ lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev)
                                     skb->data, skb->len, DMA_TO_DEVICE);
        if (dma_mapping_error(&oct->pci_dev->dev, sc->dmadptr)) {
                dev_err(&oct->pci_dev->dev, "VF rep: DMA mapping failed\n");
                                     skb->data, skb->len, DMA_TO_DEVICE);
        if (dma_mapping_error(&oct->pci_dev->dev, sc->dmadptr)) {
                dev_err(&oct->pci_dev->dev, "VF rep: DMA mapping failed\n");

+               octeon_free_soft_command(oct, sc);

                goto xmit_failed;
        }
 
                goto xmit_failed;
        }
 


@@ -422,6 +424,7 @@ lio_vf_rep_pkt_xmit(struct sk_buff *skb, struct net_device *ndev)
        if (status == IQ_SEND_FAILED) {
                dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr,
                                 sc->datasize, DMA_TO_DEVICE);
        if (status == IQ_SEND_FAILED) {
                dma_unmap_single(&oct->pci_dev->dev, sc->dmadptr,
                                 sc->datasize, DMA_TO_DEVICE);

+               octeon_free_soft_command(oct, sc);

                goto xmit_failed;
        }
 
                goto xmit_failed;
        }
 

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_config.h b/drivers/net/ethernet/cavium/liquidio/octeon_config.h
index 056dceb2a5584552c4a2703e2b0d2fe010ed14d3..24c21200121212041c9329710cfb583e3730ab09 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_config.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_config.h
@@ -438,6 +438,7 @@ struct octeon_config {
 #define  MAX_BAR1_IOREMAP_SIZE  (16 * OCTEON_BAR1_ENTRY_SIZE)
 
 /* Response lists - 1 ordered, 1 unordered-blocking, 1 unordered-nonblocking
 #define  MAX_BAR1_IOREMAP_SIZE  (16 * OCTEON_BAR1_ENTRY_SIZE)
 
 /* Response lists - 1 ordered, 1 unordered-blocking, 1 unordered-nonblocking

+ *                  1 process done list, 1 zombie lists(timeouted sc list)

  * NoResponse Lists are now maintained with each IQ. (Dec' 2007).
  */
 #define MAX_RESPONSE_LISTS           6
  * NoResponse Lists are now maintained with each IQ. (Dec' 2007).
  */
 #define MAX_RESPONSE_LISTS           6

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_iq.h b/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
index 3437d7f6acada247a90dd2c59bcea06cd386c333..a04f36a0e1a080eac4701ef67ec2a07bd6429876 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_iq.h
@@ -292,10 +292,7 @@ struct octeon_soft_command {
        u32  ctxsize;
 
        /** Time out and callback */
        u32  ctxsize;
 
        /** Time out and callback */

-       size_t wait_time;
-       size_t timeout;

        size_t expiry_time;
        size_t expiry_time;

-

        u32 iq_no;
        void (*callback)(struct octeon_device *, u32, void *);
        void *callback_arg;
        u32 iq_no;
        void (*callback)(struct octeon_device *, u32, void *);
        void *callback_arg;

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_main.h b/drivers/net/ethernet/cavium/liquidio/octeon_main.h
index de2a2290d5de6c8931ddd22a391ac62710fad4ea..38c055f3c213e6adce3d58fe9870b7056f200280 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_main.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_main.h
@@ -146,48 +146,6 @@ err_release_region:
        return 1;
 }
 
        return 1;
 }
 

-static inline int
-sleep_cond(wait_queue_head_t *wait_queue, int *condition)
-{
-       int errno = 0;
-       wait_queue_entry_t we;
-
-       init_waitqueue_entry(&we, current);
-       add_wait_queue(wait_queue, &we);
-       while (!(READ_ONCE(*condition))) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               if (signal_pending(current)) {
-                       errno = -EINTR;
-                       goto out;
-               }
-               schedule();
-       }
-out:
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(wait_queue, &we);
-       return errno;
-}
-
-/* Gives up the CPU for a timeout period.
- * Check that the condition is not true before we go to sleep for a
- * timeout period.
- */
-static inline void
-sleep_timeout_cond(wait_queue_head_t *wait_queue,
-                  int *condition,
-                  int timeout)
-{
-       wait_queue_entry_t we;
-
-       init_waitqueue_entry(&we, current);
-       add_wait_queue(wait_queue, &we);
-       set_current_state(TASK_INTERRUPTIBLE);
-       if (!(*condition))
-               schedule_timeout(timeout);
-       set_current_state(TASK_RUNNING);
-       remove_wait_queue(wait_queue, &we);
-}
-

 /* input parameter:
  * sc: pointer to a soft request
  * timeout: milli sec which an application wants to wait for the
 /* input parameter:
  * sc: pointer to a soft request
  * timeout: milli sec which an application wants to wait for the

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_network.h b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
index a62826a4e980804091ea072b8668f6369ed451b6..807266ef8f3ae8fdf27cf341d7ea02fb9f1b43db 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/octeon_network.h
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_network.h
@@ -35,12 +35,6 @@
 #define   LIO_IFSTATE_RX_TIMESTAMP_ENABLED 0x08
 #define   LIO_IFSTATE_RESETTING                   0x10
 
 #define   LIO_IFSTATE_RX_TIMESTAMP_ENABLED 0x08
 #define   LIO_IFSTATE_RESETTING                   0x10
 

-struct liquidio_if_cfg_context {
-       u32 octeon_id;
-       wait_queue_head_t wc;
-       int cond;
-};
-

 struct liquidio_if_cfg_resp {
        u64 rh;
        struct liquidio_if_cfg_info cfg_info;
 struct liquidio_if_cfg_resp {
        u64 rh;
        struct liquidio_if_cfg_info cfg_info;


@@ -228,10 +222,6 @@ int lio_wait_for_clean_oq(struct octeon_device *oct);
  */
 void liquidio_set_ethtool_ops(struct net_device *netdev);
 
  */
 void liquidio_set_ethtool_ops(struct net_device *netdev);
 

-void lio_if_cfg_callback(struct octeon_device *oct,
-                        u32 status __attribute__((unused)),
-                        void *buf);
-

 void lio_delete_glists(struct lio *lio);
 
 int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_qs);
 void lio_delete_glists(struct lio *lio);
 
 int lio_setup_glists(struct octeon_device *oct, struct lio *lio, int num_qs);