ibmvnic: Split initialization of scrqs to its own routine

Split the sending of capability request crqs and the initialization
of sub crqs into their own routines. This is a first step to moving
the allocation of sub-crqs out of interrupt context.

Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 51bf337bea7ac0e299d9d2f52ce30554408fff68..c2e260ce45bbac1b0da8d8fb7c3bc70118d8b16f 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -1678,48 +1678,20 @@ req_tx_irq_failed:
        return rc;
 }
 
-static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
+static int init_sub_crqs(struct ibmvnic_adapter *adapter)
 {
        struct device *dev = &adapter->vdev->dev;
        struct ibmvnic_sub_crq_queue **allqueues;
        int registered_queues = 0;
-       union ibmvnic_crq crq;
        int total_queues;
        int more = 0;
        int i;
 
-       if (!retry) {
-               /* Sub-CRQ entries are 32 byte long */
-               int entries_page = 4 * PAGE_SIZE / (sizeof(u64) * 4);
-
-               if (adapter->min_tx_entries_per_subcrq > entries_page ||
-                   adapter->min_rx_add_entries_per_subcrq > entries_page) {
-                       dev_err(dev, "Fatal, invalid entries per sub-crq\n");
-                       goto allqueues_failed;
-               }
-
-               /* Get the minimum between the queried max and the entries
-                * that fit in our PAGE_SIZE
-                */
-               adapter->req_tx_entries_per_subcrq =
-                   adapter->max_tx_entries_per_subcrq > entries_page ?
-                   entries_page : adapter->max_tx_entries_per_subcrq;
-               adapter->req_rx_add_entries_per_subcrq =
-                   adapter->max_rx_add_entries_per_subcrq > entries_page ?
-                   entries_page : adapter->max_rx_add_entries_per_subcrq;
-
-               adapter->req_tx_queues = adapter->opt_tx_comp_sub_queues;
-               adapter->req_rx_queues = adapter->opt_rx_comp_queues;
-               adapter->req_rx_add_queues = adapter->max_rx_add_queues;
-
-               adapter->req_mtu = adapter->netdev->mtu + ETH_HLEN;
-       }
-
        total_queues = adapter->req_tx_queues + adapter->req_rx_queues;
 
        allqueues = kcalloc(total_queues, sizeof(*allqueues), GFP_ATOMIC);
        if (!allqueues)
-               goto allqueues_failed;
+               return -1;
 
        for (i = 0; i < total_queues; i++) {
                allqueues[i] = init_sub_crq_queue(adapter);
@@ -1776,6 +1748,56 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
                adapter->rx_scrq[i]->scrq_num = i;
        }
 
+       kfree(allqueues);
+       return 0;
+
+rx_failed:
+       kfree(adapter->tx_scrq);
+       adapter->tx_scrq = NULL;
+tx_failed:
+       for (i = 0; i < registered_queues; i++)
+               release_sub_crq_queue(adapter, allqueues[i]);
+       kfree(allqueues);
+       return -1;
+}
+
+static void ibmvnic_send_req_caps(struct ibmvnic_adapter *adapter, int retry)
+{
+       struct device *dev = &adapter->vdev->dev;
+       union ibmvnic_crq crq;
+       int rc;
+
+       if (!retry) {
+               /* Sub-CRQ entries are 32 byte long */
+               int entries_page = 4 * PAGE_SIZE / (sizeof(u64) * 4);
+
+               if (adapter->min_tx_entries_per_subcrq > entries_page ||
+                   adapter->min_rx_add_entries_per_subcrq > entries_page) {
+                       dev_err(dev, "Fatal, invalid entries per sub-crq\n");
+                       return;
+               }
+
+               /* Get the minimum between the queried max and the entries
+                * that fit in our PAGE_SIZE
+                */
+               adapter->req_tx_entries_per_subcrq =
+                   adapter->max_tx_entries_per_subcrq > entries_page ?
+                   entries_page : adapter->max_tx_entries_per_subcrq;
+               adapter->req_rx_add_entries_per_subcrq =
+                   adapter->max_rx_add_entries_per_subcrq > entries_page ?
+                   entries_page : adapter->max_rx_add_entries_per_subcrq;
+
+               adapter->req_tx_queues = adapter->opt_tx_comp_sub_queues;
+               adapter->req_rx_queues = adapter->opt_rx_comp_queues;
+               adapter->req_rx_add_queues = adapter->max_rx_add_queues;
+
+               adapter->req_mtu = adapter->netdev->mtu + ETH_HLEN;
+       }
+
+       rc = init_sub_crqs(adapter);
+       if (rc)
+               return;
+
        memset(&crq, 0, sizeof(crq));
        crq.request_capability.first = IBMVNIC_CRQ_CMD;
        crq.request_capability.cmd = REQUEST_CAPABILITY;
@@ -1829,20 +1851,6 @@ static void init_sub_crqs(struct ibmvnic_adapter *adapter, int retry)
                atomic_inc(&adapter->running_cap_crqs);
                ibmvnic_send_crq(adapter, &crq);
        }
-
-       kfree(allqueues);
-
-       return;
-
-rx_failed:
-       kfree(adapter->tx_scrq);
-       adapter->tx_scrq = NULL;
-tx_failed:
-       for (i = 0; i < registered_queues; i++)
-               release_sub_crq_queue(adapter, allqueues[i]);
-       kfree(allqueues);
-allqueues_failed:
-       ibmvnic_remove(adapter->vdev);
 }
 
 static int pending_scrq(struct ibmvnic_adapter *adapter,
@@ -2568,7 +2576,7 @@ static void handle_request_cap_rsp(union ibmvnic_crq *crq,
                                               number), name);
                release_sub_crqs(adapter);
                *req_value = be64_to_cpu(crq->request_capability_rsp.number);
-               init_sub_crqs(adapter, 1);
+               ibmvnic_send_req_caps(adapter, 1);
                return;
        default:
                dev_err(dev, "Error %d in request cap rsp\n",
@@ -2881,8 +2889,7 @@ static void handle_query_cap_rsp(union ibmvnic_crq *crq,
 out:
        if (atomic_read(&adapter->running_cap_crqs) == 0) {
                adapter->wait_capability = false;
-               init_sub_crqs(adapter, 0);
-               /* We're done querying the capabilities, initialize sub-crqs */
+               ibmvnic_send_req_caps(adapter, 0);
        }
 }