From 90695ee0e984ef425b9f5a9845314b925357ffdf Mon Sep 17 00:00:00 2001 From: James Smart Date: Tue, 14 Aug 2012 14:25:36 -0400 Subject: [PATCH] [SCSI] lpfc 8.3.34: Fix number of IO channels to match CPUs Signed-off-by: James Smart Signed-off-by: James Bottomley --- drivers/scsi/lpfc/lpfc_init.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index d81fec832b98..9ad7943414dd 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -6542,6 +6542,9 @@ static int lpfc_sli4_queue_verify(struct lpfc_hba *phba) { int cfg_fcp_io_channel; + uint32_t cpu; + uint32_t i = 0; + /* * Sanity check for configured queue parameters against the run-time @@ -6551,6 +6554,17 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba) /* Sanity check on HBA EQ parameters */ cfg_fcp_io_channel = phba->cfg_fcp_io_channel; + /* It doesn't make sense to have more io channels then CPUs */ + for_each_online_cpu(cpu) { + i++; + } + if (i < cfg_fcp_io_channel) { + lpfc_printf_log(phba, KERN_WARNING, LOG_INIT, + "3188 Reducing IO channels to match number of " + "CPUs: from %d to %d\n", cfg_fcp_io_channel, i); + cfg_fcp_io_channel = i; + } + if (cfg_fcp_io_channel > phba->sli4_hba.max_cfg_param.max_eq) { cfg_fcp_io_channel = phba->sli4_hba.max_cfg_param.max_eq;