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

Commit 41899be7 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.30: Fix port and system failure in SLI4 FC function reset 



Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent bdcd2b92

drivers/scsi/lpfc/lpfc_init.c

+5 −1
Original line number Diff line number Diff line
@@ -2786,9 +2786,13 @@ lpfc_scsi_buf_update(struct lpfc_hba *phba) 


	spin_lock_irq(&phba->hbalock);

	spin_lock(&phba->scsi_buf_list_lock);

	list_for_each_entry_safe(sb, sb_next, &phba->lpfc_scsi_buf_list, list)

	list_for_each_entry_safe(sb, sb_next, &phba->lpfc_scsi_buf_list, list) {

		sb->cur_iocbq.sli4_xritag =

			phba->sli4_hba.xri_ids[sb->cur_iocbq.sli4_lxritag];

		set_bit(sb->cur_iocbq.sli4_lxritag, phba->sli4_hba.xri_bmask);

		phba->sli4_hba.max_cfg_param.xri_used++;

		phba->sli4_hba.xri_count++;

	}

	spin_unlock(&phba->scsi_buf_list_lock);

	spin_unlock_irq(&phba->hbalock);

	return 0;

drivers/scsi/lpfc/lpfc_sli.c

+2 −0
Original line number Diff line number Diff line
@@ -5613,6 +5613,8 @@ lpfc_sli4_alloc_resource_identifiers(struct lpfc_hba *phba) 
			rc = -ENOMEM;

			goto free_vpi_ids;

		}

		phba->sli4_hba.max_cfg_param.xri_used = 0;

		phba->sli4_hba.xri_count = 0;

		phba->sli4_hba.xri_ids = kzalloc(count *

						 sizeof(uint16_t),

						 GFP_KERNEL);