From: Swen Schillig <swen@xxxxxxxxxxxx> 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: Swen Schillig <swen@xxxxxxxxxxxx> Signed-off-by: Christof Schmitt <christof.schmitt@xxxxxxxxxx> --- drivers/s390/scsi/zfcp_aux.c | 5 +++++ drivers/s390/scsi/zfcp_erp.c | 1 + 2 files changed, 6 insertions(+) --- a/drivers/s390/scsi/zfcp_aux.c 2008-09-30 13:52:06.000000000 +0200 +++ b/drivers/s390/scsi/zfcp_aux.c 2008-09-30 13:52:38.000000000 +0200 @@ -129,7 +129,12 @@ static void __init zfcp_init_device_conf 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: --- a/drivers/s390/scsi/zfcp_erp.c 2008-09-30 13:52:30.000000000 +0200 +++ b/drivers/s390/scsi/zfcp_erp.c 2008-09-30 13:52:38.000000000 +0200 @@ -1189,6 +1189,7 @@ static void zfcp_erp_scsi_scan(struct wo 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); } -- -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
