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

Commit 1674b405 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Move sbale handling to zfcp_qdio files 



Move the code accessing the qdio sbales and zfcp_qdio_req struct to
the zfcp_qdio files and provide helper functions for accessing the
qdio related parts.

Reviewed-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@suse.de>
parent 68322984

drivers/s390/scsi/zfcp_def.h

+0 −17
Original line number Diff line number Diff line
@@ -44,23 +44,6 @@ struct zfcp_reqlist; 
/********************* SCSI SPECIFIC DEFINES *********************************/

#define ZFCP_SCSI_ER_TIMEOUT                    (10*HZ)



/********************* CIO/QDIO SPECIFIC DEFINES *****************************/



/* DMQ bug workaround: don't use last SBALE */

#define ZFCP_MAX_SBALES_PER_SBAL	(QDIO_MAX_ELEMENTS_PER_BUFFER - 1)



/* index of last SBALE (with respect to DMQ bug workaround) */

#define ZFCP_LAST_SBALE_PER_SBAL	(ZFCP_MAX_SBALES_PER_SBAL - 1)



/* max. number of (data buffer) SBALEs in largest SBAL chain */

#define ZFCP_MAX_SBALES_PER_REQ		\

	(FSF_MAX_SBALS_PER_REQ * ZFCP_MAX_SBALES_PER_SBAL - 2)

        /* request ID + QTCB in SBALE 0 + 1 of first SBAL in chain */



#define ZFCP_MAX_SECTORS (ZFCP_MAX_SBALES_PER_REQ * 8)

        /* max. number of (data buffer) SBALEs in largest SBAL chain

           multiplied with number of sectors per 4k block */



/********************* FSF SPECIFIC DEFINES *********************************/



/* ATTENTION: value must not be used by hardware */

drivers/s390/scsi/zfcp_ext.h

+2 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * External function declarations.

 *

 * Copyright IBM Corporation 2002, 2009

 * Copyright IBM Corporation 2002, 2010

 */



#ifndef ZFCP_EXT_H
@@ -144,8 +144,7 @@ extern void zfcp_fsf_reqid_check(struct zfcp_qdio *, int); 
extern int zfcp_qdio_setup(struct zfcp_adapter *);

extern void zfcp_qdio_destroy(struct zfcp_qdio *);

extern int zfcp_qdio_send(struct zfcp_qdio *, struct zfcp_qdio_req *);

extern int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *,

				   struct zfcp_qdio_req *, unsigned long,

extern int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *, struct zfcp_qdio_req *,

				   struct scatterlist *, int);

extern int zfcp_qdio_open(struct zfcp_qdio *);

extern void zfcp_qdio_close(struct zfcp_qdio *);

drivers/s390/scsi/zfcp_fsf.c

+67 −113

File changed.

Preview size limit exceeded, changes collapsed.

drivers/s390/scsi/zfcp_fsf.h

+7 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Interface to the FSF support functions.

 *

 * Copyright IBM Corporation 2002, 2009

 * Copyright IBM Corporation 2002, 2010

 */



#ifndef FSF_H
@@ -152,7 +152,12 @@ 
#define FSF_CLASS_3				0x00000003



/* SBAL chaining */

#define FSF_MAX_SBALS_PER_REQ			36

#define ZFCP_FSF_MAX_SBALS_PER_REQ		36



/* max. number of (data buffer) SBALEs in largest SBAL chain

 * request ID + QTCB in SBALE 0 + 1 of first SBAL in chain   */

#define ZFCP_FSF_MAX_SBALES_PER_REQ	\

	(ZFCP_FSF_MAX_SBALS_PER_REQ * ZFCP_QDIO_MAX_SBALES_PER_SBAL - 2)



/* logging space behind QTCB */

#define FSF_QTCB_LOG_SIZE			1024

drivers/s390/scsi/zfcp_qdio.c

+11 −14
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
 *

 * Setup and helper functions to access QDIO.

 *

 * Copyright IBM Corporation 2002, 2009

 * Copyright IBM Corporation 2002, 2010

 */



#define KMSG_COMPONENT "zfcp"
@@ -151,8 +151,7 @@ static void zfcp_qdio_sbal_limit(struct zfcp_qdio *qdio, 
}



static struct qdio_buffer_element *

zfcp_qdio_sbal_chain(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,

		     unsigned long sbtype)

zfcp_qdio_sbal_chain(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)

{

	struct qdio_buffer_element *sbale;
@@ -180,17 +179,16 @@ zfcp_qdio_sbal_chain(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req, 


	/* set storage-block type for new SBAL */

	sbale = zfcp_qdio_sbale_curr(qdio, q_req);

	sbale->flags |= sbtype;

	sbale->flags |= q_req->sbtype;



	return sbale;

}



static struct qdio_buffer_element *

zfcp_qdio_sbale_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,

		     unsigned int sbtype)

zfcp_qdio_sbale_next(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req)

{

	if (q_req->sbale_curr == ZFCP_LAST_SBALE_PER_SBAL)

		return zfcp_qdio_sbal_chain(qdio, q_req, sbtype);

	if (q_req->sbale_curr == ZFCP_QDIO_LAST_SBALE_PER_SBAL)

		return zfcp_qdio_sbal_chain(qdio, q_req);

	q_req->sbale_curr++;

	return zfcp_qdio_sbale_curr(qdio, q_req);

}
@@ -208,15 +206,14 @@ static void zfcp_qdio_undo_sbals(struct zfcp_qdio *qdio, 


/**

 * zfcp_qdio_sbals_from_sg - fill SBALs from scatter-gather list

 * @fsf_req: request to be processed

 * @sbtype: SBALE flags

 * @qdio: pointer to struct zfcp_qdio

 * @q_req: pointer to struct zfcp_qdio_req

 * @sg: scatter-gather list

 * @max_sbals: upper bound for number of SBALs to be used

 * Returns: number of bytes, or error (negativ)

 */

int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req,

			    unsigned long sbtype, struct scatterlist *sg,

			    int max_sbals)

			    struct scatterlist *sg, int max_sbals)

{

	struct qdio_buffer_element *sbale;

	int bytes = 0;
@@ -226,10 +223,10 @@ int zfcp_qdio_sbals_from_sg(struct zfcp_qdio *qdio, struct zfcp_qdio_req *q_req, 


	/* set storage-block type for this request */

	sbale = zfcp_qdio_sbale_req(qdio, q_req);

	sbale->flags |= sbtype;

	sbale->flags |= q_req->sbtype;



	for (; sg; sg = sg_next(sg)) {

		sbale = zfcp_qdio_sbale_next(qdio, q_req, sbtype);

		sbale = zfcp_qdio_sbale_next(qdio, q_req);

		if (!sbale) {

			atomic_inc(&qdio->req_q_full);

			zfcp_qdio_undo_sbals(qdio, q_req);