Commit be2a266d authored by Narsimhulu Musini's avatar Narsimhulu Musini Committed by Martin K. Petersen
Browse files

snic: add scsi host after determining max IOs. 



scsi host is added after negotiating the max number of IOs with
Firmware.

Signed-off-by: default avatarNarsimhulu Musini <nmusini@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 0da8519b

drivers/scsi/snic/snic_main.c

+17 −18
Original line number Diff line number Diff line
@@ -631,19 +631,6 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_free_tmreq_pool;

	}



	/*

	 * Initialization done with PCI system, hardware, firmware.

	 * Add shost to SCSI

	 */

	ret = snic_add_host(shost, pdev);

	if (ret) {

		SNIC_HOST_ERR(shost,

			      "Adding scsi host Failed ... exiting. %d\n",

			      ret);



		goto err_notify_unset;

	}



	spin_lock_irqsave(&snic_glob->snic_list_lock, flags);

	list_add_tail(&snic->list, &snic_glob->snic_list);

	spin_unlock_irqrestore(&snic_glob->snic_list_lock, flags);
@@ -676,8 +663,6 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	for (i = 0; i < snic->intr_count; i++)

		svnic_intr_unmask(&snic->intr[i]);



	snic_set_state(snic, SNIC_ONLINE);



	/* Get snic params */

	ret = snic_get_conf(snic);

	if (ret) {
@@ -688,6 +673,21 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto err_get_conf;

	}



	/*

	 * Initialization done with PCI system, hardware, firmware.

	 * Add shost to SCSI

	 */

	ret = snic_add_host(shost, pdev);

	if (ret) {

		SNIC_HOST_ERR(shost,

			      "Adding scsi host Failed ... exiting. %d\n",

			      ret);



		goto err_get_conf;

	}



	snic_set_state(snic, SNIC_ONLINE);



	ret = snic_disc_start(snic);

	if (ret) {

		SNIC_HOST_ERR(shost, "snic_probe:Discovery Failed w err = %d\n",
@@ -712,6 +712,8 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	svnic_dev_disable(snic->vdev);



err_vdev_enable:

	svnic_dev_notify_unset(snic->vdev);



	for (i = 0; i < snic->wq_count; i++) {

		int rc = 0;
@@ -725,9 +727,6 @@ snic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}

	snic_del_host(snic->shost);



err_notify_unset:

	svnic_dev_notify_unset(snic->vdev);



err_free_tmreq_pool:

	mempool_destroy(snic->req_pool[SNIC_REQ_TM_CACHE]);