Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d96f12a authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Initialize SCRQ's during login renegotiation 



SCRQ resources are freed during renegotiation, but they are not
re-allocated afterwards due to some changes in the initialization
process. Fix that by re-allocating the memory after renegotation.

SCRQ's can also be freed if a server capabilities request fails.
If this were encountered during a device reset for example,
SCRQ's may not be re-allocated. This operation is not necessary
anymore so remove it.

Signed-off-by: default avatarThomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bed9ff16

drivers/net/ethernet/ibm/ibmvnic.c

+14 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ static void send_request_map(struct ibmvnic_adapter *, dma_addr_t, __be32, u8); 
static void send_request_unmap(struct ibmvnic_adapter *, u8);

static void send_login(struct ibmvnic_adapter *adapter);

static void send_cap_queries(struct ibmvnic_adapter *adapter);

static int init_sub_crqs(struct ibmvnic_adapter *);

static int init_sub_crq_irqs(struct ibmvnic_adapter *adapter);

static int ibmvnic_init(struct ibmvnic_adapter *);

static void release_crq_queue(struct ibmvnic_adapter *);
@@ -651,6 +652,7 @@ static int ibmvnic_login(struct net_device *netdev) 
	struct ibmvnic_adapter *adapter = netdev_priv(netdev);

	unsigned long timeout = msecs_to_jiffies(30000);

	struct device *dev = &adapter->vdev->dev;

	int rc;



	do {

		if (adapter->renegotiate) {
@@ -664,6 +666,18 @@ static int ibmvnic_login(struct net_device *netdev) 
				dev_err(dev, "Capabilities query timeout\n");

				return -1;

			}

			rc = init_sub_crqs(adapter);

			if (rc) {

				dev_err(dev,

					"Initialization of SCRQ's failed\n");

				return -1;

			}

			rc = init_sub_crq_irqs(adapter);

			if (rc) {

				dev_err(dev,

					"Initialization of SCRQ's irqs failed\n");

				return -1;

			}

		}



		reinit_completion(&adapter->init_done);
@@ -3004,7 +3018,6 @@ static void handle_request_cap_rsp(union ibmvnic_crq *crq, 
			 *req_value,

			 (long int)be64_to_cpu(crq->request_capability_rsp.

					       number), name);

		release_sub_crqs(adapter);

		*req_value = be64_to_cpu(crq->request_capability_rsp.number);

		ibmvnic_send_req_caps(adapter, 1);

		return;