diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 10:59:55 -0500 |
| commit | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (patch) | |
| tree | b5493c816a1f76a01319a84955c5ba07d47517c3 /drivers/scsi/ibmvscsi/rpa_vscsi.c | |
| parent | e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5 (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
| download | kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.zip kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.tar.gz kernel_samsung_aries-02f693c7118f6be9e677070eb630c1f3a654cdd3.tar.bz2 | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/ibmvscsi/rpa_vscsi.c')
| -rw-r--r-- | drivers/scsi/ibmvscsi/rpa_vscsi.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c index 8bf5652..75db2f5 100644 --- a/drivers/scsi/ibmvscsi/rpa_vscsi.c +++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c @@ -230,6 +230,11 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, rc = plpar_hcall_norets(H_REG_CRQ, vdev->unit_address, queue->msg_token, PAGE_SIZE); + if (rc == H_Resource) + /* maybe kexecing and resource is busy. try a reset */ + rc = ibmvscsi_reset_crq_queue(queue, + hostdata); + if (rc == 2) { /* Adapter is good, but other end is not ready */ printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n"); @@ -281,7 +286,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, * @hostdata: ibmvscsi_host_data of host * */ -void ibmvscsi_reset_crq_queue(struct crq_queue *queue, +int ibmvscsi_reset_crq_queue(struct crq_queue *queue, struct ibmvscsi_host_data *hostdata) { int rc; @@ -309,4 +314,5 @@ void ibmvscsi_reset_crq_queue(struct crq_queue *queue, printk(KERN_WARNING "ibmvscsi: couldn't register crq--rc 0x%x\n", rc); } + return rc; } |