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

Commit 722477c4 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by Martin K. Petersen
Browse files

scsi: qedf: Limit number of CQs 



FCOE offloading failed with:

[qed_sp_fcoe_func_start:150(sp-0-3b:00.02)]Cannot satisfy CQ amount. CQs
		 requested 8, CQs available 6. Aborting function start
[qed_fcoe_start:821()]Failed to start fcoe
[__qedf_probe:3041]:6: Cannot start FCoE function.

The reason is a newly introduced check in the qed main part. This change
also provides the information about how many CQs are available, so we
simply limit the number of requested CQs..

Fixes: 3c5da942 ("qed: Share additional information with qedf")
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f9f22a86

drivers/scsi/qedf/qedf.h

+2 −1
Original line number Diff line number Diff line
@@ -528,7 +528,8 @@ struct fip_vlan { 
#define QEDF_WRITE                    (1 << 0)

#define MAX_FIBRE_LUNS			0xffffffff



#define QEDF_MAX_NUM_CQS		8

#define MIN_NUM_CPUS_MSIX(x)	min_t(u32, x->dev_info.num_cqs, \

					num_online_cpus())



/*

 * PCI function probe defines

drivers/scsi/qedf/qedf_main.c

+9 −11
Original line number Diff line number Diff line
@@ -2760,11 +2760,9 @@ static int qedf_set_fcoe_pf_param(struct qedf_ctx *qedf) 
	 * we allocation is the minimum off:

	 *

	 * Number of CPUs

	 * Number of MSI-X vectors

	 * Max number allocated in hardware (QEDF_MAX_NUM_CQS)

	 * Number allocated by qed for our PCI function

	 */

	qedf->num_queues = min((unsigned int)QEDF_MAX_NUM_CQS,

	    num_online_cpus());

	qedf->num_queues = MIN_NUM_CPUS_MSIX(qedf);



	QEDF_INFO(&(qedf->dbg_ctx), QEDF_LOG_DISC, "Number of CQs is %d.\n",

		   qedf->num_queues);
@@ -2962,6 +2960,13 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) 
		goto err1;

	}



	/* Learn information crucial for qedf to progress */

	rc = qed_ops->fill_dev_info(qedf->cdev, &qedf->dev_info);

	if (rc) {

		QEDF_ERR(&(qedf->dbg_ctx), "Failed to dev info.\n");

		goto err1;

	}



	/* queue allocation code should come here

	 * order should be

	 * 	slowpath_start
@@ -2977,13 +2982,6 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) 
	}

	qed_ops->common->update_pf_params(qedf->cdev, &qedf->pf_params);



	/* Learn information crucial for qedf to progress */

	rc = qed_ops->fill_dev_info(qedf->cdev, &qedf->dev_info);

	if (rc) {

		QEDF_ERR(&(qedf->dbg_ctx), "Failed to dev info.\n");

		goto err1;

	}



	/* Record BDQ producer doorbell addresses */

	qedf->bdq_primary_prod = qedf->dev_info.primary_dbq_rq_addr;

	qedf->bdq_secondary_prod = qedf->dev_info.secondary_bdq_rq_addr;