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

Commit bb58596f authored by Dave C Boutcher's avatar Dave C Boutcher Committed by James Bottomley
Browse files

[SCSI] ibmvscsi kexec fix 



This makes ibmvscsi work correctly with the recent set of kexec
patches that went in.  This is based on work by Michael Ellerman, who
chased this initially.  He validated that it works during kexec.

Handle kexec correctly in ibmvscsi.   During kexec the adapter
will not get cleaned up correctly, so we may need to reset it
to make it sane again.

Signed-off-by: default avatarDave Boutcher <sleddog@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent e4f5c82a

drivers/scsi/ibmvscsi/ibmvscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, 
void ibmvscsi_release_crq_queue(struct crq_queue *queue,

				struct ibmvscsi_host_data *hostdata,

				int max_requests);

void ibmvscsi_reset_crq_queue(struct crq_queue *queue,

int ibmvscsi_reset_crq_queue(struct crq_queue *queue,

			      struct ibmvscsi_host_data *hostdata);



void ibmvscsi_handle_crq(struct viosrp_crq *crq,

drivers/scsi/ibmvscsi/iseries_vscsi.c

+2 −1
Original line number Diff line number Diff line
@@ -117,9 +117,10 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue, 
 *

 * no-op for iSeries

 */

void ibmvscsi_reset_crq_queue(struct crq_queue *queue,

int ibmvscsi_reset_crq_queue(struct crq_queue *queue,

			      struct ibmvscsi_host_data *hostdata)

{

	return 0;

}



/**

drivers/scsi/ibmvscsi/rpa_vscsi.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

}