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

Commit 3c397400 authored May 19, 2008 by Seokmann Ju Committed by James Bottomley May 30, 2008

[SCSI] qla2xxx: Revert "qla2xxx: Use proper HA during asynchronous event handling."



This reverts commit bd2a1846.
The original (prior to the reverted commit) code was correct.
Additionally, the vp_idx should be checked during MBA_PORT_UPDATE
in order for proper handling to take place for a given vport.

Signed-off-by: Seokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent ca61668b

drivers/scsi/qla2xxx/qla_isr.c

+10 −26

Original line number	Diff line number	Diff line
		@@ -272,8 +272,6 @@ qla2x00_async_event(scsi_qla_host_t ha, uint16_t mb)
		uint32_t rscn_entry, host_pid;
		uint8_t rscn_queue_index;
		unsigned long flags;
		scsi_qla_host_t *vha;
		int i;

		/* Setup to process RIO completion. */
		handle_cnt = 0;
		@@ -544,18 +542,10 @@ qla2x00_async_event(scsi_qla_host_t ha, uint16_t mb)
		break;

		case MBA_PORT_UPDATE: /* Port database update */
		if ((ha->flags.npiv_supported) && (ha->num_vhosts)) {
		for_each_mapped_vp_idx(ha, i) {
		list_for_each_entry(vha, &ha->vp_list,
		vp_list) {
		if ((mb[3] & 0xff)
		== vha->vp_idx) {
		ha = vha;
		/* Only handle SCNs for our Vport index. */
		if (ha->parent && ha->vp_idx != (mb[3] & 0xff))
		break;
		}
		}
		}
		}

		/*
		* If PORT UPDATE is global (recieved LIP_OCCURED/LIP_RESET
		* event etc. earlier indicating loop is down) then process
		@@ -590,18 +580,12 @@ qla2x00_async_event(scsi_qla_host_t ha, uint16_t mb)
		break;

		case MBA_RSCN_UPDATE: /* State Change Registration */
		if ((ha->flags.npiv_supported) && (ha->num_vhosts)) {
		for_each_mapped_vp_idx(ha, i) {
		list_for_each_entry(vha, &ha->vp_list,
		vp_list) {
		if ((mb[3] & 0xff)
		== vha->vp_idx) {
		ha = vha;
		/* Check if the Vport has issued a SCR */
		if (ha->parent && test_bit(VP_SCR_NEEDED, &ha->vp_flags))
		break;
		/* Only handle SCNs for our Vport index. */
		if (ha->parent && ha->vp_idx != (mb[3] & 0xff))
		break;
		}
		}
		}
		}

		DEBUG2(printk("scsi(%ld): Asynchronous RSCR UPDATE.\n",
		ha->host_no));