diff options
| author | James Smart | 2013-04-18 02:19:16 +0200 |
|---|---|---|
| committer | James Bottomley | 2013-05-02 22:10:25 +0200 |
| commit | 7bb03bbf1e8c0cb17309ac8a6dae6a54ebdfe66e (patch) | |
| tree | 1fb2d70836583981000105a6b6884a746fcfea03 /drivers/scsi/lpfc/lpfc_sli.c | |
| parent | [SCSI] lpfc 8.3.39: Fixed iocb flags not being reset for scsi commands (diff) | |
| download | kernel-qcow2-linux-7bb03bbf1e8c0cb17309ac8a6dae6a54ebdfe66e.tar.gz kernel-qcow2-linux-7bb03bbf1e8c0cb17309ac8a6dae6a54ebdfe66e.tar.xz kernel-qcow2-linux-7bb03bbf1e8c0cb17309ac8a6dae6a54ebdfe66e.zip | |
[SCSI] lpfc 8.3.39: Fixed driver vector mapping to CPU affinity
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index c13ab4fd36b9..94b017ee9aa3 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c @@ -7923,15 +7923,21 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq, static inline uint32_t lpfc_sli4_scmd_to_wqidx_distr(struct lpfc_hba *phba) { - int i; - - if (phba->cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_CPU) - i = smp_processor_id(); - else - i = atomic_add_return(1, &phba->fcp_qidx); + struct lpfc_vector_map_info *cpup; + int chann, cpu; - i = (i % phba->cfg_fcp_io_channel); - return i; + if (phba->cfg_fcp_io_sched == LPFC_FCP_SCHED_BY_CPU) { + cpu = smp_processor_id(); + if (cpu < phba->sli4_hba.num_present_cpu) { + cpup = phba->sli4_hba.cpu_map; + cpup += cpu; + return cpup->channel_id; + } + chann = cpu; + } + chann = atomic_add_return(1, &phba->fcp_qidx); + chann = (chann % phba->cfg_fcp_io_channel); + return chann; } /** |