mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
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: Johannes Thumshirn <johannes.thumshirn@wdc.com> Reviewed-by: Hannes Reinecke <hare@suse.de> Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> Signed-off-by: Bart Van Assche <bvanassche@acm.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
parent
dbb2da557a
commit
31160bd3e5
3 changed files with 19 additions and 10 deletions
|
@ -514,30 +514,29 @@ static m_addr_t __vtobus(m_bush_t bush, void *m)
|
||||||
* Deal with DMA mapping/unmapping.
|
* 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)
|
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:
|
case 2:
|
||||||
scsi_dma_unmap(cmd);
|
scsi_dma_unmap(cmd);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
cmd->__data_mapped = 0;
|
cmd_priv->data_mapped = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __map_scsi_sg_data(struct device *dev, struct scsi_cmnd *cmd)
|
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;
|
int use_sg;
|
||||||
|
|
||||||
use_sg = scsi_dma_map(cmd);
|
use_sg = scsi_dma_map(cmd);
|
||||||
if (!use_sg)
|
if (!use_sg)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
cmd->__data_mapped = 2;
|
cmd_priv->data_mapped = 2;
|
||||||
cmd->__data_mapping = use_sg;
|
cmd_priv->data_mapping = use_sg;
|
||||||
|
|
||||||
return 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)
|
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;
|
void (*done)(struct scsi_cmnd *) = scsi_done;
|
||||||
struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
|
struct ncb *np = ((struct host_data *) cmd->device->host->hostdata)->ncb;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
@ -7864,8 +7864,8 @@ printk("ncr53c8xx_queue_command\n");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cmd->host_scribble = NULL;
|
cmd->host_scribble = NULL;
|
||||||
cmd->__data_mapped = 0;
|
cmd_priv->data_mapped = 0;
|
||||||
cmd->__data_mapping = 0;
|
cmd_priv->data_mapping = 0;
|
||||||
|
|
||||||
spin_lock_irqsave(&np->smp_lock, flags);
|
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;
|
u_long flags = 0;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
WARN_ON_ONCE(tpnt->cmd_size < sizeof(struct ncr_cmd_priv));
|
||||||
|
|
||||||
if (!tpnt->name)
|
if (!tpnt->name)
|
||||||
tpnt->name = SCSI_NCR_DRIVER_NAME;
|
tpnt->name = SCSI_NCR_DRIVER_NAME;
|
||||||
if (!tpnt->shost_groups)
|
if (!tpnt->shost_groups)
|
||||||
|
|
|
@ -1288,6 +1288,12 @@ struct ncr_device {
|
||||||
u8 differential;
|
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 struct Scsi_Host *ncr_attach(struct scsi_host_template *tpnt, int unit, struct ncr_device *device);
|
||||||
extern void ncr53c8xx_release(struct Scsi_Host *host);
|
extern void ncr53c8xx_release(struct Scsi_Host *host);
|
||||||
irqreturn_t ncr53c8xx_intr(int irq, void *dev_id);
|
irqreturn_t ncr53c8xx_intr(int irq, void *dev_id);
|
||||||
|
|
|
@ -81,6 +81,7 @@ lasi_scsi_clock(void * hpa, int defaultclock)
|
||||||
static struct scsi_host_template zalon7xx_template = {
|
static struct scsi_host_template zalon7xx_template = {
|
||||||
.module = THIS_MODULE,
|
.module = THIS_MODULE,
|
||||||
.proc_name = "zalon7xx",
|
.proc_name = "zalon7xx",
|
||||||
|
.cmd_size = sizeof(struct ncr_cmd_priv),
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init
|
static int __init
|
||||||
|
|
Loading…
Reference in a new issue