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

Commit 8a348450 authored by Thomas Falcon's avatar Thomas Falcon Committed by David S. Miller
Browse files

ibmvnic: Create separate initialization routine for resets 



Instead of having one initialization routine for all cases, create
a separate, simpler function for standard initialization, such as during
device probe. Use the original initialization function to handle
device reset scenarios. The goal of this patch is to avoid having
a single, cluttered init function to handle all possible
scenarios.

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

drivers/net/ethernet/ibm/ibmvnic.c

+46 −2
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 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 int ibmvnic_reset_init(struct ibmvnic_adapter *);

static void release_crq_queue(struct ibmvnic_adapter *);

static int __ibmvnic_set_mac(struct net_device *netdev, struct sockaddr *p);

static int init_crq_queue(struct ibmvnic_adapter *adapter);
@@ -1807,7 +1808,7 @@ static int do_reset(struct ibmvnic_adapter *adapter, 
			return rc;

		}



		rc = ibmvnic_init(adapter);

		rc = ibmvnic_reset_init(adapter);

		if (rc)

			return IBMVNIC_INIT_FAILED;
@@ -4571,7 +4572,7 @@ static int init_crq_queue(struct ibmvnic_adapter *adapter) 
	return retrc;

}



static int ibmvnic_init(struct ibmvnic_adapter *adapter)

static int ibmvnic_reset_init(struct ibmvnic_adapter *adapter)

{

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

	unsigned long timeout = msecs_to_jiffies(30000);
@@ -4630,6 +4631,49 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter) 
	return rc;

}



static int ibmvnic_init(struct ibmvnic_adapter *adapter)

{

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

	unsigned long timeout = msecs_to_jiffies(30000);

	int rc;



	adapter->from_passive_init = false;



	init_completion(&adapter->init_done);

	adapter->init_done_rc = 0;

	ibmvnic_send_crq_init(adapter);

	if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {

		dev_err(dev, "Initialization sequence timed out\n");

		return -1;

	}



	if (adapter->init_done_rc) {

		release_crq_queue(adapter);

		return adapter->init_done_rc;

	}



	if (adapter->from_passive_init) {

		adapter->state = VNIC_OPEN;

		adapter->from_passive_init = false;

		return -1;

	}



	rc = init_sub_crqs(adapter);

	if (rc) {

		dev_err(dev, "Initialization of sub crqs failed\n");

		release_crq_queue(adapter);

		return rc;

	}



	rc = init_sub_crq_irqs(adapter);

	if (rc) {

		dev_err(dev, "Failed to initialize sub crq irqs\n");

		release_crq_queue(adapter);

	}



	return rc;

}



static struct device_attribute dev_attr_failover;



static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)