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

Commit 091694a5 authored by Swen Schillig's avatar Swen Schillig Committed by James Bottomley
Browse files

[SCSI] zfcp: wait on SCSI work to be finished before proceeding with init dev 



Due to the character of a scheduled work we cannot guarantee the
LUN register to be finished before an initial device tries to use it.
Therefor we have to wait for PENDING_SCSI_WORK flag to be cleared
before proceeding.

Signed-off-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 9fb3cd86

drivers/s390/scsi/zfcp_aux.c

+5 −0
Original line number Diff line number Diff line
@@ -129,7 +129,12 @@ static void __init zfcp_init_device_configure(void) 
		goto out_unit;

	up(&zfcp_data.config_sema);

	ccw_device_set_online(adapter->ccw_device);



	zfcp_erp_wait(adapter);

	wait_event(adapter->erp_done_wqh,

		   !(atomic_read(&unit->status) &

				ZFCP_STATUS_UNIT_SCSI_WORK_PENDING));



	down(&zfcp_data.config_sema);

	zfcp_unit_put(unit);

out_unit:

drivers/s390/scsi/zfcp_erp.c

+1 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ static void zfcp_erp_scsi_scan(struct work_struct *work) 
			 scsilun_to_int((struct scsi_lun *)&unit->fcp_lun), 0);

	atomic_clear_mask(ZFCP_STATUS_UNIT_SCSI_WORK_PENDING, &unit->status);

	zfcp_unit_put(unit);

	wake_up(&unit->port->adapter->erp_done_wqh);

	kfree(p);

}