Commit 31160bd3 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: zalon: Stop using the SCSI pointer 

Set .cmd_size in the SCSI host template instead of using the SCSI pointer
from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer
from struct scsi_cmnd.

Link: https://lore.kernel.org/r/20220218195117.25689-49-bvanassche@acm.org


Cc: Helge Deller <deller@gmx.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent dbb2da55

drivers/scsi/ncr53c8xx.c

+12 −10
Original line number Diff line number Diff line
@@ -514,30 +514,29 @@ static m_addr_t __vtobus(m_bush_t bush, void *m) 
 *  Deal with DMA mapping/unmapping.

 */



/* To keep track of the dma mapping (sg/single) that has been set */

#define __data_mapped	SCp.phase

#define __data_mapping	SCp.have_data_in



static void __unmap_scsi_data(struct device *dev, struct scsi_cmnd *cmd)

{

	switch(cmd->__data_mapped) {

	struct ncr_cmd_priv *cmd_priv = scsi_cmd_priv(cmd);



	switch(cmd_priv->data_mapped) {

	case 2:

		scsi_dma_unmap(cmd);

		break;

	}

	cmd->__data_mapped = 0;

	cmd_priv->data_mapped = 0;

}



static int __map_scsi_sg_data(struct device *dev, struct scsi_cmnd *cmd)

{

	struct ncr_cmd_priv *cmd_priv = scsi_cmd_priv(cmd);

	int use_sg;



	use_sg = scsi_dma_map(cmd);

	if (!use_sg)

		return 0;



	cmd->__data_mapped = 2;

	cmd->__data_mapping = use_sg;

	cmd_priv->data_mapped = 2;

	cmd_priv->data_mapping = use_sg;



	return use_sg;

}
@@ -7854,6 +7853,7 @@ static int ncr53c8xx_slave_configure(struct scsi_device *device) 


static int ncr53c8xx_queue_command_lck(struct scsi_cmnd *cmd)

{

     struct ncr_cmd_priv *cmd_priv = scsi_cmd_priv(cmd);

     void (*done)(struct scsi_cmnd *) = scsi_done;

     struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;

     unsigned long flags;
@@ -7864,8 +7864,8 @@ printk("ncr53c8xx_queue_command\n"); 
#endif



     cmd->host_scribble = NULL;

     cmd->__data_mapped = 0;

     cmd->__data_mapping = 0;

     cmd_priv->data_mapped = 0;

     cmd_priv->data_mapping = 0;



     spin_lock_irqsave(&np->smp_lock, flags);
@@ -8085,6 +8085,8 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt, 
	u_long flags = 0;

	int i;



	WARN_ON_ONCE(tpnt->cmd_size < sizeof(struct ncr_cmd_priv));



	if (!tpnt->name)

		tpnt->name	= SCSI_NCR_DRIVER_NAME;

	if (!tpnt->shost_groups)

drivers/scsi/ncr53c8xx.h

+6 −0
Original line number Diff line number Diff line
@@ -1288,6 +1288,12 @@ struct ncr_device { 
	u8 differential;

};



/* To keep track of the dma mapping (sg/single) that has been set */

struct ncr_cmd_priv {

	int	data_mapped;

	int	data_mapping;

};



extern struct Scsi_Host *ncr_attach(struct scsi_host_template *tpnt, int unit, struct ncr_device *device);

extern void ncr53c8xx_release(struct Scsi_Host *host);

irqreturn_t ncr53c8xx_intr(int irq, void *dev_id);

drivers/scsi/zalon.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ lasi_scsi_clock(void * hpa, int defaultclock) 
static struct scsi_host_template zalon7xx_template = {

	.module		= THIS_MODULE,

	.proc_name	= "zalon7xx",

	.cmd_size	= sizeof(struct ncr_cmd_priv),

};



static int __init