Remove the SCSI pointer from struct scsi_cmnd
Subsystems (39)
v5 cover Remove the SCSI pointer from struct scsi_cmnd
Hi Martin,
The size of struct scsi_cmnd matters for embedded devices. One of the largest members of that structure is the SCSI pointer. That structure is relevant for SCSI-II drivers but not for modern SCSI drivers. Hence this patch series that removes the SCSI pointer from struct scsi_cmnd and moves it into driver-private command data.
Please consider this patch series for kernel v5.18.
Thanks,
Bart.
Changes compared to v4:
- Replaced two NCR5380 patches by a patch from Finn Thain.
- Added more Reviewed-by tags.
Changes compared to v3:
- Split the libfc patch into three patches (libfc, bnx2fc, qedf). Removed the libfc private command information and also the status information from the bnx2fc and qedf private command data.
- Removed the following statement from libfc_host_alloc():
WARN_ON_ONCE(sht->cmd_size < sizeof(struct libfc_cmd_priv));
- Added more Reviewed-by tags.
Changes compared to v2:
- Split the ips and nsp_cs patches at the start of this series such that there is only one change in each patch.
- Changed the return type of ips_release() from 'int' into 'void' since the value returned by that function is not used.
- Remove duplicate <scsi/scsi.h> include directives.
- Use struct scsi_pointer directly instead of wrapping it inside another structure for drivers that do not use host_scribble as requested by Hannes.
- Updated the error messages that refer to the SCp.ptr member if that member is removed by this patch series.
- Removed WARN_ON_ONCE(sht->cmd_size < sizeof(struct iscsi_cmd)) from iscsi_host_alloc() and removed struct iscsi_cmd from the qla4xxx private data as requested by Mike.
- Changed 'cmd - 1' into a container_of() expression in megaraid.h (Hannes).
- Removed a cast from the mvsas driver (John).
- Modified the comment in include/scsi/scsi_cmnd.h in the last patch (John).
Changes compared to v1:
- Removed BUILD_BUG_ON(sizeof(...) > sizeof(struct scsi_pointer)) statements.
- Added two void casts in front of I/O statements as requested by Johannes.
- Improved source code formatting in the aha152x driver.
- Restored the DID_OK constant in a SCSI result expression.
- Updated Reviewed-by tags.
Bart Van Assche (48):
scsi: ips: Remove an unreachable statement
scsi: ips: Change the return type of ips_release() into 'void'
scsi: ips: Use true and false instead of TRUE and FALSE
scsi: nsp_cs: Change the return type of two functions into 'void'
scsi: nsp_cs: Use true and false instead of TRUE and FALSE
scsi: Remove drivers/scsi/scsi.h
scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro
scsi: arm: Rename arm/scsi.h into arm/arm_scsi.h
scsi: arm: Move the SCSI pointer to private command data
scsi: 53c700: Stop clearing SCSI pointer fields
scsi: aacraid: Move the SCSI pointer to private command data
scsi: advansys: Move the SCSI pointer to private command data
scsi: aha1542: Remove a set-but-not-used array
scsi: aha152x: Move the SCSI pointer to private command data
scsi: bfa: Stop using the SCSI pointer
scsi: csio: Stop using the SCSI pointer
scsi: dc395x: Stop using the SCSI pointer
scsi: esp_scsi: Stop using the SCSI pointer
scsi: fdomain: Move the SCSI pointer to private command data
scsi: fnic: Fix a tracing statement
scsi: fnic: Stop using the SCSI pointer
scsi: hptiop: Stop using the SCSI pointer
scsi: imm: Move the SCSI pointer to private command data
scsi: iscsi: Stop using the SCSI pointer
scsi: initio: Stop using the SCSI pointer
scsi: libfc: Stop using the SCSI pointer
scsi: bnx2fc: Stop using the SCSI pointer
scsi: qedf: Stop using the SCSI pointer
scsi: mac53c94: Fix a set-but-not-used compiler warning
scsi: mac53c94: Move the SCSI pointer to private command data
scsi: megaraid: Stop using the SCSI pointer
scsi: megasas: Stop using the SCSI pointer
scsi: mesh: Move the SCSI pointer to private command data
scsi: mvsas: Fix a set-but-not-used warning
scsi: mvumi: Stop using the SCSI pointer
scsi: nsp32: Stop using the SCSI pointer
scsi: nsp_cs: Move the SCSI pointer to private command data
scsi: sym53c500_cs: Move the SCSI pointer to private command data
scsi: ppa: Move the SCSI pointer to private command data
scsi: qla1280: Move the SCSI pointer to private command data
scsi: qla2xxx: Stop using the SCSI pointer
scsi: smartpqi: Stop using the SCSI pointer
scsi: sym53c8xx_2: Move the SCSI pointer to private command data
scsi: usb: Stop using the SCSI pointer
scsi: wd719x: Stop using the SCSI pointer
scsi: wd33c93: Move the SCSI pointer to private command data
scsi: zalon: Stop using the SCSI pointer
scsi: core: Remove struct scsi_pointer from struct scsi_cmnd
Finn Thain (1):
scsi: NCR5380: Add SCp members to struct NCR5380_cmd
drivers/infiniband/ulp/iser/iscsi_iser.c | 1 +
drivers/scsi/53c700.c | 2 -
drivers/scsi/NCR5380.c | 94 ++++---
drivers/scsi/NCR5380.h | 13 +-
drivers/scsi/a2091.c | 25 +-
drivers/scsi/a3000.c | 25 +-
drivers/scsi/aacraid/aachba.c | 43 +--
drivers/scsi/aacraid/aacraid.h | 24 +-
drivers/scsi/aacraid/comminit.c | 2 +-
drivers/scsi/aacraid/linit.c | 21 +-
drivers/scsi/advansys.c | 22 +-
drivers/scsi/aha152x.c | 268 ++++++++++--------
drivers/scsi/aha1542.c | 3 +-
drivers/scsi/aha1740.c | 6 +-
drivers/scsi/arm/acornscsi.c | 28 +-
drivers/scsi/arm/{scsi.h => arm_scsi.h} | 37 ++-
drivers/scsi/arm/arxescsi.c | 6 +-
drivers/scsi/arm/cumana_1.c | 2 +-
drivers/scsi/arm/cumana_2.c | 8 +-
drivers/scsi/arm/eesox.c | 8 +-
drivers/scsi/arm/fas216.c | 36 ++-
drivers/scsi/arm/fas216.h | 4 +
drivers/scsi/arm/oak.c | 2 +-
drivers/scsi/arm/powertec.c | 8 +-
drivers/scsi/arm/queue.c | 6 +-
drivers/scsi/atari_scsi.c | 6 +-
drivers/scsi/be2iscsi/be_main.c | 3 +-
drivers/scsi/bfa/bfad_im.c | 27 +-
drivers/scsi/bfa/bfad_im.h | 16 ++
drivers/scsi/bnx2fc/bnx2fc.h | 9 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 +
drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +-
drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 +
drivers/scsi/csiostor/csio_scsi.c | 20 +-
drivers/scsi/csiostor/csio_scsi.h | 10 +
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 +
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 +
drivers/scsi/dc395x.c | 3 -
drivers/scsi/dmx3191d.c | 2 +-
drivers/scsi/esp_scsi.c | 4 +-
drivers/scsi/esp_scsi.h | 3 +-
drivers/scsi/fcoe/fcoe.c | 1 +
drivers/scsi/fdomain.c | 64 +++--
drivers/scsi/fnic/fnic.h | 27 +-
drivers/scsi/fnic/fnic_main.c | 1 +
drivers/scsi/fnic/fnic_scsi.c | 289 ++++++++++----------
drivers/scsi/g_NCR5380.c | 6 +-
drivers/scsi/gvp11.c | 25 +-
drivers/scsi/hptiop.c | 1 +
drivers/scsi/hptiop.h | 4 +-
drivers/scsi/imm.c | 88 +++---
drivers/scsi/imm.h | 5 +
drivers/scsi/initio.c | 14 +-
drivers/scsi/initio.h | 9 +
drivers/scsi/ips.c | 52 ++--
drivers/scsi/iscsi_tcp.c | 1 +
drivers/scsi/libfc/fc_fcp.c | 26 +-
drivers/scsi/libiscsi.c | 20 +-
drivers/scsi/mac53c94.c | 27 +-
drivers/scsi/mac53c94.h | 11 +
drivers/scsi/mac_scsi.c | 9 +-
drivers/scsi/megaraid.c | 21 +-
drivers/scsi/megaraid.h | 23 +-
drivers/scsi/megaraid/megaraid_sas.h | 12 +
drivers/scsi/megaraid/megaraid_sas_base.c | 8 +-
drivers/scsi/megaraid/megaraid_sas_fusion.c | 15 +-
drivers/scsi/mesh.c | 20 +-
drivers/scsi/mesh.h | 11 +
drivers/scsi/mvme147.c | 16 +-
drivers/scsi/mvsas/mv_init.c | 6 +-
drivers/scsi/mvumi.c | 9 +-
drivers/scsi/mvumi.h | 9 +
drivers/scsi/ncr53c8xx.c | 22 +-
drivers/scsi/ncr53c8xx.h | 6 +
drivers/scsi/nsp32.c | 20 +-
drivers/scsi/nsp32.h | 9 +
drivers/scsi/pcmcia/aha152x_stub.c | 9 +-
drivers/scsi/pcmcia/nsp_cs.c | 246 +++++++++--------
drivers/scsi/pcmcia/nsp_cs.h | 8 +-
drivers/scsi/pcmcia/nsp_debug.c | 2 +-
drivers/scsi/pcmcia/qlogic_stub.c | 9 +-
drivers/scsi/pcmcia/sym53c500_cs.c | 47 ++--
drivers/scsi/ppa.c | 75 ++---
drivers/scsi/qedf/qedf.h | 10 +-
drivers/scsi/qedf/qedf_io.c | 25 +-
drivers/scsi/qedf/qedf_main.c | 3 +-
drivers/scsi/qedi/qedi_fw.c | 4 +-
drivers/scsi/qedi/qedi_iscsi.c | 1 +
drivers/scsi/qla1280.c | 21 +-
drivers/scsi/qla1280.h | 3 +-
drivers/scsi/qla2xxx/qla_def.h | 2 -
drivers/scsi/qla2xxx/qla_os.c | 13 +-
drivers/scsi/qla4xxx/ql4_def.h | 16 +-
drivers/scsi/qla4xxx/ql4_os.c | 13 +-
drivers/scsi/qlogicfas.c | 6 +-
drivers/scsi/qlogicfas408.c | 6 +-
drivers/scsi/scsi.h | 46 ----
drivers/scsi/sg.c | 8 +-
drivers/scsi/sgiwd93.c | 24 +-
drivers/scsi/smartpqi/smartpqi_init.c | 14 +-
drivers/scsi/sun3_scsi.c | 4 +-
drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +-
drivers/scsi/wd33c93.c | 119 ++++----
drivers/scsi/wd33c93.h | 4 +
drivers/scsi/wd719x.c | 12 +-
drivers/scsi/wd719x.h | 1 +
drivers/scsi/zalon.c | 1 +
drivers/usb/image/microtek.c | 8 +-
drivers/usb/storage/debug.c | 1 -
drivers/usb/storage/uas.c | 43 ++-
include/scsi/libfc.h | 9 +
include/scsi/libiscsi.h | 12 +
include/scsi/scsi_cmnd.h | 14 +-
113 files changed, 1470 insertions(+), 1084 deletions(-)
rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (75%)
delete mode 100644 drivers/scsi/scsi.hPATCH v5 1/49 scsi: ips: Remove an unreachable statement
Whether or not CONFIG_BUG is enabled, BUG() never returns. Hence, code past a BUG() statement is unreachable. Remove one such unreachable statement.
--- drivers/scsi/ips.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/ips.c +0 -1
@@ -655,7 +655,6 @@ ips_release(struct Scsi_Host *sh)printk (KERN_WARNING "(%s) release, invalid Scsi_Host pointer.\n" , ips_name);BUG (); -return (FALSE); } ha =IPS_HA (sh);
PATCH v5 2/49 scsi: ips: Change the return type of ips_release() into 'void'
In reply to Bart Van Asscheips_release() has one caller and that caller ignores the value returned by ips_release(). Hence change the return type of that function into 'void'.
--- drivers/scsi/ips.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/scsi/ips.c +2 -5
@@ -638,8 +638,7 @@ ips_setup_funclist(ips_ha_t * ha)/* Remove a driver */ /* */ /****************************************************************************/ -static int -ips_release (struct Scsi_Host *sh) +static void ips_release (struct Scsi_Host *sh) {ips_scb_t *scb;ips_ha_t *ha;
@@ -660,7 +659,7 @@ ips_release(struct Scsi_Host *sh) ha =IPS_HA (sh);if (!ha) -return (FALSE); +return ;/* flush the cache on the controller */ scb = &ha->scbs[ha->max_cmds -1 ];
@@ -698,8 +697,6 @@ ips_release(struct Scsi_Host *sh)scsi_host_put (sh); ips_released_controllers++; - -return (FALSE); }/****************************************************************************/
PATCH v5 3/49 scsi: ips: Use true and false instead of TRUE and FALSE
In reply to Bart Van AsscheThis patch prepares for removal of the drivers/scsi/scsi.h header file. That header file defines the 'TRUE' and 'FALSE' constants.
--- drivers/scsi/ips.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-)
drivers/scsi/ips.c +17 -19
@@ -945,7 +945,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)scsi_done (scsi_cmd); } - ha->active = FALSE; + ha->active = false;return (FAILED ); }
@@ -974,7 +974,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)scsi_done (scsi_cmd); } - ha->active = FALSE; + ha->active = false;return (FAILED ); }
@@ -1287,7 +1287,7 @@ ips_intr_copperhead(ips_ha_t * ha)return 0 ; } -while (TRUE) { +while (true) { sp = &ha->sp; intrstatus = (*ha->func.isintr) (ha);
@@ -1351,7 +1351,7 @@ ips_intr_morpheus(ips_ha_t * ha)return 0 ; } -while (TRUE) { +while (true) { sp = &ha->sp; intrstatus = (*ha->func.isintr) (ha);
@@ -3086,8 +3086,8 @@ ipsintr_blocking(ips_ha_t * ha, ips_scb_t * scb)METHOD_TRACE ("ipsintr_blocking" ,2 );ips_freescb (ha, scb); -if ((ha->waitflag == TRUE) && (ha->cmd_in_progress == scb->cdb[0 ])) { - ha->waitflag = FALSE; +if (ha->waitflag && ha->cmd_in_progress == scb->cdb[0 ]) { + ha->waitflag = false;return ; }
@@ -3387,7 +3387,7 @@ ips_send_wait(ips_ha_t * ha, ips_scb_t * scb, int timeout, int intr)METHOD_TRACE ("ips_send_wait" ,1 );if (intr !=IPS_FFDC ) {/* Won't be Waiting if this is a Time Stamp */ - ha->waitflag = TRUE; + ha->waitflag = true; ha->cmd_in_progress = scb->cdb[0 ]; } scb->callback = ipsintr_blocking;
@@ -3464,10 +3464,8 @@ ips_send_cmd(ips_ha_t * ha, ips_scb_t * scb)if (scb->bus >0 ) {/* Controller commands can't be issued */ /* to real devices -- fail them */ -if ((ha->waitflag == TRUE) && - (ha->cmd_in_progress == scb->cdb[0 ])) { - ha->waitflag = FALSE; - } +if (ha->waitflag && ha->cmd_in_progress == scb->cdb[0 ]) + ha->waitflag = false;return (1 ); }
@@ -4615,7 +4613,7 @@ ips_poll_for_flush_complete(ips_ha_t * ha) {IPS_STATUS cstatus; -while (TRUE) { +while (true) { cstatus.value = (*ha->func.statupd) (ha);if (cstatus.value ==0xffffffff )/* If No Interrupt to process */
@@ -5538,26 +5536,26 @@ ips_wait(ips_ha_t * ha, int time, int intr)METHOD_TRACE ("ips_wait" ,1 ); ret =IPS_FAILURE ; - done = FALSE; + done = false; time *=IPS_ONE_SEC ;/* convert seconds */ while ((time >0 ) && (!done)) {if (intr ==IPS_INTR_ON ) { -if (ha->waitflag == FALSE) { +if (!ha->waitflag) { ret =IPS_SUCCESS ; - done = TRUE; + done = true;break ; } }else if (intr ==IPS_INTR_IORL ) { -if (ha->waitflag == FALSE) { +if (!ha->waitflag) {/* * controller generated an interrupt to * acknowledge completion of the command * and ips_intr() has serviced the interrupt. */ ret =IPS_SUCCESS ; - done = TRUE; + done = true;break ; }
@@ -5592,7 +5590,7 @@ ips_write_driver_status(ips_ha_t * ha, int intr) {METHOD_TRACE ("ips_write_driver_status" ,1 ); -if (!ips_readwrite_page5 (ha, FALSE, intr)) { +if (!ips_readwrite_page5 (ha, false, intr)) {IPS_PRINTK (KERN_WARNING , ha->pcidev,"unable to read NVRAM page 5.\n" );
@@ -5630,7 +5628,7 @@ ips_write_driver_status(ips_ha_t * ha, int intr) ha->nvram->versioning =0 ;/* Indicate the Driver Does Not Support Versioning */ /* now update the page */ -if (!ips_readwrite_page5 (ha, TRUE, intr)) { +if (!ips_readwrite_page5 (ha, true, intr)) {IPS_PRINTK (KERN_WARNING , ha->pcidev,"unable to write NVRAM page 5.\n" );
PATCH v5 4/49 scsi: nsp_cs: Change the return type of two functions into 'void'
In reply to Bart Van Asschensp_reselected() and nsphw_init() always return TRUE. Change the return type of these functions into 'void'.
--- drivers/scsi/pcmcia/nsp_cs.c | 17 +++++------------ drivers/scsi/pcmcia/nsp_cs.h | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-)
drivers/scsi/pcmcia/nsp_cs.c +5 -12
@@ -298,7 +298,7 @@ static void nsphw_init_sync(nsp_hw_data *data)/* * Initialize Ninja hardware */ -static int nsphw_init (nsp_hw_data *data) +static void nsphw_init (nsp_hw_data *data) {unsigned int base = data->BaseAddress;
@@ -349,8 +349,6 @@ static int nsphw_init(nsp_hw_data *data)nsp_write (base,IRQCONTROL ,IRQCONTROL_ALLCLEAR );nsp_setup_fifo (data, FALSE); - -return TRUE; }/*
@@ -643,7 +641,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt)/* * accept reselection */ -static int nsp_reselected (struct scsi_cmnd *SCpnt) +static void nsp_reselected (struct scsi_cmnd *SCpnt) {unsigned int base = SCpnt->device->host->io_port;unsigned int host_id = SCpnt->device->host->this_id;
@@ -675,8 +673,6 @@ static int nsp_reselected(struct scsi_cmnd *SCpnt) bus_reg =nsp_index_read (base,SCSIBUSCTRL ) & ~(SCSI_BSY |SCSI_ATN );nsp_index_write (base,SCSIBUSCTRL , bus_reg);nsp_index_write (base,SCSIBUSCTRL , bus_reg |AUTODIRECTION |ACKENB ); - -return TRUE; }/*
@@ -1057,9 +1053,8 @@ static irqreturn_t nspintr(int irq, void *dev_id)if (irq_phase &RESELECT_IRQ ) {nsp_dbg (NSP_DEBUG_INTR ,"reselect" );nsp_write (base,IRQCONTROL ,IRQCONTROL_RESELECT_CLEAR ); -if (nsp_reselected (tmpSC) != FALSE) { -return IRQ_HANDLED ; - } +nsp_reselected (tmpSC); +return IRQ_HANDLED ; }if ((irq_phase & (PHASE_CHANGE_IRQ |LATCHED_BUS_FREE )) ==0 ) {
@@ -1614,9 +1609,7 @@ static int nsp_cs_config(struct pcmcia_device *link)nsp_dbg (NSP_DEBUG_INIT ,"I/O[0x%x+0x%x] IRQ %d" , data->BaseAddress, data->NumAddress, data->IrqNumber); -if (nsphw_init (data) == FALSE) { - goto cs_failed; - } +nsphw_init (data); host =nsp_detect (&nsp_driver_template);
drivers/scsi/pcmcia/nsp_cs.h +2 -2
@@ -304,7 +304,7 @@ static int nsp_eh_host_reset (struct scsi_cmnd *SCpnt);static int nsp_bus_reset (nsp_hw_data *data);/* */ -static int nsphw_init (nsp_hw_data *data); +static void nsphw_init (nsp_hw_data *data);static int nsphw_start_selection (struct scsi_cmnd *SCpnt);static void nsp_start_timer (struct scsi_cmnd *SCpnt,int time);static int nsp_fifo_count (struct scsi_cmnd *SCpnt);
@@ -320,7 +320,7 @@ static int nsp_expect_signal (struct scsi_cmnd *SCpnt, unsigned char mask);static int nsp_xfer (struct scsi_cmnd *SCpnt,int phase);static int nsp_dataphase_bypass (struct scsi_cmnd *SCpnt); -static int nsp_reselected (struct scsi_cmnd *SCpnt); +static void nsp_reselected (struct scsi_cmnd *SCpnt);static struct Scsi_Host *nsp_detect (struct scsi_host_template *sht);/* Interrupt handler */
PATCH v5 5/49 scsi: nsp_cs: Use true and false instead of TRUE and FALSE
In reply to Bart Van AsscheThis patch prepares for removal of the drivers/scsi/scsi.h header file. That header file defines the 'TRUE' and 'FALSE' constants.
--- drivers/scsi/pcmcia/nsp_cs.c | 26 +++++++++++++------------- drivers/scsi/pcmcia/nsp_cs.h | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-)
drivers/scsi/pcmcia/nsp_cs.c +13 -13
@@ -243,7 +243,7 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt) SCpnt->SCp.buffers_residual =0 ; } -if (nsphw_start_selection (SCpnt) == FALSE) { +if (!nsphw_start_selection (SCpnt)) {nsp_dbg (NSP_DEBUG_QUEUECOMMAND ,"selection fail" ); SCpnt->result =DID_BUS_BUSY <<16 ;nsp_scsi_done (SCpnt);
@@ -263,14 +263,14 @@ static DEF_SCSI_QCMD(nsp_queuecommand)/* * setup PIO FIFO transfer mode and enable/disable to data out */ -static void nsp_setup_fifo (nsp_hw_data *data,int enabled) +static void nsp_setup_fifo (nsp_hw_data *data,bool enabled) {unsigned int base = data->BaseAddress;unsigned char transfer_mode_reg;//nsp_dbg(NSP_DEBUG_DATA_IO, "enabled=%d", enabled); -if (enabled != FALSE) { +if (enabled) { transfer_mode_reg =TRANSFER_GO |BRAIND ; }else { transfer_mode_reg =0 ;
@@ -348,13 +348,13 @@ static void nsphw_init(nsp_hw_data *data) SCSI_RESET_IRQ_EI );nsp_write (base,IRQCONTROL ,IRQCONTROL_ALLCLEAR ); -nsp_setup_fifo (data, FALSE); +nsp_setup_fifo (data, false); }/* * Start selection phase */ -static int nsphw_start_selection (struct scsi_cmnd *SCpnt) +static bool nsphw_start_selection (struct scsi_cmnd *SCpnt) {unsigned int host_id = SCpnt->device->host->this_id;unsigned int base = SCpnt->device->host->io_port;
@@ -368,7 +368,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt) phase =nsp_index_read (base,SCSIBUSMON );if (phase !=BUSMON_BUS_FREE ) {//nsp_dbg(NSP_DEBUG_RESELECTION, "bus busy"); -return FALSE; +return false; }/* start arbitration */
@@ -388,7 +388,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt)if (!(arbit &ARBIT_WIN )) {//nsp_dbg(NSP_DEBUG_RESELECTION, "arbit fail"); nsp_index_write (base,SETARBIT ,ARBIT_FLAG_CLEAR ); -return FALSE; +return false; }/* assert select line */
@@ -407,7 +407,7 @@ static int nsphw_start_selection(struct scsi_cmnd *SCpnt)nsp_start_timer (SCpnt,1000 /51 ); data->SelectionTimeOut =1 ; -return TRUE; +return true; }struct nsp_sync_table {
@@ -477,7 +477,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt) sync->SyncRegister =0 ; sync->AckWidth =0 ; -return FALSE; +return false; } sync->SyncRegister = (sync_table->chip_period << SYNCREG_PERIOD_SHIFT) |
@@ -486,7 +486,7 @@ static int nsp_analyze_sdtr(struct scsi_cmnd *SCpnt)nsp_dbg (NSP_DEBUG_SYNC ,"sync_reg=0x%x, ack_width=0x%x" , sync->SyncRegister, sync->AckWidth); -return TRUE; +return true; }
@@ -633,7 +633,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt)nsp_dbg (NSP_DEBUG_DATA_IO ,"use bypass quirk" ); SCpnt->SCp.phase =PH_DATA ;nsp_pio_read (SCpnt); -nsp_setup_fifo (data, FALSE); +nsp_setup_fifo (data, false);return 0 ; }
@@ -927,7 +927,7 @@ static int nsp_nexus(struct scsi_cmnd *SCpnt) }/* setup pdma fifo */ -nsp_setup_fifo (data, TRUE); +nsp_setup_fifo (data, true);/* clear ack counter */ data->FifoCount =0 ;
@@ -1210,7 +1210,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)//*sync_neg = SYNC_NOT_YET; data->MsgLen = i =0 ; - data->MsgBuffer[i] =IDENTIFY (TRUE, lun); i++; + data->MsgBuffer[i] =IDENTIFY (true, lun); i++;if (*sync_neg ==SYNC_NOT_YET ) { data->Sync[target].SyncPeriod =0 ;
drivers/scsi/pcmcia/nsp_cs.h +1 -1
@@ -305,7 +305,7 @@ static int nsp_bus_reset (nsp_hw_data *data);/* */ static void nsphw_init (nsp_hw_data *data); -static int nsphw_start_selection (struct scsi_cmnd *SCpnt); +static bool nsphw_start_selection (struct scsi_cmnd *SCpnt);static void nsp_start_timer (struct scsi_cmnd *SCpnt,int time);static int nsp_fifo_count (struct scsi_cmnd *SCpnt);static void nsp_pio_read (struct scsi_cmnd *SCpnt);
PATCH v5 6/49 scsi: Remove drivers/scsi/scsi.h
In reply to Bart Van AsscheThe following two header files have the same file name: include/scsi/scsi.h and drivers/scsi/scsi.h. This is confusing. Remove the latter since the following note was added in drivers/scsi/scsi.h in 2004:
"NOTE: this file only contains compatibility glue for old drivers. All these wrappers will be removed sooner or later. For new code please use the interfaces declared in the headers in include/scsi/"
--- drivers/scsi/a2091.c | 6 +++- drivers/scsi/a3000.c | 6 +++- drivers/scsi/aha152x.c | 9 ++++-- drivers/scsi/aha1740.c | 6 +++- drivers/scsi/arm/acornscsi.c | 6 +++- drivers/scsi/arm/arxescsi.c | 6 +++- drivers/scsi/arm/cumana_2.c | 6 +++- drivers/scsi/arm/eesox.c | 6 +++- drivers/scsi/arm/fas216.c | 6 +++- drivers/scsi/arm/powertec.c | 6 +++- drivers/scsi/arm/queue.c | 6 +++- drivers/scsi/gvp11.c | 6 +++- drivers/scsi/ips.c | 8 ++++-- drivers/scsi/megaraid.c | 8 ++++-- drivers/scsi/mvme147.c | 6 +++- drivers/scsi/pcmcia/aha152x_stub.c | 9 ++++-- drivers/scsi/pcmcia/nsp_cs.c | 5 ++-- drivers/scsi/pcmcia/qlogic_stub.c | 9 ++++-- drivers/scsi/qlogicfas.c | 6 +++- drivers/scsi/qlogicfas408.c | 6 +++- drivers/scsi/scsi.h | 46 ------------------------------ drivers/scsi/sg.c | 8 ++++-- drivers/scsi/sgiwd93.c | 6 +++- drivers/usb/image/microtek.c | 8 ++++-- drivers/usb/storage/debug.c | 1 - 25 files changed, 119 insertions(+), 82 deletions(-) delete mode 100644 drivers/scsi/scsi.h
drivers/scsi/a2091.c +5 -1
@@ -12,7 +12,11 @@#include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "a2091.h"
drivers/scsi/a3000.c +5 -1
@@ -13,7 +13,11 @@#include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "a3000.h"
drivers/scsi/aha152x.c +6 -3
@@ -243,13 +243,16 @@#include <linux/workqueue.h> #include <linux/list.h> #include <linux/slab.h> -#include <scsi/scsicam.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include <scsi/scsi_transport_spi.h> -#include <scsi/scsi_eh.h> +#include <scsi/scsicam.h> #include "aha152x.h" static LIST_HEAD (aha152x_host_list);
drivers/scsi/aha1740.c +5 -1
@@ -55,8 +55,12 @@#include <asm/dma.h> #include <asm/io.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "aha1740.h" /* IF YOU ARE HAVING PROBLEMS WITH THIS DRIVER, AND WANT TO WATCH
drivers/scsi/arm/acornscsi.c +5 -1
@@ -126,9 +126,13 @@#include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include <scsi/scsi_transport_spi.h> #include "acornscsi.h" #include "msgqueue.h"
drivers/scsi/arm/arxescsi.c +5 -1
@@ -35,8 +35,12 @@#include <asm/io.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" struct arxescsi_info {
drivers/scsi/arm/cumana_2.c +5 -1
@@ -29,8 +29,12 @@#include <asm/ecard.h> #include <asm/io.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h"
drivers/scsi/arm/eesox.c +5 -1
@@ -35,8 +35,12 @@#include <asm/dma.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h"
drivers/scsi/arm/fas216.c +5 -1
@@ -47,9 +47,13 @@#include <asm/irq.h> #include <asm/ecard.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h"
drivers/scsi/arm/powertec.c +5 -1
@@ -20,8 +20,12 @@#include <asm/ecard.h> #include <asm/io.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "fas216.h" #include "scsi.h"
drivers/scsi/arm/queue.c +5 -1
@@ -20,7 +20,11 @@#include <linux/list.h> #include <linux/init.h> -#include "../scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #define DEBUG
drivers/scsi/gvp11.c +5 -1
@@ -12,7 +12,11 @@#include <asm/amigaints.h> #include <asm/amigahw.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "gvp11.h"
drivers/scsi/ips.c +6 -2
@@ -180,9 +180,13 @@#include <linux/types.h> #include <linux/dma-mapping.h> -#include <scsi/sg.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> +#include <scsi/sg.h> #include "ips.h"
drivers/scsi/megaraid.c +6 -2
@@ -44,10 +44,14 @@#include <linux/dma-mapping.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <scsi/scsicam.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> +#include <scsi/scsicam.h> #include "megaraid.h"
drivers/scsi/mvme147.c +5 -1
@@ -11,8 +11,12 @@#include <asm/mvme147hw.h> #include <asm/irq.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" #include "mvme147.h"
drivers/scsi/pcmcia/aha152x_stub.c +6 -3
@@ -40,13 +40,16 @@#include <linux/slab.h> #include <linux/string.h> #include <linux/ioport.h> -#include <scsi/scsi.h> #include <linux/major.h> #include <linux/blkdev.h> -#include <scsi/scsi_ioctl.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include "aha152x.h" #include <pcmcia/cistpl.h>
drivers/scsi/pcmcia/nsp_cs.c +2 -3
@@ -41,10 +41,9 @@#include <asm/io.h> #include <asm/irq.h> -#include <../drivers/scsi/scsi.h> -#include <scsi/scsi_host.h> -#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_host.h> #include <scsi/scsi_ioctl.h> #include <pcmcia/cistpl.h>
drivers/scsi/pcmcia/qlogic_stub.c +6 -3
@@ -38,14 +38,17 @@#include <linux/string.h> #include <linux/ioport.h> #include <asm/io.h> -#include <scsi/scsi.h> #include <linux/major.h> #include <linux/blkdev.h> -#include <scsi/scsi_ioctl.h> #include <linux/interrupt.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include "../qlogicfas408.h" #include <pcmcia/cistpl.h>
drivers/scsi/qlogicfas.c +5 -1
@@ -31,8 +31,12 @@#include <asm/irq.h> #include <asm/dma.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "qlogicfas408.h" /* Set the following to 2 to use normal interrupt (active high/totempole-
drivers/scsi/qlogicfas408.c +5 -1
@@ -55,8 +55,12 @@#include <asm/irq.h> #include <asm/dma.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "qlogicfas408.h" /*----------------------------------------------------------------*/
drivers/scsi/scsi.h deleted +0 -46
46 lines not on this page · raw message
drivers/scsi/sg.c +6 -2
@@ -49,11 +49,15 @@ static int sg_version_num = 30536; /* 2 digits for each component */#include <linux/uio.h> #include <linux/cred.h> /* for sg_check_file_access() */ -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_dbg.h> -#include <scsi/scsi_host.h> +#include <scsi/scsi_device.h> #include <scsi/scsi_driver.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_host.h> #include <scsi/scsi_ioctl.h> +#include <scsi/scsi_tcq.h> #include <scsi/sg.h> #include "scsi_logging.h"
drivers/scsi/sgiwd93.c +5 -1
@@ -28,7 +28,11 @@#include <asm/sgi/ip22.h> #include <asm/sgi/wd.h> -#include "scsi.h" +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> +#include <scsi/scsi_tcq.h> #include "wd33c93.h" struct ip22_hostdata {
drivers/usb/image/microtek.c +6 -2
@@ -130,11 +130,15 @@#include <linux/spinlock.h> #include <linux/usb.h> #include <linux/proc_fs.h> -#include <linux/atomic.h> #include <linux/blkdev.h> -#include "../../scsi/scsi.h" + +#include <scsi/scsi.h> +#include <scsi/scsi_cmnd.h> +#include <scsi/scsi_device.h> +#include <scsi/scsi_eh.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_tcq.h> #include "microtek.h"
drivers/usb/storage/debug.c +0 -1
@@ -36,7 +36,6 @@#include "usb.h" #include "debug.h" -#include "scsi.h" void usb_stor_show_command (const struct us_data *us,struct scsi_cmnd *srb)
PATCH v5 7/49 scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro
In reply to Bart Van AsscheThis makes it easier to find users of the NCR5380_cmd data structure with 'grep'.
--- drivers/scsi/NCR5380.h | 2 -- drivers/scsi/arm/cumana_1.c | 2 +- drivers/scsi/arm/oak.c | 2 +- drivers/scsi/atari_scsi.c | 2 +- drivers/scsi/dmx3191d.c | 2 +- drivers/scsi/g_NCR5380.c | 2 +- drivers/scsi/mac_scsi.c | 2 +- drivers/scsi/sun3_scsi.c | 2 +- 8 files changed, 7 insertions(+), 9 deletions(-)
drivers/scsi/NCR5380.h +0 -2
@@ -230,8 +230,6 @@ struct NCR5380_cmd {struct list_head list; }; -#define NCR5380_CMD_SIZE (sizeof(struct NCR5380_cmd)) -#define NCR5380_PIO_CHUNK_SIZE 256/* Time limit (ms) to poll registers when IRQs are disabled, e.g. during PDMA */
drivers/scsi/arm/cumana_1.c +1 -1
@@ -223,7 +223,7 @@ static struct scsi_host_template cumanascsi_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = 2, .proc_name = "CumanaSCSI-1", - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), .max_sectors = 128, .dma_boundary = PAGE_SIZE - 1, };
drivers/scsi/arm/oak.c +1 -1
@@ -113,7 +113,7 @@ static struct scsi_host_template oakscsi_template = { .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, .proc_name = "oakscsi", - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), .max_sectors = 128, };
drivers/scsi/atari_scsi.c +1 -1
@@ -711,7 +711,7 @@ static struct scsi_host_template atari_scsi_template = { .this_id = 7, .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), };static int __init atari_scsi_probe (struct platform_device *pdev)
drivers/scsi/dmx3191d.c +1 -1
@@ -52,7 +52,7 @@ static struct scsi_host_template dmx3191d_driver_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), }; static int dmx3191d_probe_one(struct pci_dev *pdev,
drivers/scsi/g_NCR5380.c +1 -1
@@ -702,7 +702,7 @@ static struct scsi_host_template driver_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), .max_sectors = 128, };
drivers/scsi/mac_scsi.c +1 -1
@@ -434,7 +434,7 @@ static struct scsi_host_template mac_scsi_template = { .sg_tablesize = 1, .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), .max_sectors = 128, };
drivers/scsi/sun3_scsi.c +1 -1
@@ -505,7 +505,7 @@ static struct scsi_host_template sun3_scsi_template = { .sg_tablesize = 1, .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, - .cmd_size = NCR5380_CMD_SIZE, + .cmd_size = sizeof(struct NCR5380_cmd), };static int __init sun3_scsi_probe (struct platform_device *pdev)
PATCH v5 8/49 scsi: NCR5380: Add SCp members to struct NCR5380_cmd
In reply to Bart Van AsscheFrom: Finn Thain <[email protected]>
This is necessary for the eventual removal of SCp from struct scsi_cmnd.
--- drivers/scsi/NCR5380.c | 94 +++++++++++++++++++-------------------- drivers/scsi/NCR5380.h | 11 +++++ drivers/scsi/atari_scsi.c | 4 +- drivers/scsi/g_NCR5380.c | 4 +- drivers/scsi/mac_scsi.c | 7 +-- drivers/scsi/sun3_scsi.c | 2 +- 6 files changed, 66 insertions(+), 56 deletions(-)
drivers/scsi/NCR5380.c +46 -48
@@ -84,8 +84,7 @@* On command termination, the done function will be called as * appropriate. * -* SCSI pointers are maintained in the SCp field of SCSI command -* structures, being initialized after the command is connected +* The command data pointer is initialized after the command is connected * in NCR5380_select, and set as appropriate in NCR5380_information_transfer. * Note that in violation of the standard, an implicit SAVE POINTERS operation * is done, since some BROKEN disks fail to issue an explicit SAVE POINTERS.
@@ -145,40 +144,38 @@ static void bus_reset_cleanup(struct Scsi_Host *);static inline void initialize_SCp (struct scsi_cmnd *cmd) { -/* -* Initialize the Scsi Pointer field so that all of the commands in the -* various queues are valid. -*/ +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (cmd);if (scsi_bufflen (cmd)) { - cmd->SCp.buffer =scsi_sglist (cmd); - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); - cmd->SCp.this_residual = cmd->SCp.buffer->length; + ncmd->buffer =scsi_sglist (cmd); + ncmd->ptr =sg_virt (ncmd->buffer); + ncmd->this_residual = ncmd->buffer->length; }else { - cmd->SCp.buffer =NULL ; - cmd->SCp.ptr =NULL ; - cmd->SCp.this_residual =0 ; + ncmd->buffer =NULL ; + ncmd->ptr =NULL ; + ncmd->this_residual =0 ; } - cmd->SCp.Status =0 ; - cmd->SCp.Message =0 ; + ncmd->status =0 ; + ncmd->message =0 ; } -static inline void advance_sg_buffer (struct scsi_cmnd *cmd) +static inline void advance_sg_buffer (struct NCR5380_cmd *ncmd) { -struct scatterlist *s = cmd->SCp.buffer; +struct scatterlist *s = ncmd->buffer; -if (!cmd->SCp.this_residual && s && !sg_is_last (s)) { - cmd->SCp.buffer =sg_next (s); - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); - cmd->SCp.this_residual = cmd->SCp.buffer->length; +if (!ncmd->this_residual && s && !sg_is_last (s)) { + ncmd->buffer =sg_next (s); + ncmd->ptr =sg_virt (ncmd->buffer); + ncmd->this_residual = ncmd->buffer->length; } }static inline void set_resid_from_SCp (struct scsi_cmnd *cmd) { -int resid = cmd->SCp.this_residual; -struct scatterlist *s = cmd->SCp.buffer; +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (cmd); +int resid = ncmd->this_residual; +struct scatterlist *s = ncmd->buffer;if (s)while (!sg_is_last (s)) {
@@ -564,7 +561,7 @@ static int NCR5380_queue_command(struct Scsi_Host *instance, struct scsi_cmnd *cmd) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -struct NCR5380_cmd *ncmd =scsi_cmd_priv (cmd); +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (cmd);unsigned long flags;#if (NDEBUG &NDEBUG_NO_WRITE )
@@ -672,7 +669,7 @@ static struct scsi_cmnd *dequeue_next_cmd(struct Scsi_Host *instance)static void requeue_cmd (struct Scsi_Host *instance,struct scsi_cmnd *cmd) {struct NCR5380_hostdata *hostdata =shost_priv (instance); -struct NCR5380_cmd *ncmd =scsi_cmd_priv (cmd); +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (cmd);if (hostdata->sensing == cmd) {scsi_eh_restore_cmnd (cmd, &hostdata->ses);
@@ -757,6 +754,7 @@ static void NCR5380_main(struct work_struct *work)static void NCR5380_dma_complete (struct Scsi_Host *instance) {struct NCR5380_hostdata *hostdata =shost_priv (instance); +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (hostdata->connected);int transferred;unsigned char **data;int *count;
@@ -764,7 +762,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance)unsigned char p;if (hostdata->read_overruns) { - p = hostdata->connected->SCp.phase; + p = ncmd->phase;if (p &SR_IO ) {udelay (10 ); if ((NCR5380_read(BUS_AND_STATUS_REG) &
@@ -801,8 +799,8 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance) transferred = hostdata->dma_len -NCR5380_dma_residual (hostdata); hostdata->dma_len =0 ; - data = (unsigned char **)&hostdata->connected->SCp.ptr; - count = &hostdata->connected->SCp.this_residual; + data = (unsigned char **)&ncmd->ptr; + count = &ncmd->this_residual; *data += transferred; *count -= transferred;
@@ -1498,7 +1496,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,return -1 ; } - hostdata->connected->SCp.phase = p; +NCR5380_to_ncmd (hostdata->connected)->phase = p;if (p &SR_IO ) {if (hostdata->read_overruns)
@@ -1690,7 +1688,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)#endif while ((cmd = hostdata->connected)) { -struct NCR5380_cmd *ncmd =scsi_cmd_priv (cmd); +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (cmd); tmp =NCR5380_read (STATUS_REG );/* We only have a valid SCSI phase when REQ is asserted */
@@ -1705,17 +1703,17 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) sun3_dma_setup_done != cmd) {int count; -advance_sg_buffer (cmd); +advance_sg_buffer (ncmd); count =sun3scsi_dma_xfer_len (hostdata, cmd);if (count >0 ) {if (cmd->sc_data_direction ==DMA_TO_DEVICE )sun3scsi_dma_send_setup (hostdata, - cmd->SCp.ptr, count); + ncmd->ptr, count);else sun3scsi_dma_recv_setup (hostdata, - cmd->SCp.ptr, count); + ncmd->ptr, count); sun3_dma_setup_done = cmd; }#ifdef SUN3_SCSI_VME
@@ -1755,11 +1753,11 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)* scatter-gather list, move onto the next one. */ -advance_sg_buffer (cmd); +advance_sg_buffer (ncmd);dsprintk (NDEBUG_INFORMATION , instance,"this residual %d, sg ents %d\n" , - cmd->SCp.this_residual, -sg_nents (cmd->SCp.buffer)); + ncmd->this_residual, +sg_nents (ncmd->buffer));/* * The preferred transfer method is going to be
@@ -1778,7 +1776,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)if (transfersize >0 ) { len = transfersize;if (NCR5380_transfer_dma (instance, &phase, - &len, (unsigned char **)&cmd->SCp.ptr)) { + &len, (unsigned char **)&ncmd->ptr)) {/* * If the watchdog timer fires, all future * accesses to this device will use the
@@ -1794,13 +1792,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)/* Transfer a small chunk so that the * irq mode lock is not held too long. */ - transfersize =min (cmd->SCp.this_residual, + transfersize =min (ncmd->this_residual,NCR5380_PIO_CHUNK_SIZE ); len = transfersize;NCR5380_transfer_pio (instance, &phase, &len, - (unsigned char **)&cmd->SCp.ptr, + (unsigned char **)&ncmd->ptr,0 ); - cmd->SCp.this_residual -= transfersize - len; + ncmd->this_residual -= transfersize - len; }#ifdef CONFIG_SUN3 if (sun3_dma_setup_done == cmd)
@@ -1811,7 +1809,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) len =1 ; data = &tmp;NCR5380_transfer_pio (instance, &phase, &len, &data,0 ); - cmd->SCp.Message = tmp; + ncmd->message = tmp;switch (tmp) {case ABORT :
@@ -1828,15 +1826,15 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) hostdata->connected =NULL ; hostdata->busy[scmd_id (cmd)] &= ~(1 << cmd->device->lun); -set_status_byte (cmd, cmd->SCp.Status); +set_status_byte (cmd, ncmd->status);set_resid_from_SCp (cmd);if (cmd->cmnd[0 ] ==REQUEST_SENSE )complete_cmd (instance, cmd);else { -if (cmd->SCp.Status ==SAM_STAT_CHECK_CONDITION || - cmd->SCp.Status ==SAM_STAT_COMMAND_TERMINATED ) { +if (ncmd->status ==SAM_STAT_CHECK_CONDITION || + ncmd->status ==SAM_STAT_COMMAND_TERMINATED ) {dsprintk (NDEBUG_QUEUES , instance,"autosense: adding cmd %p to tail of autosense queue\n" , cmd); list_add_tail(&ncmd->list,
@@ -2000,7 +1998,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) len =1 ; data = &tmp;NCR5380_transfer_pio (instance, &phase, &len, &data,0 ); - cmd->SCp.Status = tmp; + ncmd->status = tmp;break ;default :shost_printk (KERN_ERR , instance,"unknown phase\n" );
@@ -2153,17 +2151,17 @@ static void NCR5380_reselect(struct Scsi_Host *instance)if (sun3_dma_setup_done != tmp) {int count; -advance_sg_buffer (tmp); +advance_sg_buffer (ncmd); count =sun3scsi_dma_xfer_len (hostdata, tmp);if (count >0 ) {if (tmp->sc_data_direction ==DMA_TO_DEVICE )sun3scsi_dma_send_setup (hostdata, - tmp->SCp.ptr, count); + ncmd->ptr, count);else sun3scsi_dma_recv_setup (hostdata, - tmp->SCp.ptr, count); + ncmd->ptr, count); sun3_dma_setup_done = tmp; } }
@@ -2206,7 +2204,7 @@ static bool list_del_cmd(struct list_head *haystack, struct scsi_cmnd *needle) {if (list_find_cmd (haystack, needle)) { -struct NCR5380_cmd *ncmd =scsi_cmd_priv (needle); +struct NCR5380_cmd *ncmd =NCR5380_to_ncmd (needle);list_del (&ncmd->list);return true;
drivers/scsi/NCR5380.h +11 -0
@@ -227,6 +227,12 @@ struct NCR5380_hostdata { };struct NCR5380_cmd { +char *ptr; +int this_residual; +struct scatterlist *buffer; +int status; +int message; +int phase;struct list_head list; };
@@ -240,6 +246,11 @@ static inline struct scsi_cmnd *NCR5380_to_scmd(struct NCR5380_cmd *ncmd_ptr)return ((struct scsi_cmnd *)ncmd_ptr) -1 ; } +static inline struct NCR5380_cmd *NCR5380_to_ncmd (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +#ifndef NDEBUG #define NDEBUG (0)#endif
drivers/scsi/atari_scsi.c +2 -2
@@ -538,7 +538,7 @@ static int falcon_classify_cmd(struct scsi_cmnd *cmd)static int atari_scsi_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -int wanted_len = cmd->SCp.this_residual; +int wanted_len =NCR5380_to_ncmd (cmd)->this_residual;int possible_len, limit;if (wanted_len <DMA_MIN_SIZE )
@@ -610,7 +610,7 @@ static int atari_scsi_dma_xfer_len(struct NCR5380_hostdata *hostdata, }/* Last step: apply the hard limit on DMA transfers */ - limit = (atari_dma_buffer && !STRAM_ADDR (virt_to_phys (cmd->SCp.ptr))) ? + limit = (atari_dma_buffer && !STRAM_ADDR (virt_to_phys (NCR5380_to_ncmd (cmd)->ptr))) ?STRAM_BUFFER_SIZE :255 *512 ;if (possible_len > limit) possible_len = limit;
drivers/scsi/g_NCR5380.c +2 -2
@@ -663,7 +663,7 @@ static inline int generic_NCR5380_psend(struct NCR5380_hostdata *hostdata,static int generic_NCR5380_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -int transfersize = cmd->SCp.this_residual; +int transfersize =NCR5380_to_ncmd (cmd)->this_residual;if (hostdata->flags &FLAG_NO_PSEUDO_DMA )return 0 ;
@@ -675,7 +675,7 @@ static int generic_NCR5380_dma_xfer_len(struct NCR5380_hostdata *hostdata,/* Limit PDMA send to 512 B to avoid random corruption on DTC3181E */ if (hostdata->board ==BOARD_DTC3181E && cmd->sc_data_direction ==DMA_TO_DEVICE ) - transfersize =min (cmd->SCp.this_residual,512 ); + transfersize =min (transfersize,512 );return min (transfersize,DMA_MAX_SIZE ); }
drivers/scsi/mac_scsi.c +4 -3
@@ -404,11 +404,12 @@ static inline int macscsi_pwrite(struct NCR5380_hostdata *hostdata,static int macscsi_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -if (hostdata->flags &FLAG_NO_PSEUDO_DMA || - cmd->SCp.this_residual < setup_use_pdma) +int resid =NCR5380_to_ncmd (cmd)->this_residual; + +if (hostdata->flags &FLAG_NO_PSEUDO_DMA || resid < setup_use_pdma)return 0 ; -return cmd->SCp.this_residual; +return resid; }static int macscsi_dma_residual (struct NCR5380_hostdata *hostdata)
drivers/scsi/sun3_scsi.c +1 -1
@@ -334,7 +334,7 @@ static int sun3scsi_dma_residual(struct NCR5380_hostdata *hostdata)static int sun3scsi_dma_xfer_len (struct NCR5380_hostdata *hostdata,struct scsi_cmnd *cmd) { -int wanted_len = cmd->SCp.this_residual; +int wanted_len =NCR5380_to_ncmd (cmd)->this_residual;if (wanted_len <DMA_MIN_SIZE ||blk_rq_is_passthrough (scsi_cmd_to_rq (cmd)))return 0 ;
PATCH v5 9/49 scsi: arm: Rename arm/scsi.h into arm/arm_scsi.h
In reply to Bart Van AsscheThe new name makes the purpose of this header file more clear and also makes it easier to find this header file with grep.
---
drivers/scsi/arm/acornscsi.c | 2 +-
drivers/scsi/arm/{scsi.h => arm_scsi.h} | 4 +---
drivers/scsi/arm/cumana_2.c | 2 +-
drivers/scsi/arm/eesox.c | 2 +-
drivers/scsi/arm/fas216.c | 2 +-
drivers/scsi/arm/powertec.c | 2 +-
6 files changed, 6 insertions(+), 8 deletions(-)
rename drivers/scsi/arm/{scsi.h => arm_scsi.h} (97%)drivers/scsi/arm/acornscsi.c +1 -1
@@ -136,7 +136,7 @@#include <scsi/scsi_transport_spi.h> #include "acornscsi.h" #include "msgqueue.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h>
drivers/scsi/arm/arm_scsi.h renamed from drivers/scsi/arm/scsi.h +1 -3
@@ -1,10 +1,8 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* linux/drivers/acorn/scsi/scsi.h -* * Copyright (C) 2002 Russell King * -* Commonly used scsi driver functions. +* Commonly used functions by the ARM SCSI-II drivers. */ #include <linux/scatterlist.h>
drivers/scsi/arm/cumana_2.c +1 -1
@@ -36,7 +36,7 @@#include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h>
drivers/scsi/arm/eesox.c +1 -1
@@ -42,7 +42,7 @@#include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h>
drivers/scsi/arm/fas216.c +1 -1
@@ -55,7 +55,7 @@#include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" /* NOTE: SCSI2 Synchronous transfers *require* DMA according to * the data sheet. This restriction is crazy, especially when
drivers/scsi/arm/powertec.c +1 -1
@@ -27,7 +27,7 @@#include <scsi/scsi_host.h> #include <scsi/scsi_tcq.h> #include "fas216.h" -#include "scsi.h" +#include "arm_scsi.h" #include <scsi/scsicam.h>
PATCH v5 10/49 scsi: arm: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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. The ARM SCSI drivers have been identified as follows:
$ git grep -l '#include.*arm_scsi.h' drivers/scsi/arm/acornscsi.c drivers/scsi/arm/cumana_2.c drivers/scsi/arm/eesox.c drivers/scsi/arm/fas216.c drivers/scsi/arm/powertec.c
--- drivers/scsi/arm/acornscsi.c | 20 ++++++++++++-------- drivers/scsi/arm/arm_scsi.h | 33 +++++++++++++++++++++++---------- drivers/scsi/arm/fas216.c | 28 +++++++++++++++++----------- drivers/scsi/arm/fas216.h | 4 ++++ 4 files changed, 56 insertions(+), 29 deletions(-)
drivers/scsi/arm/acornscsi.c +12 -8
@@ -729,7 +729,7 @@ intr_ret_t acornscsi_kick(AS_Host *host)*/ host->scsi.phase =PHASE_CONNECTING ; host->SCpnt = SCpnt; - host->scsi.SCp = SCpnt->SCp; + host->scsi.SCp = *arm_scsi_pointer (SCpnt); host->dma.xfer_setup =0 ; host->dma.xfer_required =0 ; host->dma.xfer_done =0 ;
@@ -1424,6 +1424,7 @@ unsigned char acornscsi_readmessagebyte(AS_Host *host)static void acornscsi_message (AS_Host *host) { +struct scsi_pointer *scsi_pointer;unsigned char message[16 ];unsigned int msgidx =0 , msglen =1 ;
@@ -1493,8 +1494,9 @@ void acornscsi_message(AS_Host *host)* the saved data pointer for the current I/O process. */ acornscsi_dma_cleanup (host); - host->SCpnt->SCp = host->scsi.SCp; - host->SCpnt->SCp.sent_command =0 ; + scsi_pointer =arm_scsi_pointer (host->SCpnt); + *scsi_pointer = host->scsi.SCp; + scsi_pointer->sent_command =0 ; host->scsi.phase =PHASE_MSGIN ;break ;
@@ -1509,7 +1511,7 @@ void acornscsi_message(AS_Host *host)* the present command and status areas.' */ acornscsi_dma_cleanup (host); - host->scsi.SCp = host->SCpnt->SCp; + host->scsi.SCp = *arm_scsi_pointer (host->SCpnt); host->scsi.phase =PHASE_MSGIN ;break ;
@@ -1809,7 +1811,7 @@ int acornscsi_reconnect_finish(AS_Host *host)/* * Restore data pointer from SAVED pointers. */ - host->scsi.SCp = host->SCpnt->SCp; + host->scsi.SCp = *arm_scsi_pointer (host->SCpnt);#if (DEBUG & (DEBUG_QUEUES |DEBUG_DISCON ))printk (", data pointers: [%p, %X]" , host->scsi.SCp.ptr, host->scsi.SCp.this_residual);
@@ -2408,6 +2410,7 @@ acornscsi_intr(int irq, void *dev_id)*/ static int acornscsi_queuecmd_lck (struct scsi_cmnd *SCpnt) { +struct scsi_pointer *scsi_pointer =arm_scsi_pointer (SCpnt);void (*done)(struct scsi_cmnd *) = scsi_done;AS_Host *host = (AS_Host *)SCpnt->device->host->hostdata;
@@ -2423,9 +2426,9 @@ static int acornscsi_queuecmd_lck(struct scsi_cmnd *SCpnt) SCpnt->host_scribble =NULL ; SCpnt->result =0 ; - SCpnt->SCp.phase = (int )acornscsi_datadirection (SCpnt->cmnd[0 ]); - SCpnt->SCp.sent_command =0 ; - SCpnt->SCp.scsi_xferred =0 ; + scsi_pointer->phase = (int )acornscsi_datadirection (SCpnt->cmnd[0 ]); + scsi_pointer->sent_command =0 ; + scsi_pointer->scsi_xferred =0 ;init_SCp (SCpnt);
@@ -2791,6 +2794,7 @@ static struct scsi_host_template acornscsi_template = { .cmd_per_lun = 2, .dma_boundary = PAGE_SIZE - 1, .proc_name = "acornscsi", + .cmd_size = sizeof(struct arm_cmd_priv), };static int acornscsi_probe (struct expansion_card *ec,const struct ecard_id *id)
drivers/scsi/arm/arm_scsi.h +23 -10
@@ -9,6 +9,17 @@#define BELT_AND_BRACES +struct arm_cmd_priv { +struct scsi_pointer scsi_pointer; +}; + +static inline struct scsi_pointer *arm_scsi_pointer (struct scsi_cmnd *cmd) +{ +struct arm_cmd_priv *acmd =scsi_cmd_priv (cmd); + +return &acmd->scsi_pointer; +} +/* * The scatter-gather list handling. This contains all * the yucky stuff that needs to be fixed properly.
@@ -76,16 +87,18 @@ static inline void put_next_SCp_byte(struct scsi_pointer *SCp, unsigned char c)static inline void init_SCp (struct scsi_cmnd *SCpnt) { -memset (&SCpnt->SCp,0 ,sizeof (struct scsi_pointer )); +struct scsi_pointer *scsi_pointer =arm_scsi_pointer (SCpnt); + +memset (scsi_pointer,0 ,sizeof (struct scsi_pointer ));if (scsi_bufflen (SCpnt)) {unsigned long len =0 ; - SCpnt->SCp.buffer =scsi_sglist (SCpnt); - SCpnt->SCp.buffers_residual =scsi_sg_count (SCpnt) -1 ; - SCpnt->SCp.ptr =sg_virt (SCpnt->SCp.buffer); - SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; - SCpnt->SCp.phase =scsi_bufflen (SCpnt); + scsi_pointer->buffer =scsi_sglist (SCpnt); + scsi_pointer->buffers_residual =scsi_sg_count (SCpnt) -1 ; + scsi_pointer->ptr =sg_virt (scsi_pointer->buffer); + scsi_pointer->this_residual = scsi_pointer->buffer->length; + scsi_pointer->phase =scsi_bufflen (SCpnt);#ifdef BELT_AND_BRACES {/*
@@ -109,15 +122,15 @@ static inline void init_SCp(struct scsi_cmnd *SCpnt)* FIXME: Totaly naive fixup. We should abort * with error */ - SCpnt->SCp.phase = + scsi_pointer->phase = min_t(unsigned long, len, scsi_bufflen(SCpnt)); } }#endif }else { - SCpnt->SCp.ptr =NULL ; - SCpnt->SCp.this_residual =0 ; - SCpnt->SCp.phase =0 ; + scsi_pointer->ptr =NULL ; + scsi_pointer->this_residual =0 ; + scsi_pointer->phase =0 ; } }
drivers/scsi/arm/fas216.c +17 -11
@@ -761,7 +761,7 @@ static void fas216_transfer(FAS216_Info *info)fas216_log (info,LOG_ERROR ,"null buffer passed to " "fas216_starttransfer" );print_SCp (&info->scsi.SCp,"SCp: " ,"\n" ); -print_SCp (&info->SCpnt->SCp,"Cmnd SCp: " ,"\n" ); +print_SCp (arm_scsi_pointer (info->SCpnt),"Cmnd SCp: " ,"\n" );return ; }
@@ -1011,7 +1011,7 @@ fas216_reselected_intr(FAS216_Info *info)/* * Restore data pointer from SAVED data pointer */ - info->scsi.SCp = info->SCpnt->SCp; + info->scsi.SCp = *arm_scsi_pointer (info->SCpnt);fas216_log (info,LOG_CONNECT ,"data pointers: [%p, %X]" , info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
@@ -1054,6 +1054,7 @@ fas216_reselected_intr(FAS216_Info *info)static void fas216_parse_message (FAS216_Info *info,unsigned char *message,int msglen) { +struct scsi_pointer *scsi_pointer;int i;switch (message[0 ]) {
@@ -1078,8 +1079,9 @@ static void fas216_parse_message(FAS216_Info *info, unsigned char *message, int* as required by the SCSI II standard. These always * point to the start of their respective areas. */ - info->SCpnt->SCp = info->scsi.SCp; - info->SCpnt->SCp.sent_command =0 ; + scsi_pointer =arm_scsi_pointer (info->SCpnt); + *scsi_pointer = info->scsi.SCp; + scsi_pointer->sent_command =0 ;fas216_log (info,LOG_CONNECT |LOG_MESSAGES |LOG_BUFFER ,"save data pointers: [%p, %X]" , info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
@@ -1092,7 +1094,7 @@ static void fas216_parse_message(FAS216_Info *info, unsigned char *message, int/* * Restore current data pointer from SAVED data pointer */ - info->scsi.SCp = info->SCpnt->SCp; + info->scsi.SCp = *arm_scsi_pointer (info->SCpnt);fas216_log (info,LOG_CONNECT |LOG_MESSAGES |LOG_BUFFER ,"restore data pointers: [%p, 0x%x]" , info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
@@ -1770,7 +1772,7 @@ static void fas216_start_command(FAS216_Info *info, struct scsi_cmnd *SCpnt)* claim host busy */ info->scsi.phase =PHASE_SELECTION ; - info->scsi.SCp = SCpnt->SCp; + info->scsi.SCp = *arm_scsi_pointer (SCpnt); info->SCpnt = SCpnt; info->dma.transfer_type = fasdma_none;
@@ -1849,7 +1851,7 @@ static void fas216_do_bus_device_reset(FAS216_Info *info,* claim host busy */ info->scsi.phase =PHASE_SELECTION ; - info->scsi.SCp = SCpnt->SCp; + info->scsi.SCp = *arm_scsi_pointer (SCpnt); info->SCpnt = SCpnt; info->dma.transfer_type = fasdma_none;
@@ -1999,11 +2001,13 @@ static void fas216_devicereset_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,static void fas216_rq_sns_done (FAS216_Info *info,struct scsi_cmnd *SCpnt,unsigned int result) { +struct scsi_pointer *scsi_pointer =arm_scsi_pointer (SCpnt); +fas216_log_target (info,LOG_CONNECT , SCpnt->device->id,"request sense complete, result=0x%04x%02x%02x" , - result, SCpnt->SCp.Message, SCpnt->SCp.Status); + result, scsi_pointer->Message, scsi_pointer->Status); -if (result !=DID_OK || SCpnt->SCp.Status !=SAM_STAT_GOOD ) +if (result !=DID_OK || scsi_pointer->Status !=SAM_STAT_GOOD )/* * Something went wrong. Make sure that we don't * have valid data in the sense buffer that could
@@ -2033,6 +2037,8 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,static void fas216_std_done (FAS216_Info *info,struct scsi_cmnd *SCpnt,unsigned int result) { +struct scsi_pointer *scsi_pointer =arm_scsi_pointer (SCpnt); + info->stats.fins +=1 ;set_host_byte (SCpnt, result);
@@ -2107,8 +2113,8 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result)fas216_log_target (info,LOG_CONNECT , SCpnt->device->id,"requesting sense" );init_SCp (SCpnt); - SCpnt->SCp.Message =0 ; - SCpnt->SCp.Status =0 ; + scsi_pointer->Message =0 ; + scsi_pointer->Status =0 ; SCpnt->host_scribble = (void *)fas216_rq_sns_done;/*
drivers/scsi/arm/fas216.h +4 -0
@@ -312,6 +312,10 @@ typedef struct {/* driver-private data per SCSI command. */ struct fas216_cmd_priv { +/* +* @scsi_pointer must be the first member. See also arm_scsi_pointer(). +*/ +struct scsi_pointer scsi_pointer;void (*scsi_done)(struct scsi_cmnd *cmd); };
PATCH v5 11/49 scsi: 53c700: Stop clearing SCSI pointer fields
In reply to Bart Van AsscheNone of the 53c700 drivers uses the SCSI pointer. Hence remove the code from 53c700.c that clears two SCSI pointer fields. The 53c700 drivers are:
$ git grep -l 'include.*53c700' drivers/scsi/53c700.c drivers/scsi/a4000t.c drivers/scsi/bvme6000_scsi.c drivers/scsi/lasi700.c drivers/scsi/mvme16x_scsi.c drivers/scsi/sim710.c drivers/scsi/sni_53c710.c drivers/scsi/zorro7xx.c
--- drivers/scsi/53c700.c | 2 -- 1 file changed, 2 deletions(-)
drivers/scsi/53c700.c +0 -2
@@ -1792,8 +1792,6 @@ static int NCR_700_queuecommand_lck(struct scsi_cmnd *SCp) slot->cmnd = SCp; SCp->host_scribble = (unsigned char *)slot; - SCp->SCp.ptr =NULL ; - SCp->SCp.buffer =NULL ;#ifdef NCR_700_DEBUG printk ("53c700: scsi%d, command " , SCp->device->host->host_no);
PATCH v5 12/49 scsi: aacraid: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/aacraid/aachba.c | 43 ++++++++++++++++++--------------- drivers/scsi/aacraid/aacraid.h | 24 ++++++++++++++---- drivers/scsi/aacraid/comminit.c | 2 +- drivers/scsi/aacraid/linit.c | 21 ++++++++-------- 4 files changed, 54 insertions(+), 36 deletions(-)
drivers/scsi/aacraid/aachba.c +23 -20
@@ -338,7 +338,7 @@ static inline int aac_valid_context(struct scsi_cmnd *scsicmd,aac_fib_complete (fibptr);return 0 ; } - scsicmd->SCp.phase =AAC_OWNER_MIDLEVEL ; +aac_priv (scsicmd)->owner =AAC_OWNER_MIDLEVEL ; device = scsicmd->device;if (unlikely (!device)) {dprintk ((KERN_WARNING "aac_valid_context: scsi device corrupt\n" ));
@@ -592,7 +592,7 @@ static int aac_get_container_name(struct scsi_cmnd * scsicmd)aac_fib_init (cmd_fibcontext); dinfo = (struct aac_get_name *)fib_data (cmd_fibcontext); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; dinfo->command =cpu_to_le32 (VM_ContainerConfig); dinfo->type =cpu_to_le32 (CT_READ_NAME );
@@ -634,14 +634,15 @@ static void _aac_probe_container2(void * context, struct fib * fibptr) {struct fsa_dev_info *fsa_dev_ptr;int (*callback)(struct scsi_cmnd *); -struct scsi_cmnd * scsicmd = (struct scsi_cmnd *)context; +struct scsi_cmnd *scsicmd = context; +struct aac_cmd_priv *cmd_priv =aac_priv (scsicmd);int i;if (!aac_valid_context (scsicmd, fibptr))return ; - scsicmd->SCp.Status =0 ; + cmd_priv->status =0 ; fsa_dev_ptr = fibptr->dev->fsa_dev;if (fsa_dev_ptr) {struct aac_mount * dresp = (struct aac_mount *)fib_data (fibptr);
@@ -679,12 +680,12 @@ static void _aac_probe_container2(void * context, struct fib * fibptr) }if ((fsa_dev_ptr->valid &1 ) ==0 ) fsa_dev_ptr->valid =0 ; - scsicmd->SCp.Status =le32_to_cpu (dresp->count); + cmd_priv->status =le32_to_cpu (dresp->count); }aac_fib_complete (fibptr);aac_fib_free (fibptr); - callback = (int (*)(struct scsi_cmnd *))(scsicmd->SCp.ptr); - scsicmd->SCp.ptr =NULL ; + callback = cmd_priv->callback; + cmd_priv->callback =NULL ; (*callback)(scsicmd);return ; }
@@ -722,7 +723,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr) dinfo->count =cpu_to_le32 (scmd_id (scsicmd)); dinfo->type =cpu_to_le32 (FT_FILESYS ); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status = aac_fib_send(ContainerCommand, fibptr,
@@ -743,6 +744,7 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)static int _aac_probe_container (struct scsi_cmnd * scsicmd,int (*callback)(struct scsi_cmnd *)) { +struct aac_cmd_priv *cmd_priv =aac_priv (scsicmd);struct fib * fibptr;int status = -ENOMEM ;
@@ -761,8 +763,8 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(stru dinfo->count =cpu_to_le32 (scmd_id (scsicmd)); dinfo->type =cpu_to_le32 (FT_FILESYS ); - scsicmd->SCp.ptr = (char *)callback; - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; + cmd_priv->callback = callback; + cmd_priv->owner =AAC_OWNER_FIRMWARE ; status = aac_fib_send(ContainerCommand, fibptr,
@@ -778,7 +780,7 @@ static int _aac_probe_container(struct scsi_cmnd * scsicmd, int (*callback)(strureturn 0 ;if (status <0 ) { - scsicmd->SCp.ptr =NULL ; + cmd_priv->callback =NULL ;aac_fib_complete (fibptr);aac_fib_free (fibptr); }
@@ -817,6 +819,7 @@ static void aac_probe_container_scsi_done(struct scsi_cmnd *scsi_cmnd)int aac_probe_container (struct aac_dev *dev,int cid) {struct scsi_cmnd *scsicmd =kzalloc (sizeof (*scsicmd),GFP_KERNEL ); +struct aac_cmd_priv *cmd_priv =aac_priv (scsicmd);struct scsi_device *scsidev =kzalloc (sizeof (*scsidev),GFP_KERNEL );int status;
@@ -835,7 +838,7 @@ int aac_probe_container(struct aac_dev *dev, int cid)while (scsicmd->device == scsidev)schedule ();kfree (scsidev); - status = scsicmd->SCp.Status; + status = cmd_priv->status;kfree (scsicmd);return status; }
@@ -1128,7 +1131,7 @@ static int aac_get_container_serial(struct scsi_cmnd * scsicmd) dinfo->command =cpu_to_le32 (VM_ContainerConfig); dinfo->type =cpu_to_le32 (CT_CID_TO_32BITS_UID ); dinfo->cid =cpu_to_le32 (scmd_id (scsicmd)); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status = aac_fib_send(ContainerCommand, cmd_fibcontext,
@@ -2486,7 +2489,7 @@ static int aac_read(struct scsi_cmnd * scsicmd)* Alocate and initialize a Fib */ cmd_fibcontext =aac_fib_alloc_tag (dev, scsicmd); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status =aac_adapter_read (cmd_fibcontext, scsicmd, lba, count);/*
@@ -2577,7 +2580,7 @@ static int aac_write(struct scsi_cmnd * scsicmd)* Allocate and initialize a Fib then setup a BlockWrite command */ cmd_fibcontext =aac_fib_alloc_tag (dev, scsicmd); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status =aac_adapter_write (cmd_fibcontext, scsicmd, lba, count, fua);/*
@@ -2660,7 +2663,7 @@ static int aac_synchronize(struct scsi_cmnd *scsicmd) synchronizecmd->cid =cpu_to_le32 (scmd_id (scsicmd)); synchronizecmd->count =cpu_to_le32 (sizeof (((struct aac_synchronize_reply *)NULL )->data)); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ;/* * Now send the Fib to the adapter
@@ -2736,7 +2739,7 @@ static int aac_start_stop(struct scsi_cmnd *scsicmd) pmcmd->cid =cpu_to_le32 (sdev_id (sdev)); pmcmd->parm = (scsicmd->cmnd[1 ] &1 ) ?cpu_to_le32 (CT_PM_UNIT_IMMEDIATE ) :0 ; - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ;/* * Now send the Fib to the adapter
@@ -3695,7 +3698,7 @@ void aac_hba_callback(void *context, struct fib *fibptr)aac_fib_complete (fibptr);if (fibptr->flags &FIB_CONTEXT_FLAG_NATIVE_HBA_TMF ) - scsicmd->SCp.sent_command =1 ; +aac_priv (scsicmd)->sent_command =1 ;else aac_scsi_done (scsicmd); }
@@ -3725,7 +3728,7 @@ static int aac_send_srb_fib(struct scsi_cmnd* scsicmd)* Allocate and initialize a Fib then setup a BlockWrite command */ cmd_fibcontext =aac_fib_alloc_tag (dev, scsicmd); - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status =aac_adapter_scsi (cmd_fibcontext, scsicmd);/*
@@ -3769,7 +3772,7 @@ static int aac_send_hba_fib(struct scsi_cmnd *scsicmd)if (!cmd_fibcontext)return -1 ; - scsicmd->SCp.phase =AAC_OWNER_FIRMWARE ; +aac_priv (scsicmd)->owner =AAC_OWNER_FIRMWARE ; status =aac_adapter_hba (cmd_fibcontext, scsicmd);/*
drivers/scsi/aacraid/aacraid.h +19 -5
@@ -29,6 +29,7 @@#include <linux/completion.h> #include <linux/pci.h> #include <scsi/scsi_host.h> +#include <scsi/scsi_cmnd.h> /*------------------------------------------------------------------------------ * D E F I N E S
@@ -2673,11 +2674,24 @@ static inline void aac_cancel_rescan_worker(struct aac_dev *dev)cancel_delayed_work_sync (&dev->src_reinit_aif_worker); } -/* SCp.phase values */ -#define AAC_OWNER_MIDLEVEL 0x101 -#define AAC_OWNER_LOWLEVEL 0x102 -#define AAC_OWNER_ERROR_HANDLER 0x103 -#define AAC_OWNER_FIRMWARE 0x106 +enum aac_cmd_owner { +AAC_OWNER_MIDLEVEL =0x101 , +AAC_OWNER_LOWLEVEL =0x102 , +AAC_OWNER_ERROR_HANDLER =0x103 , +AAC_OWNER_FIRMWARE =0x106 , +}; + +struct aac_cmd_priv { +int (*callback)(struct scsi_cmnd *); +int status; +enum aac_cmd_owner owner; +bool sent_command; +}; + +static inline struct aac_cmd_priv *aac_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}void aac_safw_rescan_worker (struct work_struct *work);void aac_src_reinit_aif_worker (struct work_struct *work);
drivers/scsi/aacraid/comminit.c +1 -1
@@ -276,7 +276,7 @@ static bool wait_for_io_iter(struct scsi_cmnd *cmd, void *data, bool rsvd) {int *active = data; -if (cmd->SCp.phase ==AAC_OWNER_FIRMWARE ) +if (aac_priv (cmd)->owner ==AAC_OWNER_FIRMWARE ) *active = *active +1 ;return true; }
drivers/scsi/aacraid/linit.c +11 -10
@@ -241,10 +241,9 @@ static struct aac_driver_ident aac_drivers[] = {static int aac_queuecommand (struct Scsi_Host *shost,struct scsi_cmnd *cmd) { -int r =0 ; - cmd->SCp.phase =AAC_OWNER_LOWLEVEL ; - r = (aac_scsi_cmd (cmd) ?FAILED :0 ); -return r; +aac_priv (cmd)->owner =AAC_OWNER_LOWLEVEL ; + +return aac_scsi_cmd (cmd) ?FAILED :0 ; }/**
@@ -638,7 +637,7 @@ static bool fib_count_iter(struct scsi_cmnd *scmnd, void *data, bool reserved) {struct fib_count_data *fib_count = data; -switch (scmnd->SCp.phase) { +switch (aac_priv (scmnd)->owner) {case AAC_OWNER_FIRMWARE : fib_count->fwcnt++;break ;
@@ -680,6 +679,7 @@ static int get_num_of_incomplete_fibs(struct aac_dev *aac)static int aac_eh_abort (struct scsi_cmnd * cmd) { +struct aac_cmd_priv *cmd_priv =aac_priv (cmd);struct scsi_device * dev = cmd->device;struct Scsi_Host * host = dev->host;struct aac_dev * aac = (struct aac_dev *)host->hostdata;
@@ -732,7 +732,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd) tmf->error_length =cpu_to_le32 (FW_ERROR_BUFFER_SIZE ); fib->hbacmd_size =sizeof (*tmf); - cmd->SCp.sent_command =0 ; + cmd_priv->sent_command =0 ; status = aac_hba_send(HBA_IU_TYPE_SCSI_TM_REQ, fib, (fib_callback) aac_hba_callback,
@@ -744,7 +744,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd) }/* Wait up to 15 secs for completion */ for (count =0 ; count <15 ; ++count) { -if (cmd->SCp.sent_command) { +if (cmd_priv->sent_command) { ret =SUCCESS ;break ; }
@@ -784,7 +784,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd) (fib->callback_data == cmd)) { fib->flags |=FIB_CONTEXT_FLAG_TIMED_OUT ; - cmd->SCp.phase = + cmd_priv->owner =AAC_OWNER_ERROR_HANDLER ; ret =SUCCESS ; }
@@ -811,7 +811,7 @@ static int aac_eh_abort(struct scsi_cmnd* cmd) (command->device == cmd->device)) { fib->flags |=FIB_CONTEXT_FLAG_TIMED_OUT ; - command->SCp.phase = +aac_priv (command)->owner =AAC_OWNER_ERROR_HANDLER ;if (command == cmd) ret =SUCCESS ;
@@ -1058,7 +1058,7 @@ static int aac_eh_bus_reset(struct scsi_cmnd* cmd)if (bus >=AAC_MAX_BUSES || cid >=AAC_MAX_TARGETS || info->devtype !=AAC_DEVTYPE_NATIVE_RAW ) { fib->flags |=FIB_CONTEXT_FLAG_EH_RESET ; - cmd->SCp.phase =AAC_OWNER_ERROR_HANDLER ; +aac_priv (cmd)->owner =AAC_OWNER_ERROR_HANDLER ; } } }
@@ -1507,6 +1507,7 @@ static struct scsi_host_template aac_driver_template = {#endif .emulated = 1, .no_write_same = 1, + .cmd_size = sizeof(struct aac_cmd_priv), };static void __aac_shutdown (struct aac_dev * aac)
PATCH v5 13/49 scsi: advansys: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/advansys.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/scsi/advansys.c +16 -6
@@ -2277,6 +2277,15 @@ struct asc_board { dvc_var.adv_dvc_var)#define adv_dvc_to_pdev (adv_dvc) to_pci_dev(adv_dvc_to_board(adv_dvc)->dev) +struct advansys_cmd { +dma_addr_t dma_handle; +}; + +static struct advansys_cmd *advansys_cmd (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +#ifdef ADVANSYS_DEBUG static int asc_dbglvl =3 ;
@@ -6681,7 +6690,7 @@ static void asc_isr_callback(ASC_DVC_VAR *asc_dvc_varp, ASC_QDONE_INFO *qdonep)ASC_STATS (boardp->shost, callback); -dma_unmap_single (boardp->dev, scp->SCp.dma_handle, +dma_unmap_single (boardp->dev,advansys_cmd (scp)->dma_handle,SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE );/* * 'qdonep' contains the command's ending status.
@@ -7399,15 +7408,15 @@ static int advansys_slave_configure(struct scsi_device *sdev)static __le32 asc_get_sense_buffer_dma (struct scsi_cmnd *scp) {struct asc_board *board =shost_priv (scp->device->host); +struct advansys_cmd *acmd =advansys_cmd (scp); - scp->SCp.dma_handle =dma_map_single (board->dev, scp->sense_buffer, -SCSI_SENSE_BUFFERSIZE , -DMA_FROM_DEVICE ); -if (dma_mapping_error (board->dev, scp->SCp.dma_handle)) { + acmd->dma_handle =dma_map_single (board->dev, scp->sense_buffer, +SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE ); +if (dma_mapping_error (board->dev, acmd->dma_handle)) {ASC_DBG (1 ,"failed to map sense buffer\n" );return 0 ; } -return cpu_to_le32 (scp->SCp.dma_handle); +return cpu_to_le32 (acmd->dma_handle); } static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,
@@ -10604,6 +10613,7 @@ static struct scsi_host_template advansys_template = { .eh_host_reset_handler = advansys_reset, .bios_param = advansys_biosparam, .slave_configure = advansys_slave_configure, + .cmd_size = sizeof(struct advansys_cmd), };static int advansys_wide_init_chip (struct Scsi_Host *shost)
PATCH v5 14/49 scsi: aha1542: Remove a set-but-not-used array
In reply to Bart Van AsscheThis patch fixes the following W=1 warning:
drivers/scsi/aha1542.c:209:12: warning: variable ‘inquiry_result’ set but not used [-Wunused-but-set-variable]
209 | u8 inquiry_result[4];
--- drivers/scsi/aha1542.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/aha1542.c +1 -2
@@ -206,7 +206,6 @@ static int makecode(unsigned hosterr, unsigned scsierr)static int aha1542_test_port (struct Scsi_Host *sh) { -u8 inquiry_result[4 ];int i;/* Quick and dirty test for presence of the card. */
@@ -240,7 +239,7 @@ static int aha1542_test_port(struct Scsi_Host *sh)for (i =0 ; i <4 ; i++) {if (!wait_mask (STATUS (sh->io_port),DF ,DF ,0 ,0 ))return 0 ; - inquiry_result[i] =inb (DATA (sh->io_port)); + (void )inb (DATA (sh->io_port)); }/* Reading port should reset DF */
PATCH v5 15/49 scsi: aha152x: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/aha152x.c | 259 ++++++++++++++++++++++++----------------- 1 file changed, 155 insertions(+), 104 deletions(-)
drivers/scsi/aha152x.c +155 -104
@@ -316,6 +316,17 @@ enum { check_condition = 0x0800, /* requesting sense after CHECK CONDITION */ }; +struct aha152x_cmd_priv { +struct scsi_pointer scsi_pointer; +}; + +static struct scsi_pointer *aha152x_scsi_pointer (struct scsi_cmnd *cmd) +{ +struct aha152x_cmd_priv *acmd =scsi_cmd_priv (cmd); + +return &acmd->scsi_pointer; +} +MODULE_AUTHOR ("Jürgen Fischer" );MODULE_DESCRIPTION (AHA152X_REVID );MODULE_LICENSE ("GPL" );
@@ -879,14 +890,17 @@ void aha152x_release(struct Scsi_Host *shpnt)static int setup_expected_interrupts (struct Scsi_Host *shpnt) {if (CURRENT_SC ) { -CURRENT_SC ->SCp.phase |=1 <<16 ; +struct scsi_pointer *scsi_pointer = +aha152x_scsi_pointer (CURRENT_SC ); -if (CURRENT_SC ->SCp.phase & selecting) { + scsi_pointer->phase |=1 <<16 ; + +if (scsi_pointer->phase & selecting) {SETPORT (SSTAT1 ,SELTO );SETPORT (SIMODE0 ,ENSELDO | (DISCONNECTED_SC ?ENSELDI :0 ));SETPORT (SIMODE1 ,ENSELTIMO ); }else { -SETPORT (SIMODE0 , (CURRENT_SC ->SCp.phase & spiordy) ?ENSPIORDY :0 ); +SETPORT (SIMODE0 , (scsi_pointer->phase & spiordy) ?ENSPIORDY :0 );SETPORT (SIMODE1 ,ENPHASEMIS |ENSCSIRST |ENSCSIPERR |ENBUSFREE ); } }else if (STATE ==seldi) {
@@ -910,16 +924,17 @@ static int setup_expected_interrupts(struct Scsi_Host *shpnt)static int aha152x_internal_queue (struct scsi_cmnd *SCpnt,struct completion *complete,int phase) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (SCpnt);struct Scsi_Host *shpnt = SCpnt->device->host;unsigned long flags; - SCpnt->SCp.phase = not_issued | phase; - SCpnt->SCp.Status =0x1 ;/* Ilegal status by SCSI standard */ - SCpnt->SCp.Message =0 ; - SCpnt->SCp.have_data_in =0 ; - SCpnt->SCp.sent_command =0 ; + scsi_pointer->phase = not_issued | phase; + scsi_pointer->Status =0x1 ;/* Ilegal status by SCSI standard */ + scsi_pointer->Message =0 ; + scsi_pointer->have_data_in =0 ; + scsi_pointer->sent_command =0 ; -if (SCpnt->SCp.phase & (resetting|check_condition)) { +if (scsi_pointer->phase & (resetting | check_condition)) {if (!SCpnt->host_scribble ||SCSEM (SCpnt) ||SCNEXT (SCpnt)) {scmd_printk (KERN_ERR , SCpnt,"cannot reuse command\n" );return FAILED ;
@@ -942,15 +957,15 @@ static int aha152x_internal_queue(struct scsi_cmnd *SCpnt,SCp.phase : current state of the command */ if ((phase & resetting) || !scsi_sglist (SCpnt)) { - SCpnt->SCp.ptr =NULL ; - SCpnt->SCp.this_residual =0 ; + scsi_pointer->ptr =NULL ; + scsi_pointer->this_residual =0 ;scsi_set_resid (SCpnt,0 ); - SCpnt->SCp.buffer =NULL ; + scsi_pointer->buffer =NULL ; }else {scsi_set_resid (SCpnt,scsi_bufflen (SCpnt)); - SCpnt->SCp.buffer =scsi_sglist (SCpnt); - SCpnt->SCp.ptr =SG_ADDRESS (SCpnt->SCp.buffer); - SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; + scsi_pointer->buffer =scsi_sglist (SCpnt); + scsi_pointer->ptr =SG_ADDRESS (scsi_pointer->buffer); + scsi_pointer->this_residual = scsi_pointer->buffer->length; }DO_LOCK (flags);
@@ -1000,7 +1015,7 @@ static void reset_done(struct scsi_cmnd *SCpnt)static void aha152x_scsi_done (struct scsi_cmnd *SCpnt) { -if (SCpnt->SCp.phase & resetting) +if (aha152x_scsi_pointer (SCpnt)->phase & resetting)reset_done (SCpnt);else scsi_done (SCpnt);
@@ -1086,7 +1101,7 @@ static int aha152x_device_reset(struct scsi_cmnd * SCpnt)DO_LOCK (flags); -if (SCpnt->SCp.phase & resetted) { +if (aha152x_scsi_pointer (SCpnt)->phase & resetted) {HOSTDATA (shpnt)->commands--;if (!HOSTDATA (shpnt)->commands)SETPORT (PORTA ,0 );
@@ -1380,28 +1395,31 @@ static void busfree_run(struct Scsi_Host *shpnt)SETPORT (SSTAT1 ,CLRBUSFREE );if (CURRENT_SC ) { +struct scsi_pointer *scsi_pointer = +aha152x_scsi_pointer (CURRENT_SC ); +#if defined(AHA152X_STAT ) action++;#endif -CURRENT_SC ->SCp.phase &= ~syncneg; + scsi_pointer->phase &= ~syncneg; -if (CURRENT_SC ->SCp.phase & completed) { +if (scsi_pointer->phase & completed) {/* target sent COMMAND COMPLETE */ -done (shpnt,CURRENT_SC ->SCp.Status,DID_OK ); +done (shpnt, scsi_pointer->Status,DID_OK ); - }else if (CURRENT_SC ->SCp.phase & aborted) { -done (shpnt,CURRENT_SC ->SCp.Status,DID_ABORT ); + }else if (scsi_pointer->phase & aborted) { +done (shpnt, scsi_pointer->Status,DID_ABORT ); - }else if (CURRENT_SC ->SCp.phase & resetted) { -done (shpnt,CURRENT_SC ->SCp.Status,DID_RESET ); + }else if (scsi_pointer->phase & resetted) { +done (shpnt, scsi_pointer->Status,DID_RESET ); - }else if (CURRENT_SC ->SCp.phase & disconnected) { + }else if (scsi_pointer->phase & disconnected) {/* target sent DISCONNECT */ #if defined(AHA152X_STAT )HOSTDATA (shpnt)->disconnections++;#endif append_SC (&DISCONNECTED_SC ,CURRENT_SC ); -CURRENT_SC ->SCp.phase |=1 <<16 ; + scsi_pointer->phase |=1 <<16 ;CURRENT_SC =NULL ; }else {
@@ -1420,23 +1438,24 @@ static void busfree_run(struct Scsi_Host *shpnt) action++;#endif -if (DONE_SC ->SCp.phase & check_condition) { +if (aha152x_scsi_pointer (DONE_SC )->phase & check_condition) {struct scsi_cmnd *cmd =HOSTDATA (shpnt)->done_SC;struct aha152x_scdata *sc =SCDATA (cmd);scsi_eh_restore_cmnd (cmd, &sc->ses); - cmd->SCp.Status =SAM_STAT_CHECK_CONDITION ; +aha152x_scsi_pointer (cmd)->Status =SAM_STAT_CHECK_CONDITION ;HOSTDATA (shpnt)->commands--;if (!HOSTDATA (shpnt)->commands)SETPORT (PORTA ,0 );/* turn led off */ - }else if (DONE_SC ->SCp.Status==SAM_STAT_CHECK_CONDITION ) { + }else if (aha152x_scsi_pointer (DONE_SC )->Status == +SAM_STAT_CHECK_CONDITION ) {#if defined(AHA152X_STAT )HOSTDATA (shpnt)->busfree_with_check_condition++;#endif -if (!(DONE_SC ->SCp.phase & not_issued)) { +if (!(aha152x_scsi_pointer (DONE_SC )->phase & not_issued)) {struct aha152x_scdata *sc;struct scsi_cmnd *ptr =DONE_SC ;DONE_SC =NULL ;
@@ -1461,7 +1480,7 @@ static void busfree_run(struct Scsi_Host *shpnt)if (!HOSTDATA (shpnt)->commands)SETPORT (PORTA ,0 );/* turn led off */ -if (!(ptr->SCp.phase & resetting)) { +if (!(aha152x_scsi_pointer (ptr)->phase & resetting)) {kfree (ptr->host_scribble); ptr->host_scribble=NULL ; }
@@ -1484,10 +1503,13 @@ static void busfree_run(struct Scsi_Host *shpnt)DO_UNLOCK (flags);if (CURRENT_SC ) { +struct scsi_pointer *scsi_pointer = +aha152x_scsi_pointer (CURRENT_SC ); +#if defined(AHA152X_STAT ) action++;#endif -CURRENT_SC ->SCp.phase |= selecting; + scsi_pointer->phase |= selecting;/* clear selection timeout */ SETPORT (SSTAT1 ,SELTO );
@@ -1515,11 +1537,13 @@ static void busfree_run(struct Scsi_Host *shpnt)*/ static void seldo_run (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +SETPORT (SCSISIG ,0 );SETPORT (SSTAT1 ,CLRBUSFREE );SETPORT (SSTAT1 ,CLRPHASECHG ); -CURRENT_SC ->SCp.phase &= ~(selecting|not_issued); + scsi_pointer->phase &= ~(selecting | not_issued);SETPORT (SCSISEQ ,0 );
@@ -1534,12 +1558,12 @@ static void seldo_run(struct Scsi_Host *shpnt)ADDMSGO (IDENTIFY (RECONNECT ,CURRENT_SC ->device->lun)); -if (CURRENT_SC ->SCp.phase & aborting) { +if (scsi_pointer->phase & aborting) {ADDMSGO (ABORT ); - }else if (CURRENT_SC ->SCp.phase & resetting) { + }else if (scsi_pointer->phase & resetting) {ADDMSGO (BUS_DEVICE_RESET ); }else if (SYNCNEG ==0 &&SYNCHRONOUS ) { -CURRENT_SC ->SCp.phase |= syncneg; + scsi_pointer->phase |= syncneg;MSGOLEN +=spi_populate_sync_msg (&MSGO (MSGOLEN ),50 ,8 );SYNCNEG =1 ;/* negotiation in progress */ }
@@ -1554,15 +1578,17 @@ static void seldo_run(struct Scsi_Host *shpnt)*/ static void selto_run (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +SETPORT (SCSISEQ ,0 );SETPORT (SSTAT1 ,CLRSELTIMO );if (!CURRENT_SC )return ; -CURRENT_SC ->SCp.phase &= ~selecting; + scsi_pointer->phase &= ~selecting; -if (CURRENT_SC ->SCp.phase & aborted) +if (scsi_pointer->phase & aborted)done (shpnt,SAM_STAT_GOOD ,DID_ABORT );else if (TESTLO (SSTAT0 ,SELINGO ))done (shpnt,SAM_STAT_GOOD ,DID_BUS_BUSY );
@@ -1590,7 +1616,10 @@ static void seldi_run(struct Scsi_Host *shpnt)SETPORT (SSTAT1 ,CLRPHASECHG );if (CURRENT_SC ) { -if (!(CURRENT_SC ->SCp.phase & not_issued)) +struct scsi_pointer *scsi_pointer = +aha152x_scsi_pointer (CURRENT_SC ); + +if (!(scsi_pointer->phase & not_issued))scmd_printk (KERN_ERR ,CURRENT_SC ,"command should not have been issued yet\n" );
@@ -1647,6 +1676,7 @@ static void seldi_run(struct Scsi_Host *shpnt)static void msgi_run (struct Scsi_Host *shpnt) {for (;;) { +struct scsi_pointer *scsi_pointer;int sstat1 =GETPORT (SSTAT1 );if (sstat1 & (PHASECHG |PHASEMIS |BUSFREE ) || !(sstat1 &REQINIT ))
@@ -1684,8 +1714,9 @@ static void msgi_run(struct Scsi_Host *shpnt)continue ; } -CURRENT_SC ->SCp.Message =MSGI (0 ); -CURRENT_SC ->SCp.phase &= ~disconnected; + scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); + scsi_pointer->Message =MSGI (0 ); + scsi_pointer->phase &= ~disconnected;MSGILEN =0 ;
@@ -1693,7 +1724,8 @@ static void msgi_run(struct Scsi_Host *shpnt)continue ; } -CURRENT_SC ->SCp.Message =MSGI (0 ); + scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); + scsi_pointer->Message =MSGI (0 );switch (MSGI (0 )) {case DISCONNECT :
@@ -1701,11 +1733,11 @@ static void msgi_run(struct Scsi_Host *shpnt)scmd_printk (KERN_WARNING ,CURRENT_SC ,"target was not allowed to disconnect\n" ); -CURRENT_SC ->SCp.phase |= disconnected; + scsi_pointer->phase |= disconnected;break ;case COMMAND_COMPLETE : -CURRENT_SC ->SCp.phase |= completed; + scsi_pointer->phase |= completed;break ;case MESSAGE_REJECT :
@@ -1835,8 +1867,11 @@ static void msgi_end(struct Scsi_Host *shpnt)*/ static void msgo_init (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +if (MSGOLEN ==0 ) { -if ((CURRENT_SC ->SCp.phase & syncneg) &&SYNCNEG ==2 &&SYNCRATE ==0 ) { +if ((scsi_pointer->phase & syncneg) &&SYNCNEG ==2 && +SYNCRATE ==0 ) {ADDMSGO (IDENTIFY (RECONNECT ,CURRENT_SC ->device->lun)); }else { scmd_printk(KERN_INFO, CURRENT_SC,
@@ -1853,6 +1888,8 @@ static void msgo_init(struct Scsi_Host *shpnt)*/ static void msgo_run (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +while (MSGO_I <MSGOLEN ) {if (TESTLO (SSTAT0 ,SPIORDY ))return ;
@@ -1864,13 +1901,13 @@ static void msgo_run(struct Scsi_Host *shpnt)if (MSGO (MSGO_I ) &IDENTIFY_BASE ) -CURRENT_SC ->SCp.phase |= identified; + scsi_pointer->phase |= identified;if (MSGO (MSGO_I )==ABORT ) -CURRENT_SC ->SCp.phase |= aborted; + scsi_pointer->phase |= aborted;if (MSGO (MSGO_I )==BUS_DEVICE_RESET ) -CURRENT_SC ->SCp.phase |= resetted; + scsi_pointer->phase |= resetted;SETPORT (SCSIDAT ,MSGO (MSGO_I ++)); }
@@ -1899,7 +1936,7 @@ static void msgo_end(struct Scsi_Host *shpnt)*/ static void cmd_init (struct Scsi_Host *shpnt) { -if (CURRENT_SC ->SCp.sent_command) { +if (aha152x_scsi_pointer (CURRENT_SC )->sent_command) {scmd_printk (KERN_ERR ,CURRENT_SC ,"command already sent\n" );done (shpnt,SAM_STAT_GOOD ,DID_ERROR );
@@ -1930,7 +1967,7 @@ static void cmd_end(struct Scsi_Host *shpnt)"command sent incompletely (%d/%d)\n" , CMD_I, CURRENT_SC->cmd_len); else - CURRENT_SC->SCp.sent_command++; + aha152x_scsi_pointer(CURRENT_SC)->sent_command++; }/*
@@ -1942,7 +1979,7 @@ static void status_run(struct Scsi_Host *shpnt)if (TESTLO (SSTAT0 ,SPIORDY ))return ; -CURRENT_SC ->SCp.Status =GETPORT (SCSIDAT ); +aha152x_scsi_pointer (CURRENT_SC )->Status =GETPORT (SCSIDAT ); }
@@ -1966,6 +2003,7 @@ static void datai_init(struct Scsi_Host *shpnt)static void datai_run (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer;unsigned long the_time;int fifodata, data_count;
@@ -2003,35 +2041,36 @@ static void datai_run(struct Scsi_Host *shpnt) fifodata =GETPORT (FIFOSTAT ); } -if (CURRENT_SC ->SCp.this_residual>0 ) { -while (fifodata>0 &&CURRENT_SC ->SCp.this_residual>0 ) { - data_count = fifodata >CURRENT_SC ->SCp.this_residual ? -CURRENT_SC ->SCp.this_residual : + scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +if (scsi_pointer->this_residual >0 ) { +while (fifodata >0 && scsi_pointer->this_residual >0 ) { + data_count = fifodata > scsi_pointer->this_residual ? + scsi_pointer->this_residual : fifodata; fifodata -= data_count;if (data_count &1 ) {SETPORT (DMACNTRL0 ,ENDMA |_8BIT); - *CURRENT_SC ->SCp.ptr++ =GETPORT (DATAPORT ); -CURRENT_SC ->SCp.this_residual--; + *scsi_pointer->ptr++ =GETPORT (DATAPORT ); + scsi_pointer->this_residual--;DATA_LEN ++;SETPORT (DMACNTRL0 ,ENDMA ); }if (data_count >1 ) { data_count >>=1 ; -insw (DATAPORT ,CURRENT_SC ->SCp.ptr, data_count); -CURRENT_SC ->SCp.ptr +=2 * data_count; -CURRENT_SC ->SCp.this_residual -=2 * data_count; +insw (DATAPORT , scsi_pointer->ptr, data_count); + scsi_pointer->ptr +=2 * data_count; + scsi_pointer->this_residual -=2 * data_count;DATA_LEN +=2 * data_count; } -if (CURRENT_SC ->SCp.this_residual ==0 && - !sg_is_last (CURRENT_SC ->SCp.buffer)) { +if (scsi_pointer->this_residual ==0 && + !sg_is_last (scsi_pointer->buffer)) {/* advance to next buffer */ -CURRENT_SC ->SCp.buffer =sg_next (CURRENT_SC ->SCp.buffer); -CURRENT_SC ->SCp.ptr =SG_ADDRESS (CURRENT_SC ->SCp.buffer); -CURRENT_SC ->SCp.this_residual =CURRENT_SC ->SCp.buffer->length; + scsi_pointer->buffer =sg_next (scsi_pointer->buffer); + scsi_pointer->ptr =SG_ADDRESS (scsi_pointer->buffer); + scsi_pointer->this_residual = scsi_pointer->buffer->length; } } }else if (fifodata >0 ) {
@@ -2099,14 +2138,15 @@ static void datao_init(struct Scsi_Host *shpnt)static void datao_run (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC );unsigned long the_time;int data_count;/* until phase changes or all data sent */ -while (TESTLO (DMASTAT ,INTSTAT ) &&CURRENT_SC ->SCp.this_residual>0 ) { +while (TESTLO (DMASTAT ,INTSTAT ) && scsi_pointer->this_residual >0 ) { data_count =128 ; -if (data_count >CURRENT_SC ->SCp.this_residual) - data_count=CURRENT_SC ->SCp.this_residual; +if (data_count > scsi_pointer->this_residual) + data_count = scsi_pointer->this_residual;if (TESTLO (DMASTAT ,DFIFOEMP )) { scmd_printk(KERN_ERR, CURRENT_SC,
@@ -2117,26 +2157,26 @@ static void datao_run(struct Scsi_Host *shpnt)if (data_count &1 ) {SETPORT (DMACNTRL0 ,WRITE_READ |ENDMA |_8BIT); -SETPORT (DATAPORT , *CURRENT_SC ->SCp.ptr++); -CURRENT_SC ->SCp.this_residual--; +SETPORT (DATAPORT , *scsi_pointer->ptr++); + scsi_pointer->this_residual--;CMD_INC_RESID (CURRENT_SC ,-1 );SETPORT (DMACNTRL0 ,WRITE_READ |ENDMA ); }if (data_count >1 ) { data_count >>=1 ; -outsw (DATAPORT ,CURRENT_SC ->SCp.ptr, data_count); -CURRENT_SC ->SCp.ptr +=2 * data_count; -CURRENT_SC ->SCp.this_residual -=2 * data_count; +outsw (DATAPORT , scsi_pointer->ptr, data_count); + scsi_pointer->ptr +=2 * data_count; + scsi_pointer->this_residual -=2 * data_count;CMD_INC_RESID (CURRENT_SC ,-2 * data_count); } -if (CURRENT_SC ->SCp.this_residual ==0 && - !sg_is_last (CURRENT_SC ->SCp.buffer)) { +if (scsi_pointer->this_residual ==0 && + !sg_is_last (scsi_pointer->buffer)) {/* advance to next buffer */ -CURRENT_SC ->SCp.buffer =sg_next (CURRENT_SC ->SCp.buffer); -CURRENT_SC ->SCp.ptr =SG_ADDRESS (CURRENT_SC ->SCp.buffer); -CURRENT_SC ->SCp.this_residual =CURRENT_SC ->SCp.buffer->length; + scsi_pointer->buffer =sg_next (scsi_pointer->buffer); + scsi_pointer->ptr =SG_ADDRESS (scsi_pointer->buffer); + scsi_pointer->this_residual = scsi_pointer->buffer->length; } the_time=jiffies +100 *HZ ;
@@ -2152,6 +2192,8 @@ static void datao_run(struct Scsi_Host *shpnt)static void datao_end (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC ); +if (TESTLO (DMASTAT ,DFIFOEMP )) {u32 datao_cnt =GETSTCNT ();int datao_out =DATA_LEN -scsi_get_resid (CURRENT_SC );
@@ -2169,9 +2211,9 @@ static void datao_end(struct Scsi_Host *shpnt) sg =sg_next (sg); } -CURRENT_SC ->SCp.buffer = sg; -CURRENT_SC ->SCp.ptr =SG_ADDRESS (CURRENT_SC ->SCp.buffer) + done; -CURRENT_SC ->SCp.this_residual =CURRENT_SC ->SCp.buffer->length - + scsi_pointer->buffer = sg; + scsi_pointer->ptr =SG_ADDRESS (scsi_pointer->buffer) + done; + scsi_pointer->this_residual = scsi_pointer->buffer->length - done; }
@@ -2187,6 +2229,7 @@ static void datao_end(struct Scsi_Host *shpnt)*/ static int update_state (struct Scsi_Host *shpnt) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (CURRENT_SC );int dataphase=0 ;unsigned int stat0 =GETPORT (SSTAT0 );unsigned int stat1 =GETPORT (SSTAT1 );
@@ -2200,7 +2243,8 @@ static int update_state(struct Scsi_Host *shpnt)SETPORT (SSTAT1 ,SCSIRSTI ); }else if (stat0 &SELDI &&PREVSTATE == busfree) {STATE =seldi; - }else if (stat0 &SELDO &&CURRENT_SC && (CURRENT_SC ->SCp.phase & selecting)) { + }else if (stat0 &SELDO &&CURRENT_SC && + (scsi_pointer->phase & selecting)) {STATE =seldo; }else if (stat1 &SELTO ) {STATE =selto;
@@ -2332,7 +2376,8 @@ static void is_complete(struct Scsi_Host *shpnt)SETPORT (SXFRCTL0 ,CH1 );SETPORT (DMACNTRL0 ,0 );if (CURRENT_SC ) -CURRENT_SC ->SCp.phase &= ~spiordy; +aha152x_scsi_pointer (CURRENT_SC )->phase &= + ~spiordy; }/*
@@ -2354,7 +2399,8 @@ static void is_complete(struct Scsi_Host *shpnt)SETPORT (DMACNTRL0 ,0 );SETPORT (SXFRCTL0 ,CH1 |SPIOEN );if (CURRENT_SC ) -CURRENT_SC ->SCp.phase |= spiordy; +aha152x_scsi_pointer (CURRENT_SC )->phase |= + spiordy; }/*
@@ -2444,21 +2490,23 @@ static void disp_enintr(struct Scsi_Host *shpnt)*/ static void show_command (struct scsi_cmnd *ptr) { +const int phase =aha152x_scsi_pointer (ptr)->phase; +scsi_print_command (ptr);scmd_printk (KERN_DEBUG , ptr,"request_bufflen=%d; resid=%d; " "phase |%s%s%s%s%s%s%s%s%s; next=0x%p" ,scsi_bufflen (ptr),scsi_get_resid (ptr), - (ptr->SCp.phase & not_issued) ?"not issued|" :"" , - (ptr->SCp.phase & selecting) ?"selecting|" :"" , - (ptr->SCp.phase & identified) ?"identified|" :"" , - (ptr->SCp.phase & disconnected) ?"disconnected|" :"" , - (ptr->SCp.phase & completed) ?"completed|" :"" , - (ptr->SCp.phase & spiordy) ?"spiordy|" :"" , - (ptr->SCp.phase & syncneg) ?"syncneg|" :"" , - (ptr->SCp.phase & aborted) ?"aborted|" :"" , - (ptr->SCp.phase & resetted) ?"resetted|" :"" , - (SCDATA (ptr)) ?SCNEXT (ptr) :NULL ); + phase & not_issued ?"not issued|" :"" , + phase & selecting ?"selecting|" :"" , + phase & identified ?"identified|" :"" , + phase & disconnected ?"disconnected|" :"" , + phase & completed ?"completed|" :"" , + phase & spiordy ?"spiordy|" :"" , + phase & syncneg ?"syncneg|" :"" , + phase & aborted ?"aborted|" :"" , + phase & resetted ?"resetted|" :"" , +SCDATA (ptr) ?SCNEXT (ptr) :NULL ); }/*
@@ -2490,6 +2538,8 @@ static void show_queues(struct Scsi_Host *shpnt)static void get_command (struct seq_file *m,struct scsi_cmnd * ptr) { +struct scsi_pointer *scsi_pointer =aha152x_scsi_pointer (ptr); +const int phase = scsi_pointer->phase;int i; seq_printf(m, "%p: target=%d; lun=%d; cmnd=( ",
@@ -2499,24 +2549,24 @@ static void get_command(struct seq_file *m, struct scsi_cmnd * ptr)seq_printf (m,"0x%02x " , ptr->cmnd[i]);seq_printf (m,"); resid=%d; residual=%d; buffers=%d; phase |" , -scsi_get_resid (ptr), ptr->SCp.this_residual, -sg_nents (ptr->SCp.buffer) -1 ); +scsi_get_resid (ptr), scsi_pointer->this_residual, +sg_nents (scsi_pointer->buffer) -1 ); -if (ptr->SCp.phase & not_issued) +if (phase & not_issued)seq_puts (m,"not issued|" ); -if (ptr->SCp.phase & selecting) +if (phase & selecting)seq_puts (m,"selecting|" ); -if (ptr->SCp.phase & disconnected) +if (phase & disconnected)seq_puts (m,"disconnected|" ); -if (ptr->SCp.phase & aborted) +if (phase & aborted)seq_puts (m,"aborted|" ); -if (ptr->SCp.phase & identified) +if (phase & identified)seq_puts (m,"identified|" ); -if (ptr->SCp.phase & completed) +if (phase & completed)seq_puts (m,"completed|" ); -if (ptr->SCp.phase & spiordy) +if (phase & spiordy)seq_puts (m,"spiordy|" ); -if (ptr->SCp.phase & syncneg) +if (phase & syncneg)seq_puts (m,"syncneg|" );seq_printf (m,"; next=0x%p\n" ,SCNEXT (ptr)); }
@@ -2921,6 +2971,7 @@ static struct scsi_host_template aha152x_driver_template = { .sg_tablesize = SG_ALL, .dma_boundary = PAGE_SIZE - 1, .slave_alloc = aha152x_adjust_queue, + .cmd_size = sizeof(struct aha152x_cmd_priv), };#if !defined(AHA152X_PCMCIA )
PATCH v5 16/49 scsi: bfa: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/bfa/bfad_im.c | 27 ++++++++++++++------------- drivers/scsi/bfa/bfad_im.h | 16 ++++++++++++++++ 2 files changed, 30 insertions(+), 13 deletions(-)
drivers/scsi/bfa/bfad_im.c +14 -13
@@ -150,10 +150,10 @@ bfa_cb_tskim_done(void *bfad, struct bfad_tskim_s *dtsk,struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dtsk;wait_queue_head_t *wq; - cmnd->SCp.Status |= tsk_status <<1 ; -set_bit (IO_DONE_BIT , (unsigned long *)&cmnd->SCp.Status); - wq = (wait_queue_head_t *) cmnd->SCp.ptr; - cmnd->SCp.ptr =NULL ; +bfad_priv (cmnd)->status |= tsk_status <<1 ; +set_bit (IO_DONE_BIT , &bfad_priv (cmnd)->status); + wq =bfad_priv (cmnd)->wq; +bfad_priv (cmnd)->wq =NULL ;if (wq)wake_up (wq);
@@ -259,7 +259,7 @@ bfad_im_target_reset_send(struct bfad_s *bfad, struct scsi_cmnd *cmnd,* happens. */ cmnd->host_scribble =NULL ; - cmnd->SCp.Status =0 ; +bfad_priv (cmnd)->status =0 ; bfa_itnim =bfa_fcs_itnim_get_halitn (&itnim->fcs_itnim);/* * bfa_itnim can be NULL if the port gets disconnected and the bfa
@@ -326,8 +326,8 @@ bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd)* if happens. */ cmnd->host_scribble =NULL ; - cmnd->SCp.ptr = (char *)&wq; - cmnd->SCp.Status =0 ; +bfad_priv (cmnd)->wq = &wq; +bfad_priv (cmnd)->status =0 ; bfa_itnim =bfa_fcs_itnim_get_halitn (&itnim->fcs_itnim);/* * bfa_itnim can be NULL if the port gets disconnected and the bfa
@@ -347,10 +347,9 @@ bfad_im_reset_lun_handler(struct scsi_cmnd *cmnd) FCP_TM_LUN_RESET, BFAD_LUN_RESET_TMO);spin_unlock_irqrestore (&bfad->bfad_lock, flags); -wait_event (wq,test_bit (IO_DONE_BIT , - (unsigned long *)&cmnd->SCp.Status)); +wait_event (wq,test_bit (IO_DONE_BIT , &bfad_priv (cmnd)->status)); - task_status = cmnd->SCp.Status >>1 ; + task_status =bfad_priv (cmnd)->status >>1 ;if (task_status !=BFI_TSKIM_STS_OK ) {BFA_LOG (KERN_ERR , bfad, bfa_log_level,"LUN reset failure, status: %d\n" , task_status);
@@ -381,16 +380,16 @@ bfad_im_reset_target_handler(struct scsi_cmnd *cmnd)spin_lock_irqsave (&bfad->bfad_lock, flags); itnim =bfad_get_itnim (im_port, starget->id);if (itnim) { - cmnd->SCp.ptr = (char *)&wq; +bfad_priv (cmnd)->wq = &wq; rc =bfad_im_target_reset_send (bfad, cmnd, itnim);if (rc ==BFA_STATUS_OK ) {/* wait target reset to complete */ spin_unlock_irqrestore (&bfad->bfad_lock, flags);wait_event (wq,test_bit (IO_DONE_BIT , - (unsigned long *)&cmnd->SCp.Status)); + &bfad_priv (cmnd)->status));spin_lock_irqsave (&bfad->bfad_lock, flags); - task_status = cmnd->SCp.Status >>1 ; + task_status =bfad_priv (cmnd)->status >>1 ;if (task_status !=BFI_TSKIM_STS_OK )BFA_LOG (KERN_ERR , bfad, bfa_log_level, "target reset failure,"
@@ -797,6 +796,7 @@ struct scsi_host_template bfad_im_scsi_host_template = { .name = BFAD_DRIVER_NAME, .info = bfad_im_info, .queuecommand = bfad_im_queuecommand, + .cmd_size = sizeof(struct bfad_cmd_priv), .eh_timed_out = fc_eh_timed_out, .eh_abort_handler = bfad_im_abort_handler, .eh_device_reset_handler = bfad_im_reset_lun_handler,
@@ -819,6 +819,7 @@ struct scsi_host_template bfad_im_vport_template = { .name = BFAD_DRIVER_NAME, .info = bfad_im_info, .queuecommand = bfad_im_queuecommand, + .cmd_size = sizeof(struct bfad_cmd_priv), .eh_timed_out = fc_eh_timed_out, .eh_abort_handler = bfad_im_abort_handler, .eh_device_reset_handler = bfad_im_reset_lun_handler,
drivers/scsi/bfa/bfad_im.h +16 -0
@@ -43,6 +43,22 @@ u32 bfad_im_supported_speeds(struct bfa_s *bfa);*/ #define IO_DONE_BIT 0 +/** +* struct bfad_cmd_priv - private data per SCSI command. +* @status: Lowest bit represents IO_DONE. The next seven bits hold a value of +* type enum bfi_tskim_status. +* @wq: Wait queue used to wait for completion of an operation. +*/ +struct bfad_cmd_priv { +unsigned long status; +wait_queue_head_t *wq; +}; + +static inline struct bfad_cmd_priv *bfad_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +struct bfad_itnim_data_s {struct bfad_itnim_s *itnim; };
PATCH v5 17/49 scsi: csio: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/csiostor/csio_scsi.c | 20 +++++++++++--------- drivers/scsi/csiostor/csio_scsi.h | 10 ++++++++++ 2 files changed, 21 insertions(+), 9 deletions(-)
drivers/scsi/csiostor/csio_scsi.c +11 -9
@@ -166,7 +166,7 @@ csio_scsi_fcp_cmnd(struct csio_ioreq *req, void *addr)struct scsi_cmnd *scmnd =csio_scsi_cmnd (req);/* Check for Task Management */ -if (likely (scmnd->SCp.Message ==0 )) { +if (likely (csio_priv (scmnd)->fc_tm_flags ==0 )) {int_to_scsilun (scmnd->device->lun, &fcp_cmnd->fc_lun); fcp_cmnd->fc_tm_flags =0 ; fcp_cmnd->fc_cmdref =0 ;
@@ -185,7 +185,7 @@ csio_scsi_fcp_cmnd(struct csio_ioreq *req, void *addr) }else {memset (fcp_cmnd,0 ,sizeof (*fcp_cmnd));int_to_scsilun (scmnd->device->lun, &fcp_cmnd->fc_lun); - fcp_cmnd->fc_tm_flags = (uint8_t )scmnd->SCp.Message; + fcp_cmnd->fc_tm_flags =csio_priv (scmnd)->fc_tm_flags; } }
@@ -1855,7 +1855,7 @@ csio_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmnd)/* Needed during abort */ cmnd->host_scribble = (unsigned char *)ioreq; - cmnd->SCp.Message =0 ; +csio_priv (cmnd)->fc_tm_flags =0 ;/* Kick off SCSI IO SM on the ioreq */ spin_lock_irqsave (&hw->lock, flags);
@@ -2026,7 +2026,7 @@ csio_tm_cbfn(struct csio_hw *hw, struct csio_ioreq *req) req, req->wr_status);/* Cache FW return status */ - cmnd->SCp.Status = req->wr_status; +csio_priv (cmnd)->wr_status = req->wr_status;/* Special handling based on FCP response */
@@ -2049,7 +2049,7 @@ csio_tm_cbfn(struct csio_hw *hw, struct csio_ioreq *req)/* Modify return status if flags indicate success */ if (flags &FCP_RSP_LEN_VAL )if (rsp_info->rsp_code ==FCP_TMF_CMPL ) - cmnd->SCp.Status =FW_SUCCESS ; +csio_priv (cmnd)->wr_status =FW_SUCCESS ;csio_dbg (hw,"TM FCP rsp code: %d\n" , rsp_info->rsp_code); }
@@ -2125,9 +2125,9 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd)csio_scsi_cmnd (ioreq) = cmnd; cmnd->host_scribble = (unsigned char *)ioreq; - cmnd->SCp.Status =0 ; +csio_priv (cmnd)->wr_status =0 ; - cmnd->SCp.Message =FCP_TMF_LUN_RESET ; +csio_priv (cmnd)->fc_tm_flags =FCP_TMF_LUN_RESET ; ioreq->tmo =CSIO_SCSI_LUNRST_TMO_MS /1000 ;/*
@@ -2178,9 +2178,10 @@ csio_eh_lun_reset_handler(struct scsi_cmnd *cmnd) }/* LUN reset returned, check cached status */ -if (cmnd->SCp.Status !=FW_SUCCESS ) { +if (csio_priv (cmnd)->wr_status !=FW_SUCCESS ) {csio_err (hw,"LUN reset failed (%d:%llu), status: %d\n" , - cmnd->device->id, cmnd->device->lun, cmnd->SCp.Status); + cmnd->device->id, cmnd->device->lun, +csio_priv (cmnd)->wr_status); goto fail; }
@@ -2271,6 +2272,7 @@ struct scsi_host_template csio_fcoe_shost_template = { .name = CSIO_DRV_DESC, .proc_name = KBUILD_MODNAME, .queuecommand = csio_queuecommand, + .cmd_size = sizeof(struct csio_cmd_priv), .eh_timed_out = fc_eh_timed_out, .eh_abort_handler = csio_eh_abort_handler, .eh_device_reset_handler = csio_eh_lun_reset_handler,
drivers/scsi/csiostor/csio_scsi.h +10 -0
@@ -188,6 +188,16 @@ struct csio_scsi_level_data {uint64_t oslun; }; +struct csio_cmd_priv { +uint8_t fc_tm_flags;/* task management flags */ +uint16_t wr_status; +}; + +static inline struct csio_cmd_priv *csio_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static inline struct csio_ioreq *csio_get_scsi_ioreq (struct csio_scsim *scm) {
PATCH v5 18/49 scsi: dc395x: Stop using the SCSI pointer
In reply to Bart Van AsscheRemove the code that sets SCSI pointer members since there is no code in this driver that reads these members.
--- drivers/scsi/dc395x.c | 3 --- 1 file changed, 3 deletions(-)
drivers/scsi/dc395x.c +0 -3
@@ -3314,9 +3314,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,/* Here is the info for Doug Gilbert's sg3 ... */ scsi_set_resid (cmd, srb->total_xfer_length); -/* This may be interpreted by sb. or not ... */ - cmd->SCp.this_residual = srb->total_xfer_length; - cmd->SCp.buffers_residual =0 ;if (debug_enabled (DBG_KG )) {if (srb->total_xfer_length) dprintkdbg(DBG_KG, "srb_done: (0x%p) <%02i-%i> "
PATCH v5 19/49 scsi: esp_scsi: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/esp_scsi.c | 4 +--- drivers/scsi/esp_scsi.h | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/esp_scsi.c +1 -3
@@ -2678,6 +2678,7 @@ struct scsi_host_template scsi_esp_template = { .sg_tablesize = SG_ALL, .max_sectors = 0xffff, .skip_settle_delay = 1, + .cmd_size = sizeof(struct esp_cmd_priv), };EXPORT_SYMBOL (scsi_esp_template);
@@ -2739,9 +2740,6 @@ static struct spi_function_template esp_transport_ops = {static int __init esp_init (void ) { -BUILD_BUG_ON (sizeof (struct scsi_pointer ) < -sizeof (struct esp_cmd_priv )); - esp_transport_template =spi_attach_transport (&esp_transport_ops);if (!esp_transport_template)return -ENODEV ;
drivers/scsi/esp_scsi.h +2 -1
@@ -262,7 +262,8 @@ struct esp_cmd_priv {struct scatterlist *cur_sg;int tot_residue; }; -#define ESP_CMD_PRIV (CMD ) ((struct esp_cmd_priv *)(&(CMD)->SCp)) + +#define ESP_CMD_PRIV (cmd) ((struct esp_cmd_priv *)scsi_cmd_priv(cmd))/* NOTE: this enum is ordered based on chip features! */ enum esp_rev {
PATCH v5 20/49 scsi: fdomain: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/fdomain.c | 64 ++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 28 deletions(-)
drivers/scsi/fdomain.c +36 -28
@@ -115,6 +115,11 @@ struct fdomain {struct work_struct work; }; +static struct scsi_pointer *fdomain_scsi_pointer (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static inline void fdomain_make_bus_idle (struct fdomain *fd) {outb (0 , fd->base +REG_BCTL );
@@ -263,20 +268,21 @@ static void fdomain_work(struct work_struct *work) struct Scsi_Host *sh = container_of((void *)fd, struct Scsi_Host, hostdata);struct scsi_cmnd *cmd = fd->cur_cmd; +struct scsi_pointer *scsi_pointer =fdomain_scsi_pointer (cmd);unsigned long flags;int status;int done =0 ;spin_lock_irqsave (sh->host_lock, flags); -if (cmd->SCp.phase & in_arbitration) { +if (scsi_pointer->phase & in_arbitration) { status =inb (fd->base +REG_ASTAT );if (!(status &ASTAT_ARB )) {set_host_byte (cmd,DID_BUS_BUSY );fdomain_finish_cmd (fd); goto out; } - cmd->SCp.phase = in_selection; + scsi_pointer->phase = in_selection;outb (ICTL_SEL |FIFO_COUNT , fd->base +REG_ICTL );outb (BCTL_BUSEN |BCTL_SEL , fd->base +REG_BCTL );
@@ -285,7 +291,7 @@ static void fdomain_work(struct work_struct *work)/* Stop arbitration and enable parity */ outb (ACTL_IRQEN |PARITY_MASK , fd->base +REG_ACTL ); goto out; - }else if (cmd->SCp.phase & in_selection) { + }else if (scsi_pointer->phase & in_selection) { status =inb (fd->base +REG_BSTAT );if (!(status &BSTAT_BSY )) {/* Try again, for slow devices */
@@ -297,75 +303,75 @@ static void fdomain_work(struct work_struct *work)/* Stop arbitration and enable parity */ outb (ACTL_IRQEN |PARITY_MASK , fd->base +REG_ACTL ); } - cmd->SCp.phase = in_other; + scsi_pointer->phase = in_other;outb (ICTL_FIFO |ICTL_REQ |FIFO_COUNT , fd->base +REG_ICTL );outb (BCTL_BUSEN , fd->base +REG_BCTL ); goto out; } -/* cur_cmd->SCp.phase == in_other: this is the body of the routine */ +/* fdomain_scsi_pointer(cur_cmd)->phase == in_other: this is the body of the routine */ status =inb (fd->base +REG_BSTAT );if (status &BSTAT_REQ ) {switch (status & (BSTAT_MSG |BSTAT_CMD |BSTAT_IO )) {case BSTAT_CMD :/* COMMAND OUT */ -outb (cmd->cmnd[cmd->SCp.sent_command++], +outb (cmd->cmnd[scsi_pointer->sent_command++], fd->base +REG_SCSI_DATA );break ;case 0 :/* DATA OUT -- tmc18c50/tmc18c30 only */ -if (fd->chip != tmc1800 && !cmd->SCp.have_data_in) { - cmd->SCp.have_data_in =-1 ; +if (fd->chip != tmc1800 && !scsi_pointer->have_data_in) { + scsi_pointer->have_data_in =-1 ;outb (ACTL_IRQEN |ACTL_FIFOWR |ACTL_FIFOEN |PARITY_MASK , fd->base +REG_ACTL ); }break ;case BSTAT_IO :/* DATA IN -- tmc18c50/tmc18c30 only */ -if (fd->chip != tmc1800 && !cmd->SCp.have_data_in) { - cmd->SCp.have_data_in =1 ; +if (fd->chip != tmc1800 && !scsi_pointer->have_data_in) { + scsi_pointer->have_data_in =1 ;outb (ACTL_IRQEN |ACTL_FIFOEN |PARITY_MASK , fd->base +REG_ACTL ); }break ;case BSTAT_CMD |BSTAT_IO :/* STATUS IN */ - cmd->SCp.Status =inb (fd->base +REG_SCSI_DATA ); + scsi_pointer->Status =inb (fd->base +REG_SCSI_DATA );break ;case BSTAT_MSG |BSTAT_CMD :/* MESSAGE OUT */ outb (MESSAGE_REJECT , fd->base +REG_SCSI_DATA );break ;case BSTAT_MSG |BSTAT_CMD |BSTAT_IO :/* MESSAGE IN */ - cmd->SCp.Message =inb (fd->base +REG_SCSI_DATA ); -if (cmd->SCp.Message ==COMMAND_COMPLETE ) + scsi_pointer->Message =inb (fd->base +REG_SCSI_DATA ); +if (scsi_pointer->Message ==COMMAND_COMPLETE ) ++done;break ; } } -if (fd->chip == tmc1800 && !cmd->SCp.have_data_in && - cmd->SCp.sent_command >= cmd->cmd_len) { +if (fd->chip == tmc1800 && !scsi_pointer->have_data_in && + scsi_pointer->sent_command >= cmd->cmd_len) {if (cmd->sc_data_direction ==DMA_TO_DEVICE ) { - cmd->SCp.have_data_in =-1 ; + scsi_pointer->have_data_in =-1 ;outb (ACTL_IRQEN |ACTL_FIFOWR |ACTL_FIFOEN |PARITY_MASK , fd->base +REG_ACTL ); }else { - cmd->SCp.have_data_in =1 ; + scsi_pointer->have_data_in =1 ;outb (ACTL_IRQEN |ACTL_FIFOEN |PARITY_MASK , fd->base +REG_ACTL ); } } -if (cmd->SCp.have_data_in ==-1 )/* DATA OUT */ +if (scsi_pointer->have_data_in ==-1 )/* DATA OUT */ fdomain_write_data (cmd); -if (cmd->SCp.have_data_in ==1 )/* DATA IN */ +if (scsi_pointer->have_data_in ==1 )/* DATA IN */ fdomain_read_data (cmd);if (done) { -set_status_byte (cmd, cmd->SCp.Status); +set_status_byte (cmd, scsi_pointer->Status);set_host_byte (cmd,DID_OK ); -scsi_msg_to_host_byte (cmd, cmd->SCp.Message); +scsi_msg_to_host_byte (cmd, scsi_pointer->Message);fdomain_finish_cmd (fd); }else { -if (cmd->SCp.phase & disconnect) { +if (scsi_pointer->phase & disconnect) {outb (ICTL_FIFO |ICTL_SEL |ICTL_REQ |FIFO_COUNT , fd->base +REG_ICTL );outb (0 , fd->base +REG_BCTL );
@@ -398,14 +404,15 @@ static irqreturn_t fdomain_irq(int irq, void *dev_id)static int fdomain_queue (struct Scsi_Host *sh,struct scsi_cmnd *cmd) { +struct scsi_pointer *scsi_pointer =fdomain_scsi_pointer (cmd);struct fdomain *fd =shost_priv (cmd->device->host);unsigned long flags; - cmd->SCp.Status =0 ; - cmd->SCp.Message =0 ; - cmd->SCp.have_data_in =0 ; - cmd->SCp.sent_command =0 ; - cmd->SCp.phase = in_arbitration; + scsi_pointer->Status =0 ; + scsi_pointer->Message =0 ; + scsi_pointer->have_data_in =0 ; + scsi_pointer->sent_command =0 ; + scsi_pointer->phase = in_arbitration;scsi_set_resid (cmd,scsi_bufflen (cmd));spin_lock_irqsave (sh->host_lock, flags);
@@ -440,7 +447,7 @@ static int fdomain_abort(struct scsi_cmnd *cmd)spin_lock_irqsave (sh->host_lock, flags);fdomain_make_bus_idle (fd); - fd->cur_cmd->SCp.phase |= aborted; +fdomain_scsi_pointer (fd->cur_cmd)->phase |= aborted;/* Aborts are not done well. . . */ set_host_byte (fd->cur_cmd,DID_ABORT );
@@ -501,6 +508,7 @@ static struct scsi_host_template fdomain_template = { .this_id = 7, .sg_tablesize = 64, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct scsi_pointer), }; struct Scsi_Host *fdomain_create(int base, int irq, int this_id,
PATCH v5 21/49 scsi: fnic: Fix a tracing statement
In reply to Bart Van AsscheReport both the command flags and command state instead of only the command state.
--- drivers/scsi/fnic/fnic_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/fnic/fnic_scsi.c +1 -1
@@ -604,7 +604,7 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc)FNIC_TRACE (fnic_queuecommand, sc->device->host->host_no, tag, sc, io_req, sg_count, cmd_trace, - (((u64 )CMD_FLAGS (sc) >>32 ) |CMD_STATE (sc))); + (((u64 )CMD_FLAGS (sc) <<32 ) |CMD_STATE (sc)));/* if only we issued IO, will we have the io lock */ if (io_lock_acquired)
PATCH v5 22/49 scsi: fnic: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/fnic/fnic.h | 27 +++- drivers/scsi/fnic/fnic_main.c | 1 + drivers/scsi/fnic/fnic_scsi.c | 289 +++++++++++++++++----------------- 3 files changed, 163 insertions(+), 154 deletions(-)
drivers/scsi/fnic/fnic.h +20 -7
@@ -89,15 +89,28 @@#define FNIC_DEV_RST_ABTS_PENDING BIT(21)/* -* Usage of the scsi_cmnd scratchpad. +* fnic private data per SCSI command. * These fields are locked by the hashed io_req_lock. */ -#define CMD_SP (Cmnd) ((Cmnd)->SCp.ptr) -#define CMD_STATE (Cmnd) ((Cmnd)->SCp.phase) -#define CMD_ABTS_STATUS (Cmnd) ((Cmnd)->SCp.Message) -#define CMD_LR_STATUS (Cmnd) ((Cmnd)->SCp.have_data_in) -#define CMD_TAG (Cmnd) ((Cmnd)->SCp.sent_command) -#define CMD_FLAGS (Cmnd) ((Cmnd)->SCp.Status) +struct fnic_cmd_priv { +struct fnic_io_req *io_req; +enum fnic_ioreq_state state; +u32 flags; +u16 abts_status; +u16 lr_status; +}; + +static inline struct fnic_cmd_priv *fnic_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} + +static inline u64 fnic_flags_and_state (struct scsi_cmnd *cmd) +{ +struct fnic_cmd_priv *fcmd =fnic_priv (cmd); + +return ((u64 )fcmd->flags <<32 ) | fcmd->state; +}#define FCPIO_INVALID_CODE 0x100/* hdr_status value unused by firmware */
drivers/scsi/fnic/fnic_main.c +1 -0
@@ -124,6 +124,7 @@ static struct scsi_host_template fnic_host_template = { .max_sectors = 0xffff, .shost_groups = fnic_host_groups, .track_queue_depth = 1, + .cmd_size = sizeof(struct fnic_cmd_priv), }; static void
drivers/scsi/fnic/fnic_scsi.c +142 -147
825 lines not on this page · raw message
PATCH v5 23/49 scsi: hptiop: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
Rename hpt_scsi_pointer into hpt_cmd_priv because that data structure is not related to struct scsi_pointer.
--- drivers/scsi/hptiop.c | 1 + drivers/scsi/hptiop.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/hptiop.c +1 -0
@@ -1174,6 +1174,7 @@ static struct scsi_host_template driver_template = { .slave_configure = hptiop_slave_config, .this_id = -1, .change_queue_depth = hptiop_adjust_disk_queue_depth, + .cmd_size = sizeof(struct hpt_cmd_priv), };static int hptiop_internal_memalloc_itl (struct hptiop_hba *hba)
drivers/scsi/hptiop.h +2 -2
@@ -251,13 +251,13 @@ struct hptiop_request {int index; }; -struct hpt_scsi_pointer { +struct hpt_cmd_priv {int mapped;int sgcnt;dma_addr_t dma_handle; }; -#define HPT_SCP (scp) ((struct hpt_scsi_pointer *)&(scp)->SCp) +#define HPT_SCP (scp) ((struct hpt_cmd_priv *)scsi_cmd_priv(scp))enum hptiop_family {UNKNOWN_BASED_IOP ,
PATCH v5 24/49 scsi: imm: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .cmd_size in the SCSI host template instead of using the SCSI pointer. This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/imm.c | 88 ++++++++++++++++++++++++---------------------- drivers/scsi/imm.h | 5 +++ 2 files changed, 50 insertions(+), 43 deletions(-)
drivers/scsi/imm.c +45 -43
@@ -66,7 +66,7 @@ static void got_it(imm_struct *dev) { dev->base = dev->dev->port->base;if (dev->cur_cmd) - dev->cur_cmd->SCp.phase =1 ; +imm_scsi_pointer (dev->cur_cmd)->phase =1 ;else wake_up (dev->waiting); }
@@ -618,13 +618,14 @@ static inline int imm_send_command(struct scsi_cmnd *cmd)* The driver appears to remain stable if we speed up the parallel port * i/o in this function, but not elsewhere. */ -static int imm_completion (struct scsi_cmnd *cmd) +static int imm_completion (struct scsi_cmnd *const cmd) {/* Return codes: * -1 Error * 0 Told to schedule * 1 Finished data transfer */ +struct scsi_pointer *scsi_pointer =imm_scsi_pointer (cmd);imm_struct *dev =imm_dev (cmd->device->host);unsigned short ppb = dev->base;unsigned long start_jiffies = jiffies;
@@ -660,44 +661,43 @@ static int imm_completion(struct scsi_cmnd *cmd)* a) Drive status is screwy (!ready && !present) * b) Drive is requesting/sending more data than expected */ -if (((r &0x88 ) !=0x88 ) || (cmd->SCp.this_residual <=0 )) { +if ((r &0x88 ) !=0x88 || scsi_pointer->this_residual <=0 ) {imm_fail (dev,DID_ERROR );return -1 ;/* ERROR_RETURN */ }/* determine if we should use burst I/O */ if (dev->rd ==0 ) { - fast = (bulk - && (cmd->SCp.this_residual >= -IMM_BURST_SIZE )) ?IMM_BURST_SIZE :2 ; - status =imm_out (dev, cmd->SCp.ptr, fast); + fast = bulk && scsi_pointer->this_residual >= +IMM_BURST_SIZE ?IMM_BURST_SIZE :2 ; + status =imm_out (dev, scsi_pointer->ptr, fast); }else { - fast = (bulk - && (cmd->SCp.this_residual >= -IMM_BURST_SIZE )) ?IMM_BURST_SIZE :1 ; - status =imm_in (dev, cmd->SCp.ptr, fast); + fast = bulk && scsi_pointer->this_residual >= +IMM_BURST_SIZE ?IMM_BURST_SIZE :1 ; + status =imm_in (dev, scsi_pointer->ptr, fast); } - cmd->SCp.ptr += fast; - cmd->SCp.this_residual -= fast; + scsi_pointer->ptr += fast; + scsi_pointer->this_residual -= fast;if (!status) {imm_fail (dev,DID_BUS_BUSY );return -1 ;/* ERROR_RETURN */ } -if (cmd->SCp.buffer && !cmd->SCp.this_residual) { +if (scsi_pointer->buffer && !scsi_pointer->this_residual) {/* if scatter/gather, advance to the next segment */ -if (cmd->SCp.buffers_residual--) { - cmd->SCp.buffer =sg_next (cmd->SCp.buffer); - cmd->SCp.this_residual = - cmd->SCp.buffer->length; - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); +if (scsi_pointer->buffers_residual--) { + scsi_pointer->buffer = +sg_next (scsi_pointer->buffer); + scsi_pointer->this_residual = + scsi_pointer->buffer->length; + scsi_pointer->ptr =sg_virt (scsi_pointer->buffer);/* * Make sure that we transfer even number of bytes * otherwise it makes imm_byte_out() messy. */ -if (cmd->SCp.this_residual &0x01 ) - cmd->SCp.this_residual++; +if (scsi_pointer->this_residual &0x01 ) + scsi_pointer->this_residual++; } }/* Now check to see if the drive is ready to comunicate */
@@ -762,7 +762,7 @@ static void imm_interrupt(struct work_struct *work) }#endif -if (cmd->SCp.phase >1 ) +if (imm_scsi_pointer (cmd)->phase >1 )imm_disconnect (dev);imm_pb_dismiss (dev);
@@ -774,8 +774,9 @@ static void imm_interrupt(struct work_struct *work)return ; } -static int imm_engine (imm_struct *dev,struct scsi_cmnd *cmd) +static int imm_engine (imm_struct *dev,struct scsi_cmnd *const cmd) { +struct scsi_pointer *scsi_pointer =imm_scsi_pointer (cmd);unsigned short ppb = dev->base;unsigned char l =0 , h =0 ;int retv, x;
@@ -786,7 +787,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)if (dev->failed)return 0 ; -switch (cmd->SCp.phase) { +switch (scsi_pointer->phase) {case 0 :/* Phase 0 - Waiting for parport */ if (time_after (jiffies, dev->jstart +HZ )) {/*
@@ -800,7 +801,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)case 1 :/* Phase 1 - Connected */ imm_connect (dev,CONNECT_EPP_MAYBE ); - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 2 :/* Phase 2 - We are now talking to the scsi bus */
@@ -808,7 +809,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)imm_fail (dev,DID_NO_CONNECT );return 0 ; } - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 3 :/* Phase 3 - Ready to accept a command */
@@ -818,23 +819,23 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)if (!imm_send_command (cmd))return 0 ; - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 4 :/* Phase 4 - Setup scatter/gather buffers */ if (scsi_bufflen (cmd)) { - cmd->SCp.buffer =scsi_sglist (cmd); - cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); + scsi_pointer->buffer =scsi_sglist (cmd); + scsi_pointer->this_residual = scsi_pointer->buffer->length; + scsi_pointer->ptr =sg_virt (scsi_pointer->buffer); }else { - cmd->SCp.buffer =NULL ; - cmd->SCp.this_residual =0 ; - cmd->SCp.ptr =NULL ; + scsi_pointer->buffer =NULL ; + scsi_pointer->this_residual =0 ; + scsi_pointer->ptr =NULL ; } - cmd->SCp.buffers_residual =scsi_sg_count (cmd) -1 ; - cmd->SCp.phase++; -if (cmd->SCp.this_residual &0x01 ) - cmd->SCp.this_residual++; + scsi_pointer->buffers_residual =scsi_sg_count (cmd) -1 ; + scsi_pointer->phase++; +if (scsi_pointer->this_residual &0x01 ) + scsi_pointer->this_residual++; fallthrough;case 5 :/* Phase 5 - Pre-Data transfer stage */
@@ -851,7 +852,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)if ((dev->dp) && (dev->rd))if (imm_negotiate (dev))return 0 ; - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 6 :/* Phase 6 - Data transfer stage */
@@ -867,7 +868,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)if (retv ==0 )return 1 ; } - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 7 :/* Phase 7 - Post data transfer stage */
@@ -879,7 +880,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)w_ctr (ppb,0x4 ); } } - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 8 :/* Phase 8 - Read status/message */
@@ -922,7 +923,7 @@ static int imm_queuecommand_lck(struct scsi_cmnd *cmd) dev->jstart = jiffies; dev->cur_cmd = cmd; cmd->result =DID_ERROR <<16 ;/* default return code */ - cmd->SCp.phase =0 ;/* bus free */ +imm_scsi_pointer (cmd)->phase =0 ;/* bus free */ schedule_delayed_work (&dev->imm_tq,0 );
@@ -961,7 +962,7 @@ static int imm_abort(struct scsi_cmnd *cmd)* have tied the SCSI_MESSAGE line high in the interface */ -switch (cmd->SCp.phase) { +switch (imm_scsi_pointer (cmd)->phase) {case 0 :/* Do not have access to parport */ case 1 :/* Have not connected to interface */ dev->cur_cmd =NULL ;/* Forget the problem */
@@ -987,7 +988,7 @@ static int imm_reset(struct scsi_cmnd *cmd) {imm_struct *dev =imm_dev (cmd->device->host); -if (cmd->SCp.phase) +if (imm_scsi_pointer (cmd)->phase)imm_disconnect (dev); dev->cur_cmd =NULL ;/* Forget the problem */
@@ -1109,6 +1110,7 @@ static struct scsi_host_template imm_template = { .sg_tablesize = SG_ALL, .can_queue = 1, .slave_alloc = imm_adjust_queue, + .cmd_size = sizeof(struct scsi_pointer), };/***************************************************************************
drivers/scsi/imm.h +5 -0
@@ -139,6 +139,11 @@ static char *IMM_MODE_STRING[] =#define w_ctr (x,y) outb(y, (x)+2)#endif +static inline struct scsi_pointer *imm_scsi_pointer (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static int imm_engine (imm_struct *,struct scsi_cmnd *);#endif /* _IMM_H */
PATCH v5 25/49 scsi: iscsi: Stop using the SCSI pointer
In reply to Bart Van AsscheInstead of storing the iSCSI task pointer and the session age in the SCSI pointer, use command-private variables. This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
The list of iSCSI drivers has been obtained as follows:
$ git grep -lw iscsi_host_alloc drivers/infiniband/ulp/iser/iscsi_iser.c drivers/scsi/be2iscsi/be_main.c drivers/scsi/bnx2i/bnx2i_iscsi.c drivers/scsi/cxgbi/libcxgbi.c drivers/scsi/iscsi_tcp.c drivers/scsi/libiscsi.c drivers/scsi/qedi/qedi_main.c drivers/scsi/qla4xxx/ql4_os.c include/scsi/libiscsi.h
Note: it is not clear to me how the qla4xxx driver can work without this patch since it uses the scsi_cmnd::SCp.ptr member for two different purposes:
- The qla4xxx driver uses this member to store a struct srb pointer.
- libiscsi uses this member to store a struct iscsi_task pointer.
iscsi
--- drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + drivers/scsi/be2iscsi/be_main.c | 3 ++- drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 1 + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 1 + drivers/scsi/iscsi_tcp.c | 1 + drivers/scsi/libiscsi.c | 20 ++++++++++---------- drivers/scsi/qedi/qedi_fw.c | 4 ++-- drivers/scsi/qedi/qedi_iscsi.c | 1 + drivers/scsi/qla4xxx/ql4_def.h | 16 +++++++++++++--- drivers/scsi/qla4xxx/ql4_os.c | 13 +++++++------ include/scsi/libiscsi.h | 12 ++++++++++++ 12 files changed, 52 insertions(+), 22 deletions(-)
drivers/infiniband/ulp/iser/iscsi_iser.c +1 -0
@@ -971,6 +971,7 @@ static struct scsi_host_template iscsi_iser_sht = { .proc_name = "iscsi_iser", .this_id = -1, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };static struct iscsi_transport iscsi_iser_transport = {
drivers/scsi/be2iscsi/be_main.c +2 -1
@@ -218,7 +218,7 @@ static char const *cqe_desc[] = {static int beiscsi_eh_abort (struct scsi_cmnd *sc) { -struct iscsi_task *abrt_task = (struct iscsi_task *)sc->SCp.ptr; +struct iscsi_task *abrt_task =iscsi_cmd (sc)->task;struct iscsi_cls_session *cls_session;struct beiscsi_io_task *abrt_io_task;struct beiscsi_conn *beiscsi_conn;
@@ -403,6 +403,7 @@ static struct scsi_host_template beiscsi_sht = { .cmd_per_lun = BEISCSI_CMD_PER_LUN, .vendor_id = SCSI_NL_VID_TYPE_PCI | BE_VENDOR_ID, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };static struct scsi_transport_template *beiscsi_scsi_transport;
drivers/scsi/bnx2i/bnx2i_iscsi.c +1 -0
@@ -2268,6 +2268,7 @@ static struct scsi_host_template bnx2i_host_template = { .sg_tablesize = ISCSI_MAX_BDS_PER_CMD, .shost_groups = bnx2i_dev_groups, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };struct iscsi_transport bnx2i_iscsi_transport = {
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c +1 -0
@@ -98,6 +98,7 @@ static struct scsi_host_template cxgb3i_host_template = { .dma_boundary = PAGE_SIZE - 1, .this_id = -1, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };static struct iscsi_transport cxgb3i_iscsi_transport = {
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +1 -0
@@ -116,6 +116,7 @@ static struct scsi_host_template cxgb4i_host_template = { .dma_boundary = PAGE_SIZE - 1, .this_id = -1, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };static struct iscsi_transport cxgb4i_iscsi_transport = {
drivers/scsi/iscsi_tcp.c +1 -0
@@ -1007,6 +1007,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = { .proc_name = "iscsi_tcp", .this_id = -1, .track_queue_depth = 1, + .cmd_size = sizeof(struct iscsi_cmd), };static struct iscsi_transport iscsi_sw_tcp_transport = {
drivers/scsi/libiscsi.c +10 -10
@@ -462,7 +462,7 @@ static void iscsi_free_task(struct iscsi_task *task)if (sc) {/* SCSI eh reuses commands to verify us */ - sc->SCp.ptr =NULL ; +iscsi_cmd (sc)->task =NULL ;/* * queue command may call this to free the task, so * it will decide how to return sc to scsi-ml.
@@ -1344,10 +1344,10 @@ struct iscsi_task *iscsi_itt_to_ctask(struct iscsi_conn *conn, itt_t itt)if (!task || !task->sc)return NULL ; -if (task->sc->SCp.phase != conn->session->age) { +if (iscsi_cmd (task->sc)->age != conn->session->age) {iscsi_session_printk (KERN_ERR , conn->session,"task's session age %d, expected %d\n" , - task->sc->SCp.phase, conn->session->age); +iscsi_cmd (task->sc)->age, conn->session->age);return NULL ; }
@@ -1645,8 +1645,8 @@ static inline struct iscsi_task *iscsi_alloc_task(struct iscsi_conn *conn, (void *) &task, sizeof(void *)))return NULL ; - sc->SCp.phase = conn->session->age; - sc->SCp.ptr = (char *) task; +iscsi_cmd (sc)->age = conn->session->age; +iscsi_cmd (sc)->task = task;refcount_set (&task->refcount,1 ); task->state =ISCSI_TASK_PENDING ;
@@ -1683,7 +1683,7 @@ int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc)struct iscsi_task *task =NULL ; sc->result =0 ; - sc->SCp.ptr =NULL ; +iscsi_cmd (sc)->task =NULL ; ihost =shost_priv (host);
@@ -1997,7 +1997,7 @@ enum blk_eh_timer_return iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc)spin_lock_bh (&session->frwd_lock);spin_lock (&session->back_lock); - task = (struct iscsi_task *)sc->SCp.ptr; + task =iscsi_cmd (sc)->task;if (!task) {/* * Raced with completion. Blk layer has taken ownership
@@ -2260,7 +2260,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)* if session was ISCSI_STATE_IN_RECOVERY then we may not have * got the command. */ -if (!sc->SCp.ptr) { +if (!iscsi_cmd (sc)->task) {ISCSI_DBG_EH (session,"sc never reached iscsi layer or " "it completed.\n" );spin_unlock_bh (&session->frwd_lock);
@@ -2273,7 +2273,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)* then let the host reset code handle this */ if (!session->leadconn || session->state !=ISCSI_STATE_LOGGED_IN || - sc->SCp.phase != session->age) { +iscsi_cmd (sc)->age != session->age) {spin_unlock_bh (&session->frwd_lock);mutex_unlock (&session->eh_mutex); ISCSI_DBG_EH(session, "failing abort due to dropped "
@@ -2282,7 +2282,7 @@ int iscsi_eh_abort(struct scsi_cmnd *sc) }spin_lock (&session->back_lock); - task = (struct iscsi_task *)sc->SCp.ptr; + task =iscsi_cmd (sc)->task;if (!task || !task->sc) {/* task completed before time out */ ISCSI_DBG_EH (session,"sc completed while abort in progress\n" );
drivers/scsi/qedi/qedi_fw.c +2 -2
@@ -603,9 +603,9 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi, goto error; } -if (!sc_cmd->SCp.ptr) { +if (!iscsi_cmd (sc_cmd)->task) {QEDI_WARN (&qedi->dbg_ctx, -"SCp.ptr is NULL, returned in another context.\n" ); +"NULL task pointer, returned in another context.\n" ); goto error; }
drivers/scsi/qedi/qedi_iscsi.c +1 -0
@@ -59,6 +59,7 @@ struct scsi_host_template qedi_host_template = { .dma_boundary = QEDI_HW_DMA_BOUNDARY, .cmd_per_lun = 128, .shost_groups = qedi_shost_groups, + .cmd_size = sizeof(struct iscsi_cmd), }; static void qedi_conn_free_login_resources(struct qedi_ctx *qedi,
drivers/scsi/qla4xxx/ql4_def.h +13 -3
@@ -216,11 +216,21 @@#define IDC_COMP_TOV 5#define LINK_UP_COMP_TOV 30 -#define CMD_SP (Cmnd) ((Cmnd)->SCp.ptr) +/* +* Note: the data structure below does not have a struct iscsi_cmd member since +* the qla4xxx driver does not use libiscsi for SCSI I/O. +*/ +struct qla4xxx_cmd_priv { +struct srb *srb; +}; + +static inline struct qla4xxx_cmd_priv *qla4xxx_cmd_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}/* -* SCSI Request Block structure (srb) that is placed -* on cmd->SCp location of every I/O [We have 22 bytes available] +* SCSI Request Block structure (srb) that is associated with each scsi_cmnd. */ struct srb {struct list_head list;/* (8) */
drivers/scsi/qla4xxx/ql4_os.c +7 -6
@@ -226,6 +226,7 @@ static struct scsi_host_template qla4xxx_driver_template = { .name = DRIVER_NAME, .proc_name = DRIVER_NAME, .queuecommand = qla4xxx_queuecommand, + .cmd_size = sizeof(struct qla4xxx_cmd_priv), .eh_abort_handler = qla4xxx_eh_abort, .eh_device_reset_handler = qla4xxx_eh_device_reset,
@@ -4054,7 +4055,7 @@ static struct srb* qla4xxx_get_new_srb(struct scsi_qla_host *ha, srb->ddb = ddb_entry; srb->cmd = cmd; srb->flags =0 ; -CMD_SP (cmd) = (void *)srb; +qla4xxx_cmd_priv (cmd)->srb = srb;return srb; }
@@ -4067,7 +4068,7 @@ static void qla4xxx_srb_free_dma(struct scsi_qla_host *ha, struct srb *srb)scsi_dma_unmap (cmd); srb->flags &= ~SRB_DMA_VALID ; } -CMD_SP (cmd) =NULL ; +qla4xxx_cmd_priv (cmd)->srb =NULL ; }void qla4xxx_srb_compl (struct kref *ref)
@@ -4640,7 +4641,7 @@ static int qla4xxx_cmd_wait(struct scsi_qla_host *ha)* the scsi/block layer is going to prevent * the tag from being released. */ -if (cmd !=NULL &&CMD_SP (cmd)) +if (cmd !=NULL &&qla4xxx_cmd_priv (cmd)->srb)break ; }spin_unlock_irqrestore (&ha->hardware_lock, flags);
@@ -9079,7 +9080,7 @@ struct srb *qla4xxx_del_from_active_array(struct scsi_qla_host *ha,if (!cmd)return srb; - srb = (struct srb *)CMD_SP (cmd); + srb =qla4xxx_cmd_priv (cmd)->srb;if (!srb)return srb;
@@ -9121,7 +9122,7 @@ static int qla4xxx_eh_wait_on_command(struct scsi_qla_host *ha, do { /* Checking to see if its returned to OS */ - rp = (struct srb *) CMD_SP(cmd); + rp = qla4xxx_cmd_priv(cmd)->srb; if (rp == NULL) { done++; break;
@@ -9215,7 +9216,7 @@ static int qla4xxx_eh_abort(struct scsi_cmnd *cmd) }spin_lock_irqsave (&ha->hardware_lock, flags); - srb = (struct srb *)CMD_SP (cmd); + srb =qla4xxx_cmd_priv (cmd)->srb;if (!srb) {spin_unlock_irqrestore (&ha->hardware_lock, flags); ql4_printk(KERN_INFO, ha, "scsi%ld:%d:%llu: Specified command has already completed.\n",
include/scsi/libiscsi.h +12 -0
@@ -19,6 +19,7 @@#include <linux/refcount.h> #include <scsi/iscsi_proto.h> #include <scsi/iscsi_if.h> +#include <scsi/scsi_cmnd.h> #include <scsi/scsi_transport_iscsi.h> struct scsi_transport_template ;
@@ -152,6 +153,17 @@ static inline bool iscsi_task_is_completed(struct iscsi_task *task) task->state ==ISCSI_TASK_ABRT_SESS_RECOV ; } +/* Private data associated with struct scsi_cmnd. */ +struct iscsi_cmd { +struct iscsi_task *task; +int age; +}; + +static inline struct iscsi_cmd *iscsi_cmd (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +/* Connection's states */ enum {ISCSI_CONN_INITIAL_STAGE ,
PATCH v5 26/49 scsi: initio: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/initio.c | 14 ++++++++------ drivers/scsi/initio.h | 9 +++++++++ 2 files changed, 17 insertions(+), 6 deletions(-)
drivers/scsi/initio.c +8 -6
@@ -2553,7 +2553,7 @@ static void initio_build_scb(struct initio_host * host, struct scsi_ctrl_blk * c SENSE_SIZE, DMA_FROM_DEVICE); cblk->senseptr = (u32 )dma_addr; cblk->senselen =SENSE_SIZE ; - cmnd->SCp.ptr = (char *)(unsigned long )dma_addr; +initio_priv (cmnd)->sense_dma_addr = dma_addr; cblk->cdblen = cmnd->cmd_len;/* Clear the returned status */
@@ -2577,7 +2577,7 @@ static void initio_build_scb(struct initio_host * host, struct scsi_ctrl_blk * csizeof (struct sg_entry ) *TOTAL_SG_ENTRY , DMA_BIDIRECTIONAL); cblk->bufptr = (u32 )dma_addr; - cmnd->SCp.dma_handle = dma_addr; +initio_priv (cmnd)->sglist_dma_addr = dma_addr; cblk->sglen = nseg;
@@ -2704,16 +2704,17 @@ static int i91u_biosparam(struct scsi_device *sdev, struct block_device *dev,static void i91u_unmap_scb (struct pci_dev *pci_dev,struct scsi_cmnd *cmnd) {/* auto sense buffer */ -if (cmnd->SCp.ptr) { +if (initio_priv (cmnd)->sense_dma_addr) {dma_unmap_single (&pci_dev->dev, - (dma_addr_t)((unsigned long )cmnd->SCp.ptr), +initio_priv (cmnd)->sense_dma_addr,SENSE_SIZE ,DMA_FROM_DEVICE ); - cmnd->SCp.ptr =NULL ; +initio_priv (cmnd)->sense_dma_addr =0 ; }/* request buffer */ if (scsi_sg_count (cmnd)) { -dma_unmap_single (&pci_dev->dev, cmnd->SCp.dma_handle, +dma_unmap_single (&pci_dev->dev, +initio_priv (cmnd)->sglist_dma_addr,sizeof (struct sg_entry ) *TOTAL_SG_ENTRY ,DMA_BIDIRECTIONAL );
@@ -2796,6 +2797,7 @@ static struct scsi_host_template initio_template = { .can_queue = MAX_TARGETS * i91u_MAXQUEUE, .this_id = 1, .sg_tablesize = SG_ALL, + .cmd_size = sizeof(struct initio_cmd_priv), }; static int initio_probe_one(struct pci_dev *pdev,
drivers/scsi/initio.h +9 -0
@@ -640,3 +640,12 @@ typedef struct _NVRAM {#define SCSI_RESET_HOST_RESET 0x200#define SCSI_RESET_ACTION 0xff +struct initio_cmd_priv { +dma_addr_t sense_dma_addr; +dma_addr_t sglist_dma_addr; +}; + +static inline struct initio_cmd_priv *initio_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}
PATCH v5 27/49 scsi: libfc: Stop using the SCSI pointer
In reply to Bart Van AsscheMove the fc_fcp_pkt pointer, the residual length and the SCSI status into the new data structure libfc_cmd_priv. This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
The user of the libfc data path functions have been identified as follows:
$ git grep -lw fc_queuecommand | grep -v scsi/libfc/ drivers/scsi/fcoe/fcoe.c
--- drivers/scsi/fcoe/fcoe.c | 1 + drivers/scsi/libfc/fc_fcp.c | 26 +++++++++++--------------- include/scsi/libfc.h | 9 +++++++++ 3 files changed, 21 insertions(+), 15 deletions(-)
drivers/scsi/fcoe/fcoe.c +1 -0
@@ -277,6 +277,7 @@ static struct scsi_host_template fcoe_shost_template = { .sg_tablesize = SG_ALL, .max_sectors = 0xffff, .track_queue_depth = 1, + .cmd_size = sizeof(struct libfc_cmd_priv), };/**
drivers/scsi/libfc/fc_fcp.c +11 -15
@@ -45,14 +45,10 @@ static struct kmem_cache *scsi_pkt_cachep;#define FC_SRB_READ (1 << 1)#define FC_SRB_WRITE (1 << 0) -/* -* The SCp.ptr should be tested and set under the scsi_pkt_queue lock -*/ -#define CMD_SP (Cmnd) ((struct fc_fcp_pkt *)(Cmnd)->SCp.ptr) -#define CMD_ENTRY_STATUS (Cmnd) ((Cmnd)->SCp.have_data_in) -#define CMD_COMPL_STATUS (Cmnd) ((Cmnd)->SCp.this_residual) -#define CMD_SCSI_STATUS (Cmnd) ((Cmnd)->SCp.Status) -#define CMD_RESID_LEN (Cmnd) ((Cmnd)->SCp.buffers_residual) +static struct libfc_cmd_priv *libfc_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}/** * struct fc_fcp_internal - FCP layer internal data
@@ -1137,7 +1133,7 @@ static int fc_fcp_pkt_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp)unsigned long flags;int rc; - fsp->cmd->SCp.ptr = (char *)fsp; +libfc_priv (fsp->cmd)->fsp = fsp; fsp->cdb_cmd.fc_dl =htonl (fsp->data_len); fsp->cdb_cmd.fc_flags = fsp->req_flags & ~FCP_CFL_LEN_MASK ;
@@ -1150,7 +1146,7 @@ static int fc_fcp_pkt_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp) rc = lport->tt.fcp_cmd_send (lport, fsp, fc_fcp_recv);if (unlikely (rc)) {spin_lock_irqsave (&si->scsi_queue_lock, flags); - fsp->cmd->SCp.ptr =NULL ; +libfc_priv (fsp->cmd)->fsp =NULL ;list_del (&fsp->list);spin_unlock_irqrestore (&si->scsi_queue_lock, flags); }
@@ -1983,7 +1979,7 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)fc_fcp_can_queue_ramp_up (lport); sc_cmd = fsp->cmd; -CMD_SCSI_STATUS (sc_cmd) = fsp->cdb_status; +libfc_priv (sc_cmd)->status = fsp->cdb_status;switch (fsp->status_code) {case FC_COMPLETE :if (fsp->cdb_status ==0 ) {
@@ -1992,7 +1988,7 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)*/ sc_cmd->result =DID_OK <<16 ;if (fsp->scsi_resid) -CMD_RESID_LEN (sc_cmd) = fsp->scsi_resid; +libfc_priv (sc_cmd)->resid_len = fsp->scsi_resid; }else {/* * transport level I/O was ok but scsi
@@ -2025,7 +2021,7 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)*/ FC_FCP_DBG (fsp,"Returning DID_ERROR to scsi-ml " "due to FC_DATA_UNDRUN (scsi)\n" ); -CMD_RESID_LEN (sc_cmd) = fsp->scsi_resid; +libfc_priv (sc_cmd)->resid_len = fsp->scsi_resid; sc_cmd->result = (DID_ERROR <<16 ) | fsp->cdb_status; }break ;
@@ -2085,7 +2081,7 @@ static void fc_io_compl(struct fc_fcp_pkt *fsp)spin_lock_irqsave (&si->scsi_queue_lock, flags);list_del (&fsp->list); - sc_cmd->SCp.ptr =NULL ; +libfc_priv (sc_cmd)->fsp =NULL ;spin_unlock_irqrestore (&si->scsi_queue_lock, flags);scsi_done (sc_cmd);
@@ -2121,7 +2117,7 @@ int fc_eh_abort(struct scsi_cmnd *sc_cmd) si =fc_get_scsi_internal (lport);spin_lock_irqsave (&si->scsi_queue_lock, flags); - fsp =CMD_SP (sc_cmd); + fsp =libfc_priv (sc_cmd)->fsp;if (!fsp) {/* command completed while scsi eh was setting up */ spin_unlock_irqrestore (&si->scsi_queue_lock, flags);
include/scsi/libfc.h +9 -0
@@ -351,6 +351,15 @@ struct fc_fcp_pkt {struct completion tm_done; }____cacheline_aligned_in_smp ; +/* +* @fsp should be tested and set under the scsi_pkt_queue lock +*/ +struct libfc_cmd_priv { +struct fc_fcp_pkt *fsp; +u32 resid_len; +u8 status; +}; +/* * Structure and function definitions for managing Fibre Channel Exchanges * and Sequences
PATCH v5 28/49 scsi: bnx2fc: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .cmd_size in the SCSI host template instead of using the SCSI pointer from struct scsi_cmnd. Remove the CMD_SCSI_STATUS() assignment because the assigned value is not used.
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/bnx2fc/bnx2fc.h | 9 +++++++-- drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 1 + drivers/scsi/bnx2fc/bnx2fc_io.c | 23 +++++++++++------------ 3 files changed, 19 insertions(+), 14 deletions(-)
drivers/scsi/bnx2fc/bnx2fc.h +7 -2
@@ -137,8 +137,6 @@#define BNX2FC_FW_TIMEOUT (3 * HZ)#define PORT_MAX 2 -#define CMD_SCSI_STATUS (Cmnd) ((Cmnd)->SCp.Status) -/* FC FCP Status */ #define FC_GOOD 0
@@ -493,7 +491,14 @@ struct bnx2fc_unsol_els {struct work_struct unsol_els_work; }; +struct bnx2fc_priv { +struct bnx2fc_cmd *io_req; +}; +static inline struct bnx2fc_priv *bnx2fc_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}struct bnx2fc_cmd *bnx2fc_cmd_alloc (struct bnx2fc_rport *tgt);struct bnx2fc_cmd *bnx2fc_elstm_alloc (struct bnx2fc_rport *tgt,int type);
drivers/scsi/bnx2fc/bnx2fc_fcoe.c +1 -0
@@ -2979,6 +2979,7 @@ static struct scsi_host_template bnx2fc_shost_template = { .track_queue_depth = 1, .slave_configure = bnx2fc_slave_configure, .shost_groups = bnx2fc_host_groups, + .cmd_size = sizeof(struct bnx2fc_priv), };static struct libfc_function_template bnx2fc_libfc_fcn_templ = {
drivers/scsi/bnx2fc/bnx2fc_io.c +11 -12
@@ -204,7 +204,7 @@ static void bnx2fc_scsi_done(struct bnx2fc_cmd *io_req, int err_code) sc_cmd,host_byte (sc_cmd->result), sc_cmd->retries, sc_cmd->allowed);scsi_set_resid (sc_cmd,scsi_bufflen (sc_cmd)); - sc_cmd->SCp.ptr =NULL ; +bnx2fc_priv (sc_cmd)->io_req =NULL ;scsi_done (sc_cmd); }
@@ -765,7 +765,7 @@ static int bnx2fc_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) task = &(task_page[index]);bnx2fc_init_mp_task (io_req, task); - sc_cmd->SCp.ptr = (char *)io_req; +bnx2fc_priv (sc_cmd)->io_req = io_req;/* Obtain free SQ entry */ spin_lock_bh (&tgt->tgt_lock);
@@ -1147,7 +1147,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)BNX2FC_TGT_DBG (tgt,"Entered bnx2fc_eh_abort\n" );spin_lock_bh (&tgt->tgt_lock); - io_req = (struct bnx2fc_cmd *)sc_cmd->SCp.ptr; + io_req =bnx2fc_priv (sc_cmd)->io_req;if (!io_req) {/* Command might have just completed */ printk(KERN_ERR PFX "eh_abort: io_req is NULL\n");
@@ -1572,8 +1572,8 @@ void bnx2fc_process_tm_compl(struct bnx2fc_cmd *io_req, printk(KERN_ERR PFX "tmf's fc_hdr r_ctl = 0x%x\n", fc_hdr->fh_r_ctl); } -if (!sc_cmd->SCp.ptr) { - printk(KERN_ERR PFX "tm_compl: SCp.ptr is NULL\n"); +if (!bnx2fc_priv (sc_cmd)->io_req) { + printk(KERN_ERR PFX "tm_compl: io_req is NULL\n");return ; }switch (io_req->fcp_status) {
@@ -1609,7 +1609,7 @@ void bnx2fc_process_tm_compl(struct bnx2fc_cmd *io_req,return ; } - sc_cmd->SCp.ptr =NULL ; +bnx2fc_priv (sc_cmd)->io_req =NULL ;scsi_done (sc_cmd);kref_put (&io_req->refcount, bnx2fc_cmd_release);
@@ -1773,8 +1773,7 @@ static void bnx2fc_parse_fcp_rsp(struct bnx2fc_cmd *io_req, io_req->fcp_resid = fcp_rsp->fcp_resid; io_req->scsi_comp_flags = rsp_flags; -CMD_SCSI_STATUS (sc_cmd) = io_req->cdb_status = - fcp_rsp->scsi_status_code; + io_req->cdb_status = fcp_rsp->scsi_status_code;/* Fetch fcp_rsp_info and fcp_sns_info if available */ if (num_rq) {
@@ -1946,8 +1945,8 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req,/* parse fcp_rsp and obtain sense data from RQ if available */ bnx2fc_parse_fcp_rsp (io_req, fcp_rsp, num_rq, rq_data); -if (!sc_cmd->SCp.ptr) { - printk(KERN_ERR PFX "SCp.ptr is NULL\n"); +if (!bnx2fc_priv (sc_cmd)->io_req) { + printk(KERN_ERR PFX "io_req is NULL\n");return ; }
@@ -2018,7 +2017,7 @@ void bnx2fc_process_scsi_cmd_compl(struct bnx2fc_cmd *io_req, io_req->fcp_status);break ; } - sc_cmd->SCp.ptr =NULL ; +bnx2fc_priv (sc_cmd)->io_req =NULL ;scsi_done (sc_cmd);kref_put (&io_req->refcount, bnx2fc_cmd_release); }
@@ -2044,7 +2043,7 @@ int bnx2fc_post_io_req(struct bnx2fc_rport *tgt, io_req->port = port; io_req->tgt = tgt; io_req->data_xfer_len =scsi_bufflen (sc_cmd); - sc_cmd->SCp.ptr = (char *)io_req; +bnx2fc_priv (sc_cmd)->io_req = io_req; stats =per_cpu_ptr (lport->stats,get_cpu ());if (sc_cmd->sc_data_direction ==DMA_FROM_DEVICE ) {
PATCH v5 29/49 scsi: qedf: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .cmd_size in the SCSI host template instead of using the SCSI pointer from struct scsi_cmnd. Remove the CMD_SCSI_STATUS() assignment because the assigned value is not used.
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/qedf/qedf.h | 10 +++++++++- drivers/scsi/qedf/qedf_io.c | 25 ++++++++++++------------- drivers/scsi/qedf/qedf_main.c | 3 ++- 3 files changed, 23 insertions(+), 15 deletions(-)
drivers/scsi/qedf/qedf.h +9 -1
@@ -91,7 +91,6 @@ enum qedf_ioreq_event {#define FC_GOOD 0#define FCOE_FCP_RSP_FLAGS_FCP_RESID_OVER (0x1<<2)#define FCOE_FCP_RSP_FLAGS_FCP_RESID_UNDER (0x1<<3) -#define CMD_SCSI_STATUS (Cmnd) ((Cmnd)->SCp.Status)#define FCOE_FCP_RSP_FLAGS_FCP_RSP_LEN_VALID (0x1<<0)#define FCOE_FCP_RSP_FLAGS_FCP_SNS_LEN_VALID (0x1<<1)struct qedf_ioreq {
@@ -189,6 +188,15 @@ struct qedf_ioreq {unsigned int alloc; }; +struct qedf_cmd_priv { +struct qedf_ioreq *io_req; +}; + +static inline struct qedf_cmd_priv *qedf_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +extern struct workqueue_struct *qedf_io_wq;struct qedf_rport {
drivers/scsi/qedf/qedf_io.c +12 -13
@@ -857,7 +857,7 @@ int qedf_post_io_req(struct qedf_rport *fcport, struct qedf_ioreq *io_req)/* Initialize rest of io_req fileds */ io_req->data_xfer_len =scsi_bufflen (sc_cmd); - sc_cmd->SCp.ptr = (char *)io_req; +qedf_priv (sc_cmd)->io_req = io_req; io_req->sge_type =QEDF_IOREQ_FAST_SGE ;/* Assume fast SGL by default */ /* Record which cpu this request is associated with */
@@ -1065,8 +1065,7 @@ static void qedf_parse_fcp_rsp(struct qedf_ioreq *io_req, io_req->fcp_resid = fcp_rsp->fcp_resid; io_req->scsi_comp_flags = rsp_flags; -CMD_SCSI_STATUS (sc_cmd) = io_req->cdb_status = - fcp_rsp->scsi_status_code; + io_req->cdb_status = fcp_rsp->scsi_status_code;if (rsp_flags &FCOE_FCP_RSP_FLAGS_FCP_RSP_LEN_VALID )
@@ -1150,9 +1149,9 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,return ; } -if (!sc_cmd->SCp.ptr) { -QEDF_WARN (&(qedf->dbg_ctx),"SCp.ptr is NULL, returned in " -"another context.\n" ); +if (!qedf_priv (sc_cmd)->io_req) { +QEDF_WARN (&(qedf->dbg_ctx), +"io_req is NULL, returned in another context.\n" );return ; }
@@ -1312,7 +1311,7 @@ void qedf_scsi_completion(struct qedf_ctx *qedf, struct fcoe_cqe *cqe,clear_bit (QEDF_CMD_OUTSTANDING , &io_req->flags); io_req->sc_cmd =NULL ; - sc_cmd->SCp.ptr =NULL ; +qedf_priv (sc_cmd)->io_req =NULL ;scsi_done (sc_cmd);kref_put (&io_req->refcount, qedf_release_cmd); }
@@ -1354,9 +1353,9 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req, goto bad_scsi_ptr; } -if (!sc_cmd->SCp.ptr) { -QEDF_WARN (&(qedf->dbg_ctx),"SCp.ptr is NULL, returned in " -"another context.\n" ); +if (!qedf_priv (sc_cmd)->io_req) { +QEDF_WARN (&(qedf->dbg_ctx), +"io_req is NULL, returned in another context.\n" );return ; }
@@ -1409,7 +1408,7 @@ void qedf_scsi_done(struct qedf_ctx *qedf, struct qedf_ioreq *io_req,qedf_trace_io (io_req->fcport, io_req,QEDF_IO_TRACE_RSP ); io_req->sc_cmd =NULL ; - sc_cmd->SCp.ptr =NULL ; +qedf_priv (sc_cmd)->io_req =NULL ;scsi_done (sc_cmd);kref_put (&io_req->refcount, qedf_release_cmd);return ;
@@ -2432,8 +2431,8 @@ int qedf_initiate_tmf(struct scsi_cmnd *sc_cmd, u8 tm_flags) (tm_flags ==FCP_TMF_TGT_RESET ) ?"TARGET RESET" : "LUN RESET"); -if (sc_cmd->SCp.ptr) { - io_req = (struct qedf_ioreq *)sc_cmd->SCp.ptr; +if (qedf_priv (sc_cmd)->io_req) { + io_req =qedf_priv (sc_cmd)->io_req; ref_cnt =kref_read (&io_req->refcount); QEDF_ERR(NULL, "orig io_req = %p xid = 0x%x ref_cnt = %d.\n",
drivers/scsi/qedf/qedf_main.c +2 -1
@@ -740,7 +740,7 @@ static int qedf_eh_abort(struct scsi_cmnd *sc_cmd) } - io_req = (struct qedf_ioreq *)sc_cmd->SCp.ptr; + io_req =qedf_priv (sc_cmd)->io_req;if (!io_req) { QEDF_ERR(&qedf->dbg_ctx, "sc_cmd not queued with lld, sc_cmd=%p op=0x%02x, port_id=%06x\n",
@@ -996,6 +996,7 @@ static struct scsi_host_template qedf_host_template = { .sg_tablesize = QEDF_MAX_BDS_PER_CMD, .can_queue = FCOE_PARAMS_NUM_TASKS, .change_queue_depth = scsi_change_queue_depth, + .cmd_size = sizeof(struct qedf_cmd_priv), };static int qedf_get_paged_crc_eof (struct sk_buff *skb,int tlen)
PATCH v5 30/49 scsi: mac53c94: Fix a set-but-not-used compiler warning
In reply to Bart Van AsscheFix the following compiler warning:
drivers/scsi/mac53c94.c: In function 'mac53c94_init':
drivers/scsi/mac53c94.c:128:13: warning: variable 'x' set but not used [-Wunused-but-set-variable]
128 | int x;
--- drivers/scsi/mac53c94.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/scsi/mac53c94.c +1 -2
@@ -125,7 +125,6 @@ static void mac53c94_init(struct fsc_state *state) {struct mac53c94_regs __iomem *regs = state->regs;struct dbdma_regs __iomem *dma = state->dma; -int x;writeb (state->host->this_id |CF1_PAR_ENABLE , ®s->config1);writeb (TIMO_VAL (250 ), ®s->sel_timeout);/* 250ms */
@@ -134,7 +133,7 @@ static void mac53c94_init(struct fsc_state *state)writeb (0 , ®s->config3);writeb (0 , ®s->sync_period);writeb (0 , ®s->sync_offset); - x =readb (®s->interrupt); + (void )readb (®s->interrupt);writel ((RUN |PAUSE |FLUSH |WAKE ) <<16 , &dma->control); }
PATCH v5 31/49 scsi: mac53c94: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/mac53c94.c | 24 +++++++++++++----------- drivers/scsi/mac53c94.h | 11 +++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-)
drivers/scsi/mac53c94.c +13 -11
@@ -193,7 +193,8 @@ static void mac53c94_interrupt(int irq, void *dev_id)struct fsc_state *state = (struct fsc_state *) dev_id;struct mac53c94_regs __iomem *regs = state->regs;struct dbdma_regs __iomem *dma = state->dma; -struct scsi_cmnd *cmd = state->current_req; +struct scsi_cmnd *const cmd = state->current_req; +struct scsi_pointer *const scsi_pointer =mac53c94_scsi_pointer (cmd);int nb, stat, seq, intr;static int mac53c94_errors;
@@ -263,10 +264,10 @@ static void mac53c94_interrupt(int irq, void *dev_id)/* set DMA controller going if any data to transfer */ if ((stat & (STAT_MSG |STAT_CD )) ==0 && (scsi_sg_count (cmd) >0 ||scsi_bufflen (cmd))) { - nb = cmd->SCp.this_residual; + nb = scsi_pointer->this_residual;if (nb >0xfff0 ) nb =0xfff0 ; - cmd->SCp.this_residual -= nb; + scsi_pointer->this_residual -= nb;writeb (nb, ®s->count_lo);writeb (nb >>8 , ®s->count_mid);writeb (CMD_DMA_MODE +CMD_NOP , ®s->command);
@@ -293,13 +294,13 @@ static void mac53c94_interrupt(int irq, void *dev_id)cmd_done (state,DID_ERROR <<16 );return ; } -if (cmd->SCp.this_residual !=0 +if (scsi_pointer->this_residual !=0 && (stat & (STAT_MSG |STAT_CD )) ==0 ) {/* Set up the count regs to transfer more */ - nb = cmd->SCp.this_residual; + nb = scsi_pointer->this_residual;if (nb >0xfff0 ) nb =0xfff0 ; - cmd->SCp.this_residual -= nb; + scsi_pointer->this_residual -= nb;writeb (nb, ®s->count_lo);writeb (nb >>8 , ®s->count_mid);writeb (CMD_DMA_MODE +CMD_NOP , ®s->command);
@@ -321,8 +322,8 @@ static void mac53c94_interrupt(int irq, void *dev_id)cmd_done (state,DID_ERROR <<16 );return ; } - cmd->SCp.Status =readb (®s->fifo); - cmd->SCp.Message =readb (®s->fifo); + scsi_pointer->Status =readb (®s->fifo); + scsi_pointer->Message =readb (®s->fifo);writeb (CMD_ACCEPT_MSG , ®s->command); state->phase = busfreeing;break ;
@@ -330,8 +331,8 @@ static void mac53c94_interrupt(int irq, void *dev_id)if (intr !=INTR_DISCONNECT ) {printk (KERN_DEBUG "got intr %x when expected disconnect\n" , intr); } -cmd_done (state, (DID_OK <<16 ) + (cmd->SCp.Message <<8 ) - + cmd->SCp.Status); +cmd_done (state, (DID_OK <<16 ) + (scsi_pointer->Message <<8 ) + + scsi_pointer->Status);break ;default :printk (KERN_DEBUG "don't know about phase %d\n" , state->phase);
@@ -389,7 +390,7 @@ static void set_dma_cmds(struct fsc_state *state, struct scsi_cmnd *cmd) dma_cmd +=OUTPUT_LAST -OUTPUT_MORE ; dcmds[-1 ].command =cpu_to_le16 (dma_cmd); dcmds->command =cpu_to_le16 (DBDMA_STOP ); - cmd->SCp.this_residual = total; +mac53c94_scsi_pointer (cmd)->this_residual = total; }static struct scsi_host_template mac53c94_template = {
@@ -401,6 +402,7 @@ static struct scsi_host_template mac53c94_template = { .this_id = 7, .sg_tablesize = SG_ALL, .max_segment_size = 65535, + .cmd_size = sizeof(struct mac53c94_cmd_priv), };static int mac53c94_probe (struct macio_dev *mdev,const struct of_device_id *match)
drivers/scsi/mac53c94.h +11 -0
@@ -212,4 +212,15 @@ struct mac53c94_regs {#define CF4_TEST 0x02#define CF4_BBTE 0x01 +struct mac53c94_cmd_priv { +struct scsi_pointer scsi_pointer; +}; + +static inline struct scsi_pointer *mac53c94_scsi_pointer (struct scsi_cmnd *cmd) +{ +struct mac53c94_cmd_priv *mcmd =scsi_cmd_priv (cmd); + +return &mcmd->scsi_pointer; +} +#endif /* _MAC53C94_H */
PATCH v5 32/49 scsi: megaraid: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/megaraid.c | 13 ++++--------- drivers/scsi/megaraid.h | 23 ++++++++++++++++++++++- 2 files changed, 26 insertions(+), 10 deletions(-)
drivers/scsi/megaraid.c +4 -9
@@ -1644,16 +1644,10 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status)static void mega_rundoneq (adapter_t *adapter) { -struct scsi_cmnd *cmd; -struct list_head *pos; +struct megaraid_cmd_priv *cmd_priv; -list_for_each (pos, &adapter->completed_list) { - -struct scsi_pointer * spos = (struct scsi_pointer *)pos; - - cmd = list_entry(spos, struct scsi_cmnd, SCp); -scsi_done (cmd); - } +list_for_each_entry (cmd_priv, &adapter->completed_list, entry) +scsi_done (megaraid_to_scsi_cmd (cmd_priv));INIT_LIST_HEAD (&adapter->completed_list); }
@@ -4123,6 +4117,7 @@ static struct scsi_host_template megaraid_template = { .eh_bus_reset_handler = megaraid_reset, .eh_host_reset_handler = megaraid_reset, .no_write_same = 1, + .cmd_size = sizeof(struct megaraid_cmd_priv), }; static int
drivers/scsi/megaraid.h +22 -1
@@ -4,6 +4,7 @@#include <linux/spinlock.h> #include <linux/mutex.h> +#include <scsi/scsi_cmnd.h> #define MEGARAID_VERSION \ "v2.00.4 (Release Date: Thu Feb 9 08:51:30 EST 2006)\n"
@@ -756,8 +757,28 @@ struct private_bios_data {#define CACHED_IO 0#define DIRECT_IO 1 +struct megaraid_cmd_priv { +struct list_head entry; +}; + +#define SCSI_LIST (scp) \ + (&((struct megaraid_cmd_priv *)scsi_cmd_priv(scp))->entry) + +struct scsi_cmd_and_priv { +struct scsi_cmnd cmd; +struct megaraid_cmd_priv priv; +}; + +static inline struct scsi_cmnd * +megaraid_to_scsi_cmd (struct megaraid_cmd_priv *cmd_priv) +{ +/* See also scsi_mq_setup_tags() */ +BUILD_BUG_ON (sizeof (struct scsi_cmd_and_priv ) != +sizeof (struct scsi_cmnd ) + +sizeof (struct megaraid_cmd_priv )); -#define SCSI_LIST (scp) ((struct list_head *)(&(scp)->SCp)) + return &container_of(cmd_priv, struct scsi_cmd_and_priv, priv)->cmd; +}/* * Each controller's soft state
PATCH v5 33/49 scsi: megasas: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/megaraid/megaraid_sas.h | 12 ++++++++++++ drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++++---- drivers/scsi/megaraid/megaraid_sas_fusion.c | 15 ++++++++------- 3 files changed, 24 insertions(+), 11 deletions(-)
drivers/scsi/megaraid/megaraid_sas.h +12 -0
@@ -18,6 +18,8 @@#ifndef LSI_MEGARAID_SAS_H #define LSI_MEGARAID_SAS_H +#include <scsi/scsi_cmnd.h> +/* * MegaRAID SAS Driver meta data */
@@ -2594,6 +2596,16 @@ struct megasas_cmd { }; }; +struct megasas_cmd_priv { +void *cmd_priv; +u8 status; +}; + +static inline struct megasas_cmd_priv *megasas_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +#define MAX_MGMT_ADAPTERS 1024#define MAX_IOCTL_SGE 16
drivers/scsi/megaraid/megaraid_sas_base.c +4 -4
@@ -1760,7 +1760,7 @@ megasas_build_and_issue_cmd(struct megasas_instance *instance, goto out_return_cmd; cmd->scmd = scmd; - scmd->SCp.ptr = (char *)cmd; +megasas_priv (scmd)->cmd_priv = cmd;/* * Issue the command to the FW
@@ -2992,11 +2992,10 @@ megasas_dump_reg_set(void __iomem *reg_set)void megasas_dump_fusion_io (struct scsi_cmnd *scmd) { -struct megasas_cmd_fusion *cmd; +struct megasas_cmd_fusion *cmd =megasas_priv (scmd)->cmd_priv;union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;struct megasas_instance *instance; - cmd = (struct megasas_cmd_fusion *)scmd->SCp.ptr; instance = (struct megasas_instance *)scmd->device->host->hostdata; scmd_printk(KERN_INFO, scmd,
@@ -3518,6 +3517,7 @@ static struct scsi_host_template megasas_template = { .mq_poll = megasas_blk_mq_poll, .change_queue_depth = scsi_change_queue_depth, .max_segment_size = 0xffffffff, + .cmd_size = sizeof(struct megasas_cmd_priv), };/**
@@ -3601,7 +3601,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, cmd->retry_for_fw_reset =0 ;if (cmd->scmd) - cmd->scmd->SCp.ptr =NULL ; +megasas_priv (cmd->scmd)->cmd_priv =NULL ;switch (hdr->cmd) {case MFI_CMD_INVALID :
drivers/scsi/megaraid/megaraid_sas_fusion.c +8 -7
@@ -2915,7 +2915,7 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,get_updated_dev_handle (instance, &fusion->load_balance_info[device_id], &io_info, local_map_ptr); - scp->SCp.Status |=MEGASAS_LOAD_BALANCE_FLAG ; +megasas_priv (scp)->status |=MEGASAS_LOAD_BALANCE_FLAG ; cmd->pd_r1_lb = io_info.pd_after_lb;if (instance->adapter_type >=VENTURA_SERIES ) rctx_g35->span_arm = io_info.span_arm;
@@ -2923,7 +2923,7 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, rctx->span_arm = io_info.span_arm; }else - scp->SCp.Status &= ~MEGASAS_LOAD_BALANCE_FLAG ; +megasas_priv (scp)->status &= ~MEGASAS_LOAD_BALANCE_FLAG ;if (instance->adapter_type >=VENTURA_SERIES ) cmd->r1_alt_dev_handle = io_info.r1_alt_dev_handle;
@@ -3293,7 +3293,7 @@ megasas_build_io_fusion(struct megasas_instance *instance, io_request->SenseBufferLength =SCSI_SENSE_BUFFERSIZE ; cmd->scmd = scp; - scp->SCp.ptr = (char *)cmd; +megasas_priv (scp)->cmd_priv = cmd;return 0 ; }
@@ -3489,7 +3489,7 @@ megasas_complete_r1_command(struct megasas_instance *instance,if (instance->ldio_threshold &&megasas_cmd_type (scmd_local) ==READ_WRITE_LDIO )atomic_dec (&instance->ldio_outstanding); - scmd_local->SCp.ptr =NULL ; +megasas_priv (scmd_local)->cmd_priv =NULL ;megasas_return_cmd_fusion (instance, cmd);scsi_dma_unmap (scmd_local);megasas_sdev_busy_dec (instance, scmd_local);
@@ -3613,12 +3613,13 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,case MPI2_FUNCTION_SCSI_IO_REQUEST :/*Fast Path IO.*/ /* Update load balancing info */ if (fusion->load_balance_info && - (cmd_fusion->scmd->SCp.Status & + (megasas_priv (cmd_fusion->scmd)->status &MEGASAS_LOAD_BALANCE_FLAG )) { device_id =MEGASAS_DEV_INDEX (scmd_local); lbinfo = &fusion->load_balance_info[device_id];atomic_dec (&lbinfo->scsi_pending_cmds[cmd_fusion->pd_r1_lb]); - cmd_fusion->scmd->SCp.Status &= ~MEGASAS_LOAD_BALANCE_FLAG ; +megasas_priv (cmd_fusion->scmd)->status &= + ~MEGASAS_LOAD_BALANCE_FLAG ; } fallthrough;/* and complete IO */ case MEGASAS_MPI2_FUNCTION_LD_IO_REQUEST :/* LD-IO Path */
@@ -3630,7 +3631,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex,if (instance->ldio_threshold && (megasas_cmd_type (scmd_local) ==READ_WRITE_LDIO ))atomic_dec (&instance->ldio_outstanding); - scmd_local->SCp.ptr =NULL ; +megasas_priv (scmd_local)->cmd_priv =NULL ;megasas_return_cmd_fusion (instance, cmd_fusion);scsi_dma_unmap (scmd_local);megasas_sdev_busy_dec (instance, scmd_local);
PATCH v5 34/49 scsi: mesh: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/mesh.c | 20 +++++++++++++------- drivers/scsi/mesh.h | 11 +++++++++++ 2 files changed, 24 insertions(+), 7 deletions(-)
drivers/scsi/mesh.c +13 -7
@@ -586,10 +586,12 @@ static void mesh_done(struct mesh_state *ms, int start_next) ms->current_req =NULL ; tp->current_req =NULL ;if (cmd) { +struct scsi_pointer *scsi_pointer =mesh_scsi_pointer (cmd); +set_host_byte (cmd, ms->stat); -set_status_byte (cmd, cmd->SCp.Status); +set_status_byte (cmd, scsi_pointer->Status);if (ms->stat ==DID_OK ) -scsi_msg_to_host_byte (cmd, cmd->SCp.Message); +scsi_msg_to_host_byte (cmd, scsi_pointer->Message);if (DEBUG_TARGET (cmd)) {printk (KERN_DEBUG "mesh_done: result = %x, data_ptr=%d, buflen=%d\n" , cmd->result, ms->data_ptr,scsi_bufflen (cmd));
@@ -603,7 +605,7 @@ static void mesh_done(struct mesh_state *ms, int start_next) }#endif } - cmd->SCp.this_residual -= ms->data_ptr; + scsi_pointer->this_residual -= ms->data_ptr;scsi_done (cmd); }if (start_next) {
@@ -1171,7 +1173,7 @@ static void handle_msgin(struct mesh_state *ms)if (ms->n_msgin <msgin_length (ms)) goto reject;if (cmd) - cmd->SCp.Message = code; +mesh_scsi_pointer (cmd)->Message = code;switch (code) {case COMMAND_COMPLETE :break ;
@@ -1262,7 +1264,7 @@ static void set_dma_cmds(struct mesh_state *ms, struct scsi_cmnd *cmd)if (cmd) {int nseg; - cmd->SCp.this_residual =scsi_bufflen (cmd); +mesh_scsi_pointer (cmd)->this_residual =scsi_bufflen (cmd); nseg =scsi_dma_map (cmd);BUG_ON (nseg <0 );
@@ -1592,10 +1594,13 @@ static void cmd_complete(struct mesh_state *ms)break ;case statusing:if (cmd) { - cmd->SCp.Status = mr->fifo; +struct scsi_pointer *scsi_pointer = +mesh_scsi_pointer (cmd); + + scsi_pointer->Status = mr->fifo;if (DEBUG_TARGET (cmd))printk (KERN_DEBUG "mesh: status is %x\n" , - cmd->SCp.Status); + scsi_pointer->Status); } ms->msgphase = msg_in;break ;
@@ -1837,6 +1842,7 @@ static struct scsi_host_template mesh_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = 2, .max_segment_size = 65535, + .cmd_size = sizeof(struct mesh_cmd_priv), };static int mesh_probe (struct macio_dev *mdev,const struct of_device_id *match)
drivers/scsi/mesh.h +11 -0
@@ -8,6 +8,17 @@#ifndef _MESH_H#define _MESH_H +struct mesh_cmd_priv { +struct scsi_pointer scsi_pointer; +}; + +static inline struct scsi_pointer *mesh_scsi_pointer (struct scsi_cmnd *cmd) +{ +struct mesh_cmd_priv *mcmd =scsi_cmd_priv (cmd); + +return &mcmd->scsi_pointer; +} +/* * Registers in the MESH controller. */
PATCH v5 35/49 scsi: mvsas: Fix a set-but-not-used warning
In reply to Bart Van AsscheThis patch fixes the following compiler warning:
drivers/scsi/mvsas/mv_init.c: In function ‘mvs_pci_init’:drivers/scsi/mvsas/mv_init.c:497:30: warning: variable ‘mpi’ set but not used [-Wunused-but-set-variable]
497 | struct mvs_prv_info *mpi;
| ^~~
--- drivers/scsi/mvsas/mv_init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/mvsas/mv_init.c +4 -2
@@ -494,7 +494,6 @@ static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent) {unsigned int rc, nhost =0 ;struct mvs_info *mvi; -struct mvs_prv_info *mpi;irq_handler_t irq_handler = mvs_interrupt;struct Scsi_Host *shost =NULL ;const struct mvs_chip_info *chip;
@@ -559,10 +558,13 @@ static int mvs_pci_init(struct pci_dev *pdev, const struct pci_device_id *ent) } nhost++; }while (nhost < chip->n_host); - mpi = (struct mvs_prv_info *)(SHOST_TO_SAS_HA (shost)->lldd_ha);#ifdef CONFIG_SCSI_MVSAS_TASKLET + { +struct mvs_prv_info *mpi =SHOST_TO_SAS_HA (shost)->lldd_ha; +tasklet_init (&(mpi->mv_tasklet), mvs_tasklet, (unsigned long )SHOST_TO_SAS_HA (shost)); + }#endif mvs_post_sas_ha_init (shost, chip);
PATCH v5 36/49 scsi: mvumi: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/mvumi.c | 9 +++++---- drivers/scsi/mvumi.h | 9 +++++++++ 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/scsi/mvumi.c +5 -4
@@ -1302,7 +1302,7 @@ static void mvumi_complete_cmd(struct mvumi_hba *mhba, struct mvumi_cmd *cmd, {struct scsi_cmnd *scmd = cmd->scmd; - cmd->scmd->SCp.ptr =NULL ; +mvumi_priv (cmd->scmd)->cmd_priv =NULL ; scmd->result = ob_frame->req_status;switch (ob_frame->req_status) {
@@ -2097,7 +2097,7 @@ static int mvumi_queue_command(struct Scsi_Host *shost, goto out_return_cmd; cmd->scmd = scmd; - scmd->SCp.ptr = (char *) cmd; +mvumi_priv (scmd)->cmd_priv = cmd; mhba->instancet->fire_cmd (mhba, cmd);spin_unlock_irqrestore (shost->host_lock, irq_flags);return 0 ;
@@ -2111,7 +2111,7 @@ static int mvumi_queue_command(struct Scsi_Host *shost,static enum blk_eh_timer_return mvumi_timed_out (struct scsi_cmnd *scmd) { -struct mvumi_cmd *cmd = (struct mvumi_cmd *) scmd->SCp.ptr; +struct mvumi_cmd *cmd =mvumi_priv (scmd)->cmd_priv;struct Scsi_Host *host = scmd->device->host;struct mvumi_hba *mhba =shost_priv (host);unsigned long flags;
@@ -2128,7 +2128,7 @@ static enum blk_eh_timer_return mvumi_timed_out(struct scsi_cmnd *scmd)atomic_dec (&mhba->fw_outstanding); scmd->result = (DID_ABORT <<16 ); - scmd->SCp.ptr =NULL ; +mvumi_priv (scmd)->cmd_priv =NULL ;if (scsi_bufflen (scmd)) { dma_unmap_sg(&mhba->pdev->dev, scsi_sglist(scmd), scsi_sg_count(scmd),
@@ -2179,6 +2179,7 @@ static struct scsi_host_template mvumi_template = { .bios_param = mvumi_bios_param, .dma_boundary = PAGE_SIZE - 1, .this_id = -1, + .cmd_size = sizeof(struct mvumi_cmd_priv), };static int mvumi_cfg_hw_reg (struct mvumi_hba *mhba)
drivers/scsi/mvumi.h +9 -0
@@ -254,6 +254,15 @@ struct mvumi_cmd {unsigned char cmd_status; }; +struct mvumi_cmd_priv { +struct mvumi_cmd *cmd_priv; +}; + +static inline struct mvumi_cmd_priv *mvumi_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +/* * the function type of the in bound frame */
PATCH v5 37/49 scsi: nsp32: Stop using the SCSI pointer
In reply to Bart Van AsscheMove the SCSI status field to private data. Stop setting the .ptr, .this_residual, .buffer and .buffer_residual SCSI pointer members since no code in this driver reads these members.
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/nsp32.c | 20 +++++++------------- drivers/scsi/nsp32.h | 9 +++++++++ 2 files changed, 16 insertions(+), 13 deletions(-)
drivers/scsi/nsp32.c +7 -13
@@ -273,6 +273,7 @@ static struct scsi_host_template nsp32_template = { .eh_abort_handler = nsp32_eh_abort, .eh_host_reset_handler = nsp32_eh_host_reset, /* .highmem_io = 1, */ + .cmd_size = sizeof(struct nsp32_cmd_priv), };#include "nsp32_io.h"
@@ -946,14 +947,9 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt)show_command (SCpnt); data->CurrentSC = SCpnt; - SCpnt->SCp.Status =SAM_STAT_CHECK_CONDITION ; +nsp32_priv (SCpnt)->status =SAM_STAT_CHECK_CONDITION ;scsi_set_resid (SCpnt,scsi_bufflen (SCpnt)); - SCpnt->SCp.ptr = (char *)scsi_sglist (SCpnt); - SCpnt->SCp.this_residual =scsi_bufflen (SCpnt); - SCpnt->SCp.buffer =NULL ; - SCpnt->SCp.buffers_residual =0 ; -/* initialize data */ data->msgout_len =0 ; data->msgin_len =0 ;
@@ -1376,7 +1372,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)case BUSPHASE_STATUS :nsp32_dbg (NSP32_DEBUG_INTR ,"fifo/status" ); - SCpnt->SCp.Status =nsp32_read1 (base,SCSI_CSB_IN ); +nsp32_priv (SCpnt)->status =nsp32_read1 (base,SCSI_CSB_IN );break ;default :
@@ -1687,18 +1683,18 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)/* MsgIn 00: Command Complete */ nsp32_dbg (NSP32_DEBUG_BUSFREE ,"command complete" ); - SCpnt->SCp.Status =nsp32_read1 (base,SCSI_CSB_IN ); +nsp32_priv (SCpnt)->status =nsp32_read1 (base,SCSI_CSB_IN );nsp32_dbg (NSP32_DEBUG_BUSFREE ,"normal end stat=0x%x resid=0x%x\n" , - SCpnt->SCp.Status,scsi_get_resid (SCpnt)); +nsp32_priv (SCpnt)->status,scsi_get_resid (SCpnt)); SCpnt->result = (DID_OK <<16 ) | - (SCpnt->SCp.Status <<0 ); + (nsp32_priv (SCpnt)->status <<0 );nsp32_scsi_done (SCpnt);/* All operation is done */ return TRUE; }else if (execph &MSGIN_04_VALID ) {/* MsgIn 04: Disconnect */ - SCpnt->SCp.Status =nsp32_read1 (base,SCSI_CSB_IN ); +nsp32_priv (SCpnt)->status =nsp32_read1 (base,SCSI_CSB_IN );nsp32_dbg (NSP32_DEBUG_BUSFREE ,"disconnect" );return TRUE;
@@ -1706,8 +1702,6 @@ static int nsp32_busfree_occur(struct scsi_cmnd *SCpnt, unsigned short execph)/* Unexpected bus free */ nsp32_msg (KERN_WARNING ,"unexpected bus free occurred" ); -/* DID_ERROR? */ -//SCpnt->result = (DID_OK << 16) | (SCpnt->SCp.Status << 0); SCpnt->result =DID_ERROR <<16 ;nsp32_scsi_done (SCpnt);return TRUE;
drivers/scsi/nsp32.h +9 -0
@@ -534,6 +534,15 @@ typedef struct _nsp32_sync_table {---PERIOD-- ---OFFSET-- */ #define TO_SYNCREG (period, offset) (((period) & 0x0f) << 4 | ((offset) & 0x0f)) +struct nsp32_cmd_priv { +enum sam_status status; +}; + +static inline struct nsp32_cmd_priv *nsp32_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} + typedef struct _nsp32_target { unsigned char syncreg; /* value for SYNCREG */ unsigned char ackwidth; /* value for ACKWIDTH */
PATCH v5 38/49 scsi: nsp_cs: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .cmd_size in the SCSI host template instead of using the SCSI pointer in struct scsi_cmnd.
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/pcmcia/nsp_cs.c | 200 ++++++++++++++++++-------------- drivers/scsi/pcmcia/nsp_cs.h | 2 +- drivers/scsi/pcmcia/nsp_debug.c | 2 +- 3 files changed, 114 insertions(+), 90 deletions(-)
drivers/scsi/pcmcia/nsp_cs.c +112 -88
@@ -70,6 +70,11 @@ static bool free_ports = 0;module_param (free_ports, bool,0 );MODULE_PARM_DESC (free_ports,"Release IO ports after configuration? (default: 0 (=no))" ); +static struct scsi_pointer *nsp_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static struct scsi_host_template nsp_driver_template = { .proc_name ="nsp_cs" , .show_info = nsp_show_info,
@@ -83,6 +88,7 @@ static struct scsi_host_template nsp_driver_template = { .this_id = NSP_INITIATOR_ID, .sg_tablesize = SG_ALL, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct scsi_pointer), };static nsp_hw_data nsp_data_base;/* attach <-> detect glue */
@@ -180,8 +186,9 @@ static void nsp_scsi_done(struct scsi_cmnd *SCpnt)scsi_done (SCpnt); } -static int nsp_queuecommand_lck (struct scsi_cmnd *SCpnt) +static int nsp_queuecommand_lck (struct scsi_cmnd *const SCpnt) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);#ifdef NSP_DEBUG /*unsigned int host_id = SCpnt->device->host->this_id;*/ /*unsigned int base = SCpnt->device->host->io_port;*/
@@ -217,11 +224,11 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt) data->CurrentSC = SCpnt; - SCpnt->SCp.Status =SAM_STAT_CHECK_CONDITION ; - SCpnt->SCp.Message =0 ; - SCpnt->SCp.have_data_in =IO_UNKNOWN ; - SCpnt->SCp.sent_command =0 ; - SCpnt->SCp.phase =PH_UNDETERMINED ; + scsi_pointer->Status =SAM_STAT_CHECK_CONDITION ; + scsi_pointer->Message =0 ; + scsi_pointer->have_data_in =IO_UNKNOWN ; + scsi_pointer->sent_command =0 ; + scsi_pointer->phase =PH_UNDETERMINED ;scsi_set_resid (SCpnt,scsi_bufflen (SCpnt));/* setup scratch area
@@ -231,15 +238,15 @@ static int nsp_queuecommand_lck(struct scsi_cmnd *SCpnt)SCp.buffers_residual : left buffers in list SCp.phase : current state of the command */ if (scsi_bufflen (SCpnt)) { - SCpnt->SCp.buffer =scsi_sglist (SCpnt); - SCpnt->SCp.ptr =BUFFER_ADDR ; - SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; - SCpnt->SCp.buffers_residual =scsi_sg_count (SCpnt) -1 ; + scsi_pointer->buffer =scsi_sglist (SCpnt); + scsi_pointer->ptr =BUFFER_ADDR (SCpnt); + scsi_pointer->this_residual = scsi_pointer->buffer->length; + scsi_pointer->buffers_residual =scsi_sg_count (SCpnt) -1 ; }else { - SCpnt->SCp.ptr =NULL ; - SCpnt->SCp.this_residual =0 ; - SCpnt->SCp.buffer =NULL ; - SCpnt->SCp.buffers_residual =0 ; + scsi_pointer->ptr =NULL ; + scsi_pointer->this_residual =0 ; + scsi_pointer->buffer =NULL ; + scsi_pointer->buffers_residual =0 ; }if (!nsphw_start_selection (SCpnt)) {
@@ -353,8 +360,9 @@ static void nsphw_init(nsp_hw_data *data)/* * Start selection phase */ -static bool nsphw_start_selection (struct scsi_cmnd *SCpnt) +static bool nsphw_start_selection (struct scsi_cmnd *const SCpnt) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);unsigned int host_id = SCpnt->device->host->this_id;unsigned int base = SCpnt->device->host->io_port;unsigned char target =scmd_id (SCpnt);
@@ -372,7 +380,7 @@ static bool nsphw_start_selection(struct scsi_cmnd *SCpnt)/* start arbitration */ //nsp_dbg(NSP_DEBUG_RESELECTION, "start arbit"); - SCpnt->SCp.phase =PH_ARBSTART ; + scsi_pointer->phase =PH_ARBSTART ;nsp_index_write (base,SETARBIT ,ARBIT_GO ); time_out =1000 ;
@@ -392,7 +400,7 @@ static bool nsphw_start_selection(struct scsi_cmnd *SCpnt)/* assert select line */ //nsp_dbg(NSP_DEBUG_RESELECTION, "assert SEL line"); - SCpnt->SCp.phase =PH_SELSTART ; + scsi_pointer->phase =PH_SELSTART ;udelay (3 );/* wait 2.4us */ nsp_index_write (base,SCSIDATALATCH ,BIT (host_id) |BIT (target));nsp_index_write (base,SCSIBUSCTRL ,SCSI_SEL |SCSI_BSY |SCSI_ATN );
@@ -568,8 +576,9 @@ static int nsp_expect_signal(struct scsi_cmnd *SCpnt,/* * transfer SCSI message */ -static int nsp_xfer (struct scsi_cmnd *SCpnt,int phase) +static int nsp_xfer (struct scsi_cmnd *const SCpnt,int phase) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);unsigned int base = SCpnt->device->host->io_port;nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;char *buf = data->MsgBuffer;
@@ -587,7 +596,7 @@ static int nsp_xfer(struct scsi_cmnd *SCpnt, int phase) }/* if last byte, negate ATN */ -if (len ==1 && SCpnt->SCp.phase ==PH_MSG_OUT ) { +if (len ==1 && scsi_pointer->phase ==PH_MSG_OUT ) {nsp_index_write (base,SCSIBUSCTRL ,AUTODIRECTION |ACKENB ); }
@@ -608,14 +617,15 @@ static int nsp_xfer(struct scsi_cmnd *SCpnt, int phase)/* * get extra SCSI data from fifo */ -static int nsp_dataphase_bypass (struct scsi_cmnd *SCpnt) +static int nsp_dataphase_bypass (struct scsi_cmnd *const SCpnt) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;unsigned int count;//nsp_dbg(NSP_DEBUG_DATA_IO, "in"); -if (SCpnt->SCp.have_data_in !=IO_IN ) { +if (scsi_pointer->have_data_in !=IO_IN ) {return 0 ; }
@@ -630,7 +640,7 @@ static int nsp_dataphase_bypass(struct scsi_cmnd *SCpnt)* data phase skip only occures in case of SCSI_LOW_READ */ nsp_dbg (NSP_DEBUG_DATA_IO ,"use bypass quirk" ); - SCpnt->SCp.phase =PH_DATA ; + scsi_pointer->phase =PH_DATA ;nsp_pio_read (SCpnt);nsp_setup_fifo (data, false);
@@ -704,8 +714,9 @@ static int nsp_fifo_count(struct scsi_cmnd *SCpnt)/* * read data in DATA IN phase */ -static void nsp_pio_read (struct scsi_cmnd *SCpnt) +static void nsp_pio_read (struct scsi_cmnd *const SCpnt) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);unsigned int base = SCpnt->device->host->io_port;unsigned long mmio_base = SCpnt->device->host->base;nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
@@ -716,24 +727,25 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt) ocount = data->FifoCount;nsp_dbg (NSP_DEBUG_DATA_IO ,"in SCpnt=0x%p resid=%d ocount=%d ptr=0x%p this_residual=%d buffers=0x%p nbuf=%d" , - SCpnt,scsi_get_resid (SCpnt), ocount, SCpnt->SCp.ptr, - SCpnt->SCp.this_residual, SCpnt->SCp.buffer, - SCpnt->SCp.buffers_residual); + SCpnt,scsi_get_resid (SCpnt), ocount, scsi_pointer->ptr, + scsi_pointer->this_residual, scsi_pointer->buffer, + scsi_pointer->buffers_residual); time_out =1000 ;while ((time_out-- !=0 ) && - (SCpnt->SCp.this_residual >0 || SCpnt->SCp.buffers_residual >0 ) ) { + (scsi_pointer->this_residual >0 || + scsi_pointer->buffers_residual >0 )) { stat =nsp_index_read (base,SCSIBUSMON ); stat &=BUSMON_PHASE_MASK ; res =nsp_fifo_count (SCpnt) - ocount; -//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount, res); +//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x ocount=0x%x res=0x%x", scsi_pointer->ptr, scsi_pointer->this_residual, ocount, res); if (res ==0 ) {/* if some data available ? */ if (stat ==BUSPHASE_DATA_IN ) {/* phase changed? */ -//nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", SCpnt->SCp.this_residual); +//nsp_dbg(NSP_DEBUG_DATA_IO, " wait for data this=%d", scsi_pointer->this_residual); continue ; }else {nsp_dbg (NSP_DEBUG_DATA_IO ,"phase changed stat=0x%x" , stat);
@@ -747,20 +759,21 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)continue ; } - res =min (res, SCpnt->SCp.this_residual); + res =min (res, scsi_pointer->this_residual);switch (data->TransferMode) {case MODE_IO32 : res &= ~(BIT (1 )|BIT (0 ));/* align 4 */ -nsp_fifo32_read (base, SCpnt->SCp.ptr, res >>2 ); +nsp_fifo32_read (base, scsi_pointer->ptr, res >>2 );break ;case MODE_IO8 : -nsp_fifo8_read (base, SCpnt->SCp.ptr, res ); +nsp_fifo8_read (base, scsi_pointer->ptr, res);break ;case MODE_MEM32 : res &= ~(BIT (1 )|BIT (0 ));/* align 4 */ -nsp_mmio_fifo32_read (mmio_base, SCpnt->SCp.ptr, res >>2 ); +nsp_mmio_fifo32_read (mmio_base, scsi_pointer->ptr, + res >>2 );break ;default :
@@ -769,22 +782,23 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt) }nsp_inc_resid (SCpnt, -res); - SCpnt->SCp.ptr += res; - SCpnt->SCp.this_residual -= res; + scsi_pointer->ptr += res; + scsi_pointer->this_residual -= res; ocount += res; -//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this_residual=0x%x ocount=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, ocount); +//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this_residual=0x%x ocount=0x%x", scsi_pointer->ptr, scsi_pointer->this_residual, ocount); /* go to next scatter list if available */ -if (SCpnt->SCp.this_residual ==0 && - SCpnt->SCp.buffers_residual !=0 ) { +if (scsi_pointer->this_residual ==0 && + scsi_pointer->buffers_residual !=0 ) {//nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next timeout=%d", time_out); - SCpnt->SCp.buffers_residual--; - SCpnt->SCp.buffer =sg_next (SCpnt->SCp.buffer); - SCpnt->SCp.ptr =BUFFER_ADDR ; - SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; + scsi_pointer->buffers_residual--; + scsi_pointer->buffer =sg_next (scsi_pointer->buffer); + scsi_pointer->ptr =BUFFER_ADDR (SCpnt); + scsi_pointer->this_residual = + scsi_pointer->buffer->length; time_out =1000 ; -//nsp_dbg(NSP_DEBUG_DATA_IO, "page: 0x%p, off: 0x%x", SCpnt->SCp.buffer->page, SCpnt->SCp.buffer->offset); +//nsp_dbg(NSP_DEBUG_DATA_IO, "page: 0x%p, off: 0x%x", scsi_pointer->buffer->page, scsi_pointer->buffer->offset); } }
@@ -792,8 +806,8 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)if (time_out <0 ) {nsp_msg (KERN_DEBUG ,"pio read timeout resid=%d this_residual=%d buffers_residual=%d" , -scsi_get_resid (SCpnt), SCpnt->SCp.this_residual, - SCpnt->SCp.buffers_residual); +scsi_get_resid (SCpnt), scsi_pointer->this_residual, + scsi_pointer->buffers_residual); }nsp_dbg (NSP_DEBUG_DATA_IO ,"read ocount=0x%x" , ocount); nsp_dbg(NSP_DEBUG_DATA_IO, "r cmd=%d resid=0x%x\n", data->CmdId,
@@ -805,6 +819,7 @@ static void nsp_pio_read(struct scsi_cmnd *SCpnt)*/ static void nsp_pio_write (struct scsi_cmnd *SCpnt) { +struct scsi_pointer *scsi_pointer =nsp_priv (SCpnt);unsigned int base = SCpnt->device->host->io_port;unsigned long mmio_base = SCpnt->device->host->base;nsp_hw_data *data = (nsp_hw_data *)SCpnt->device->host->hostdata;
@@ -815,14 +830,15 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt) ocount = data->FifoCount;nsp_dbg (NSP_DEBUG_DATA_IO ,"in fifocount=%d ptr=0x%p this_residual=%d buffers=0x%p nbuf=%d resid=0x%x" , - data->FifoCount, SCpnt->SCp.ptr, SCpnt->SCp.this_residual, - SCpnt->SCp.buffer, SCpnt->SCp.buffers_residual, + data->FifoCount, scsi_pointer->ptr, scsi_pointer->this_residual, + scsi_pointer->buffer, scsi_pointer->buffers_residual,scsi_get_resid (SCpnt)); time_out =1000 ;while ((time_out-- !=0 ) && - (SCpnt->SCp.this_residual >0 || SCpnt->SCp.buffers_residual >0 )) { + (scsi_pointer->this_residual >0 || + scsi_pointer->buffers_residual >0 )) { stat =nsp_index_read (base,SCSIBUSMON ); stat &=BUSMON_PHASE_MASK ;
@@ -832,9 +848,9 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt)nsp_dbg (NSP_DEBUG_DATA_IO ,"phase changed stat=0x%x, res=%d\n" , stat, res);/* Put back pointer */ nsp_inc_resid (SCpnt, res); - SCpnt->SCp.ptr -= res; - SCpnt->SCp.this_residual += res; - ocount -= res; + scsi_pointer->ptr -= res; + scsi_pointer->this_residual += res; + ocount -= res;break ; }
@@ -845,21 +861,22 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt)continue ; } - res =min (SCpnt->SCp.this_residual,WFIFO_CRIT ); + res =min (scsi_pointer->this_residual,WFIFO_CRIT ); -//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x res=0x%x", SCpnt->SCp.ptr, SCpnt->SCp.this_residual, res); +//nsp_dbg(NSP_DEBUG_DATA_IO, "ptr=0x%p this=0x%x res=0x%x", scsi_pointer->ptr, scsi_pointer->this_residual, res); switch (data->TransferMode) {case MODE_IO32 : res &= ~(BIT (1 )|BIT (0 ));/* align 4 */ -nsp_fifo32_write (base, SCpnt->SCp.ptr, res >>2 ); +nsp_fifo32_write (base, scsi_pointer->ptr, res >>2 );break ;case MODE_IO8 : -nsp_fifo8_write (base, SCpnt->SCp.ptr, res ); +nsp_fifo8_write (base, scsi_pointer->ptr, res);break ;case MODE_MEM32 : res &= ~(BIT (1 )|BIT (0 ));/* align 4 */ -nsp_mmio_fifo32_write (mmio_base, SCpnt->SCp.ptr, res >>2 ); +nsp_mmio_fifo32_write (mmio_base, scsi_pointer->ptr, + res >>2 );break ;default :
@@ -868,18 +885,19 @@ static void nsp_pio_write(struct scsi_cmnd *SCpnt) }nsp_inc_resid (SCpnt, -res); - SCpnt->SCp.ptr += res; - SCpnt->SCp.this_residual -= res; - ocount += res; + scsi_pointer->ptr += res; + scsi_pointer->this_residual -= res; + ocount += res;/* go to next scatter list if available */ -if (SCpnt->SCp.this_residual ==0 && - SCpnt->SCp.buffers_residual !=0 ) { +if (scsi_pointer->this_residual ==0 && + scsi_pointer->buffers_residual !=0 ) {//nsp_dbg(NSP_DEBUG_DATA_IO, "scatterlist next"); - SCpnt->SCp.buffers_residual--; - SCpnt->SCp.buffer =sg_next (SCpnt->SCp.buffer); - SCpnt->SCp.ptr =BUFFER_ADDR ; - SCpnt->SCp.this_residual = SCpnt->SCp.buffer->length; + scsi_pointer->buffers_residual--; + scsi_pointer->buffer =sg_next (scsi_pointer->buffer); + scsi_pointer->ptr =BUFFER_ADDR (SCpnt); + scsi_pointer->this_residual = + scsi_pointer->buffer->length; time_out =1000 ; } }
@@ -947,6 +965,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)unsigned int base;unsigned char irq_status, irq_phase, phase;struct scsi_cmnd *tmpSC; +struct scsi_pointer *scsi_pointer;unsigned char target, lun;unsigned int *sync_neg;int i, tmp;
@@ -1025,9 +1044,10 @@ static irqreturn_t nspintr(int irq, void *dev_id)if (data->CurrentSC !=NULL ) { tmpSC = data->CurrentSC; - tmpSC->result = (DID_RESET <<16 ) | - ((tmpSC->SCp.Message &0xff ) <<8 ) | - ((tmpSC->SCp.Status &0xff ) <<0 ); + scsi_pointer =nsp_priv (tmpSC); + tmpSC->result = (DID_RESET <<16 ) | + ((scsi_pointer->Message &0xff ) <<8 ) | + ((scsi_pointer->Status &0xff ) <<0 );nsp_scsi_done (tmpSC); }return IRQ_HANDLED ;
@@ -1041,6 +1061,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) } tmpSC = data->CurrentSC; + scsi_pointer =nsp_priv (tmpSC); target = tmpSC->device->id; lun = tmpSC->device->lun; sync_neg = &(data->Sync[target].SyncNegotiation);
@@ -1063,7 +1084,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)//show_phase(tmpSC); -switch (tmpSC->SCp.phase) { +switch (scsi_pointer->phase) {case PH_SELSTART :// *sync_neg = SYNC_NOT_YET; if ((phase &BUSMON_BSY ) ==0 ) {
@@ -1086,7 +1107,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)/* attention assert */ //nsp_dbg(NSP_DEBUG_INTR, "attention assert"); data->SelectionTimeOut =0 ; - tmpSC->SCp.phase =PH_SELECTED ; + scsi_pointer->phase =PH_SELECTED ;nsp_index_write (base,SCSIBUSCTRL ,SCSI_ATN );udelay (1 );nsp_index_write (base,SCSIBUSCTRL ,SCSI_ATN |AUTODIRECTION |ACKENB );
@@ -1115,17 +1136,18 @@ static irqreturn_t nspintr(int irq, void *dev_id)//nsp_dbg(NSP_DEBUG_INTR, "start scsi seq"); /* normal disconnect */ -if (((tmpSC->SCp.phase ==PH_MSG_IN ) || (tmpSC->SCp.phase ==PH_MSG_OUT )) && - (irq_phase &LATCHED_BUS_FREE ) !=0 ) { +if ((scsi_pointer->phase ==PH_MSG_IN || + scsi_pointer->phase ==PH_MSG_OUT ) && + (irq_phase &LATCHED_BUS_FREE ) !=0 ) {nsp_dbg (NSP_DEBUG_INTR ,"normal disconnect irq_status=0x%x, phase=0x%x, irq_phase=0x%x" , irq_status, phase, irq_phase);//*sync_neg = SYNC_NOT_YET; /* all command complete and return status */ -if (tmpSC->SCp.Message ==COMMAND_COMPLETE ) { - tmpSC->result = (DID_OK <<16 ) | - ((tmpSC->SCp.Message &0xff ) <<8 ) | - ((tmpSC->SCp.Status &0xff ) <<0 ); +if (scsi_pointer->Message ==COMMAND_COMPLETE ) { + tmpSC->result = (DID_OK <<16 ) | + ((scsi_pointer->Message &0xff ) <<8 ) | + ((scsi_pointer->Status &0xff ) <<0 );nsp_dbg (NSP_DEBUG_INTR ,"command complete result=0x%x" , tmpSC->result);nsp_scsi_done (tmpSC);
@@ -1154,7 +1176,7 @@ static irqreturn_t nspintr(int irq, void *dev_id)return IRQ_HANDLED ; } - tmpSC->SCp.phase =PH_COMMAND ; + scsi_pointer->phase =PH_COMMAND ;nsp_nexus (tmpSC);
@@ -1170,8 +1192,8 @@ static irqreturn_t nspintr(int irq, void *dev_id)case BUSPHASE_DATA_OUT :nsp_dbg (NSP_DEBUG_INTR ,"BUSPHASE_DATA_OUT" ); - tmpSC->SCp.phase =PH_DATA ; - tmpSC->SCp.have_data_in =IO_OUT ; + scsi_pointer->phase =PH_DATA ; + scsi_pointer->have_data_in =IO_OUT ;nsp_pio_write (tmpSC);
@@ -1180,8 +1202,8 @@ static irqreturn_t nspintr(int irq, void *dev_id)case BUSPHASE_DATA_IN :nsp_dbg (NSP_DEBUG_INTR ,"BUSPHASE_DATA_IN" ); - tmpSC->SCp.phase =PH_DATA ; - tmpSC->SCp.have_data_in =IO_IN ; + scsi_pointer->phase =PH_DATA ; + scsi_pointer->have_data_in =IO_IN ;nsp_pio_read (tmpSC);
@@ -1191,10 +1213,11 @@ static irqreturn_t nspintr(int irq, void *dev_id)nsp_dataphase_bypass (tmpSC);nsp_dbg (NSP_DEBUG_INTR ,"BUSPHASE_STATUS" ); - tmpSC->SCp.phase =PH_STATUS ; + scsi_pointer->phase =PH_STATUS ; - tmpSC->SCp.Status =nsp_index_read (base,SCSIDATAWITHACK ); -nsp_dbg (NSP_DEBUG_INTR ,"message=0x%x status=0x%x" , tmpSC->SCp.Message, tmpSC->SCp.Status); + scsi_pointer->Status =nsp_index_read (base,SCSIDATAWITHACK ); +nsp_dbg (NSP_DEBUG_INTR ,"message=0x%x status=0x%x" , + scsi_pointer->Message, scsi_pointer->Status);break ;
@@ -1204,7 +1227,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) goto timer_out; } - tmpSC->SCp.phase =PH_MSG_OUT ; + scsi_pointer->phase =PH_MSG_OUT ;//*sync_neg = SYNC_NOT_YET;
@@ -1237,7 +1260,7 @@ static irqreturn_t nspintr(int irq, void *dev_id) goto timer_out; } - tmpSC->SCp.phase =PH_MSG_IN ; + scsi_pointer->phase =PH_MSG_IN ;nsp_message_in (tmpSC);/**/
@@ -1269,9 +1292,10 @@ static irqreturn_t nspintr(int irq, void *dev_id) i += (1 + data->MsgBuffer[i+1 ]); } } - tmpSC->SCp.Message = tmp; + scsi_pointer->Message = tmp; -nsp_dbg (NSP_DEBUG_INTR ,"message=0x%x len=%d" , tmpSC->SCp.Message, data->MsgLen); +nsp_dbg (NSP_DEBUG_INTR ,"message=0x%x len=%d" , + scsi_pointer->Message, data->MsgLen);show_message (data);break ;
drivers/scsi/pcmcia/nsp_cs.h +1 -1
@@ -371,7 +371,7 @@ enum _burst_mode { };/* scatter-gather table */ -# define BUFFER_ADDR ((char *)((sg_virt(SCpnt->SCp.buffer)))) +#define BUFFER_ADDR (SCpnt) ((char *)(sg_virt(nsp_priv(SCpnt)->buffer)))#endif /*__nsp_cs__*/ /* end */
drivers/scsi/pcmcia/nsp_debug.c +1 -1
@@ -145,7 +145,7 @@ static void show_command(struct scsi_cmnd *SCpnt)static void show_phase (struct scsi_cmnd *SCpnt) { -int i = SCpnt->SCp.phase; +int i =nsp_scsi_pointer (SCpnt)->phase;char *ph[] = {"PH_UNDETERMINED" ,
PATCH v5 39/49 scsi: sym53c500_cs: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/pcmcia/sym53c500_cs.c | 47 ++++++++++++++++++------------ 1 file changed, 29 insertions(+), 18 deletions(-)
drivers/scsi/pcmcia/sym53c500_cs.c +29 -18
@@ -192,6 +192,11 @@ struct sym53c500_data {int fast_pio; }; +static struct scsi_pointer *sym53c500_scsi_pointer (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +enum Phase { idle, data_out,
@@ -351,6 +356,7 @@ SYM53C500_intr(int irq, void *dev_id)struct sym53c500_data *data = (struct sym53c500_data *)dev->hostdata;struct scsi_cmnd *curSC = data->current_SC; +struct scsi_pointer *scsi_pointer =sym53c500_scsi_pointer (curSC);int fast_pio = data->fast_pio;spin_lock_irqsave (dev->host_lock, flags);
@@ -397,11 +403,12 @@ SYM53C500_intr(int irq, void *dev_id)if (int_reg &0x20 ) {/* Disconnect */ DEB (printk ("SYM53C500: disconnect intr received\n" )); -if (curSC->SCp.phase != message_in) {/* Unexpected disconnect */ +if (scsi_pointer->phase != message_in) {/* Unexpected disconnect */ curSC->result =DID_NO_CONNECT <<16 ; }else {/* Command complete, return status and message */ - curSC->result = (curSC->SCp.Status &0xff ) - | ((curSC->SCp.Message &0xff ) <<8 ) | (DID_OK <<16 ); + curSC->result = (scsi_pointer->Status &0xff ) | + ((scsi_pointer->Message &0xff ) <<8 ) | + (DID_OK <<16 ); } goto idle_out; }
@@ -412,7 +419,7 @@ SYM53C500_intr(int irq, void *dev_id)struct scatterlist *sg;int i; - curSC->SCp.phase = data_out; + scsi_pointer->phase = data_out;VDEB (printk ("SYM53C500: Data-Out phase\n" ));outb (FLUSH_FIFO , port_base +CMD_REG );LOAD_DMA_COUNT (port_base,scsi_bufflen (curSC));/* Max transfer size */
@@ -431,7 +438,7 @@ SYM53C500_intr(int irq, void *dev_id)struct scatterlist *sg;int i; - curSC->SCp.phase = data_in; + scsi_pointer->phase = data_in;VDEB (printk ("SYM53C500: Data-In phase\n" ));outb (FLUSH_FIFO , port_base +CMD_REG );LOAD_DMA_COUNT (port_base,scsi_bufflen (curSC));/* Max transfer size */
@@ -446,12 +453,12 @@ SYM53C500_intr(int irq, void *dev_id)break ;case 0x02 :/* COMMAND */ - curSC->SCp.phase = command_ph; + scsi_pointer->phase = command_ph;printk ("SYM53C500: Warning: Unknown interrupt occurred in command phase!\n" );break ;case 0x03 :/* STATUS */ - curSC->SCp.phase = status_ph; + scsi_pointer->phase = status_ph;VDEB (printk ("SYM53C500: Status phase\n" ));outb (FLUSH_FIFO , port_base +CMD_REG );outb (INIT_CMD_COMPLETE , port_base +CMD_REG );
@@ -464,22 +471,24 @@ SYM53C500_intr(int irq, void *dev_id)case 0x06 :/* MESSAGE-OUT */ DEB (printk ("SYM53C500: Message-Out phase\n" )); - curSC->SCp.phase = message_out; + scsi_pointer->phase = message_out;outb (SET_ATN , port_base +CMD_REG );/* Reject the message */ outb (MSG_ACCEPT , port_base +CMD_REG );break ;case 0x07 :/* MESSAGE-IN */ VDEB (printk ("SYM53C500: Message-In phase\n" )); - curSC->SCp.phase = message_in; + scsi_pointer->phase = message_in; - curSC->SCp.Status =inb (port_base +SCSI_FIFO ); - curSC->SCp.Message =inb (port_base +SCSI_FIFO ); + scsi_pointer->Status =inb (port_base +SCSI_FIFO ); + scsi_pointer->Message =inb (port_base +SCSI_FIFO );VDEB (printk ("SCSI FIFO size=%d\n" ,inb (port_base +FIFO_FLAGS ) &0x1f )); -DEB (printk ("Status = %02x Message = %02x\n" , curSC->SCp.Status, curSC->SCp.Message)); +DEB (printk ("Status = %02x Message = %02x\n" , + scsi_pointer->Status, scsi_pointer->Message)); -if (curSC->SCp.Message ==SAVE_POINTERS || curSC->SCp.Message ==DISCONNECT ) { +if (scsi_pointer->Message ==SAVE_POINTERS || + scsi_pointer->Message ==DISCONNECT ) {outb (SET_ATN , port_base +CMD_REG );/* Reject message */ DEB (printk ("Discarding SAVE_POINTERS message\n" )); }
@@ -491,7 +500,7 @@ SYM53C500_intr(int irq, void *dev_id)return IRQ_HANDLED ; idle_out: - curSC->SCp.phase = idle; + scsi_pointer->phase = idle;scsi_done (curSC); goto out; }
@@ -539,6 +548,7 @@ SYM53C500_info(struct Scsi_Host *SChost)static int SYM53C500_queue_lck (struct scsi_cmnd *SCpnt) { +struct scsi_pointer *scsi_pointer =sym53c500_scsi_pointer (SCpnt);int i;int port_base = SCpnt->device->host->io_port; struct sym53c500_data *data =
@@ -555,9 +565,9 @@ static int SYM53C500_queue_lck(struct scsi_cmnd *SCpnt)VDEB (printk ("\n" )); data->current_SC = SCpnt; - data->current_SC->SCp.phase = command_ph; - data->current_SC->SCp.Status =0 ; - data->current_SC->SCp.Message =0 ; + scsi_pointer->phase = command_ph; + scsi_pointer->Status =0 ; + scsi_pointer->Message =0 ;/* We are locked here already by the mid layer */ REG0 (port_base);
@@ -671,7 +681,8 @@ static struct scsi_host_template sym53c500_driver_template = { .can_queue = 1, .this_id = 7, .sg_tablesize = 32, - .shost_groups = SYM53C500_shost_groups + .shost_groups = SYM53C500_shost_groups, + .cmd_size = sizeof(struct scsi_pointer), };static int SYM53C500_config_check (struct pcmcia_device *p_dev,void *priv_data)
PATCH v5 40/49 scsi: ppa: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/ppa.c | 75 ++++++++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 32 deletions(-)
drivers/scsi/ppa.c +43 -32
@@ -45,6 +45,11 @@ typedef struct {#include "ppa.h" +static struct scsi_pointer *ppa_scsi_pointer (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static inline ppa_struct *ppa_dev (struct Scsi_Host *host) {return *(ppa_struct **)&host->hostdata;
@@ -56,7 +61,7 @@ static void got_it(ppa_struct *dev) { dev->base = dev->dev->port->base;if (dev->cur_cmd) - dev->cur_cmd->SCp.phase =1 ; +ppa_scsi_pointer (dev->cur_cmd)->phase =1 ;else wake_up (dev->waiting); }
@@ -511,13 +516,14 @@ static inline int ppa_send_command(struct scsi_cmnd *cmd)* The driver appears to remain stable if we speed up the parallel port * i/o in this function, but not elsewhere. */ -static int ppa_completion (struct scsi_cmnd *cmd) +static int ppa_completion (struct scsi_cmnd *const cmd) {/* Return codes: * -1 Error * 0 Told to schedule * 1 Finished data transfer */ +struct scsi_pointer *scsi_pointer =ppa_scsi_pointer (cmd);ppa_struct *dev =ppa_dev (cmd->device->host);unsigned short ppb = dev->base;unsigned long start_jiffies = jiffies;
@@ -543,7 +549,7 @@ static int ppa_completion(struct scsi_cmnd *cmd)if (time_after (jiffies, start_jiffies +1 ))return 0 ; -if ((cmd->SCp.this_residual <=0 )) { +if (scsi_pointer->this_residual <=0 ) {ppa_fail (dev,DID_ERROR );return -1 ;/* ERROR_RETURN */ }
@@ -572,28 +578,30 @@ static int ppa_completion(struct scsi_cmnd *cmd) }/* determine if we should use burst I/O */ - fast = (bulk && (cmd->SCp.this_residual >=PPA_BURST_SIZE )) - ?PPA_BURST_SIZE :1 ; + fast = bulk && scsi_pointer->this_residual >=PPA_BURST_SIZE ? +PPA_BURST_SIZE :1 ;if (r == (unsigned char )0xc0 ) - status =ppa_out (dev, cmd->SCp.ptr, fast); + status =ppa_out (dev, scsi_pointer->ptr, fast);else - status =ppa_in (dev, cmd->SCp.ptr, fast); + status =ppa_in (dev, scsi_pointer->ptr, fast); - cmd->SCp.ptr += fast; - cmd->SCp.this_residual -= fast; + scsi_pointer->ptr += fast; + scsi_pointer->this_residual -= fast;if (!status) {ppa_fail (dev,DID_BUS_BUSY );return -1 ;/* ERROR_RETURN */ } -if (cmd->SCp.buffer && !cmd->SCp.this_residual) { +if (scsi_pointer->buffer && !scsi_pointer->this_residual) {/* if scatter/gather, advance to the next segment */ -if (cmd->SCp.buffers_residual--) { - cmd->SCp.buffer =sg_next (cmd->SCp.buffer); - cmd->SCp.this_residual = - cmd->SCp.buffer->length; - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); +if (scsi_pointer->buffers_residual--) { + scsi_pointer->buffer = +sg_next (scsi_pointer->buffer); + scsi_pointer->this_residual = + scsi_pointer->buffer->length; + scsi_pointer->ptr = +sg_virt (scsi_pointer->buffer); } }/* Now check to see if the drive is ready to comunicate */
@@ -658,7 +666,7 @@ static void ppa_interrupt(struct work_struct *work) }#endif -if (cmd->SCp.phase >1 ) +if (ppa_scsi_pointer (cmd)->phase >1 )ppa_disconnect (dev);ppa_pb_dismiss (dev);
@@ -670,6 +678,7 @@ static void ppa_interrupt(struct work_struct *work)static int ppa_engine (ppa_struct *dev,struct scsi_cmnd *cmd) { +struct scsi_pointer *scsi_pointer =ppa_scsi_pointer (cmd);unsigned short ppb = dev->base;unsigned char l =0 , h =0 ;int retv;
@@ -680,7 +689,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)if (dev->failed)return 0 ; -switch (cmd->SCp.phase) { +switch (scsi_pointer->phase) {case 0 :/* Phase 0 - Waiting for parport */ if (time_after (jiffies, dev->jstart +HZ )) {/*
@@ -715,7 +724,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)return 1 ;/* Try again in a jiffy */ } } - cmd->SCp.phase++; + scsi_pointer->phase++; } fallthrough;
@@ -724,7 +733,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)ppa_fail (dev,DID_NO_CONNECT );return 0 ; } - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 3 :/* Phase 3 - Ready to accept a command */
@@ -734,21 +743,22 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)if (!ppa_send_command (cmd))return 0 ; - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 4 :/* Phase 4 - Setup scatter/gather buffers */ if (scsi_bufflen (cmd)) { - cmd->SCp.buffer =scsi_sglist (cmd); - cmd->SCp.this_residual = cmd->SCp.buffer->length; - cmd->SCp.ptr =sg_virt (cmd->SCp.buffer); + scsi_pointer->buffer =scsi_sglist (cmd); + scsi_pointer->this_residual = + scsi_pointer->buffer->length; + scsi_pointer->ptr =sg_virt (scsi_pointer->buffer); }else { - cmd->SCp.buffer =NULL ; - cmd->SCp.this_residual =0 ; - cmd->SCp.ptr =NULL ; + scsi_pointer->buffer =NULL ; + scsi_pointer->this_residual =0 ; + scsi_pointer->ptr =NULL ; } - cmd->SCp.buffers_residual =scsi_sg_count (cmd) -1 ; - cmd->SCp.phase++; + scsi_pointer->buffers_residual =scsi_sg_count (cmd) -1 ; + scsi_pointer->phase++; fallthrough;case 5 :/* Phase 5 - Data transfer stage */
@@ -761,7 +771,7 @@ static int ppa_engine(ppa_struct *dev, struct scsi_cmnd *cmd)return 0 ;if (retv ==0 )return 1 ; - cmd->SCp.phase++; + scsi_pointer->phase++; fallthrough;case 6 :/* Phase 6 - Read status/message */
@@ -798,7 +808,7 @@ static int ppa_queuecommand_lck(struct scsi_cmnd *cmd) dev->jstart = jiffies; dev->cur_cmd = cmd; cmd->result =DID_ERROR <<16 ;/* default return code */ - cmd->SCp.phase =0 ;/* bus free */ +ppa_scsi_pointer (cmd)->phase =0 ;/* bus free */ schedule_delayed_work (&dev->ppa_tq,0 );
@@ -839,7 +849,7 @@ static int ppa_abort(struct scsi_cmnd *cmd)* have tied the SCSI_MESSAGE line high in the interface */ -switch (cmd->SCp.phase) { +switch (ppa_scsi_pointer (cmd)->phase) {case 0 :/* Do not have access to parport */ case 1 :/* Have not connected to interface */ dev->cur_cmd =NULL ;/* Forget the problem */
@@ -861,7 +871,7 @@ static int ppa_reset(struct scsi_cmnd *cmd) {ppa_struct *dev =ppa_dev (cmd->device->host); -if (cmd->SCp.phase) +if (ppa_scsi_pointer (cmd)->phase)ppa_disconnect (dev); dev->cur_cmd =NULL ;/* Forget the problem */
@@ -976,6 +986,7 @@ static struct scsi_host_template ppa_template = { .sg_tablesize = SG_ALL, .can_queue = 1, .slave_alloc = ppa_adjust_queue, + .cmd_size = sizeof(struct scsi_pointer), };/***************************************************************************
PATCH v5 41/49 scsi: qla1280: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/qla1280.c | 21 ++++----------------- drivers/scsi/qla1280.h | 3 +-- 2 files changed, 5 insertions(+), 19 deletions(-)
drivers/scsi/qla1280.c +4 -17
@@ -477,13 +477,6 @@ __setup("qla1280=", qla1280_setup);#endif -/* -* We use the scsi_pointer structure that's included with each scsi_command -* to overlay our struct srb over it. qla1280_init() checks that a srb is not -* bigger than a scsi_pointer. -*/ - -#define CMD_SP (Cmnd) &Cmnd->SCp#define CMD_CDBLEN (Cmnd) Cmnd->cmd_len#define CMD_CDBP (Cmnd) Cmnd->cmnd#define CMD_SNSP (Cmnd) Cmnd->sense_buffer
@@ -693,7 +686,7 @@ static int qla1280_queuecommand_lck(struct scsi_cmnd *cmd) {struct Scsi_Host *host = cmd->device->host;struct scsi_qla_host *ha = (struct scsi_qla_host *)host->hostdata; -struct srb *sp = (struct srb *)CMD_SP (cmd); +struct srb *sp =scsi_cmd_priv (cmd);int status; sp->cmd = cmd;
@@ -828,7 +821,7 @@ qla1280_error_action(struct scsi_cmnd *cmd, enum action action)ENTER ("qla1280_error_action" ); ha = (struct scsi_qla_host *)(CMD_HOST (cmd)->hostdata); - sp = (struct srb *)CMD_SP (cmd); + sp =scsi_cmd_priv (cmd); bus =SCSI_BUS_32 (cmd); target =SCSI_TCN_32 (cmd); lun =SCSI_LUN_32 (cmd);
@@ -3959,7 +3952,7 @@ __qla1280_print_scsi_cmd(struct scsi_cmnd *cmd)int i; ha = (struct scsi_qla_host *)host->hostdata; - sp = (struct srb *)CMD_SP (cmd); + sp =scsi_cmd_priv (cmd);printk ("SCSI Command @= 0x%p, Handle=0x%p\n" , cmd,CMD_HANDLE (cmd)); printk(" chan=%d, target = 0x%02x, lun = 0x%02x, cmd_len = 0x%02x\n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd),
@@ -3979,7 +3972,6 @@ __qla1280_print_scsi_cmd(struct scsi_cmnd *cmd)} */ printk (" tag=%d, transfersize=0x%x \n" ,scsi_cmd_to_rq (cmd)->tag, cmd->transfersize); -printk (" SP=0x%p\n" ,CMD_SP (cmd));printk (" underflow size = 0x%x, direction=0x%x\n" , cmd->underflow, cmd->sc_data_direction); }
@@ -4139,6 +4131,7 @@ static struct scsi_host_template qla1280_driver_template = { .can_queue = MAX_OUTSTANDING_COMMANDS, .this_id = -1, .sg_tablesize = SG_ALL, + .cmd_size = sizeof(struct srb), };
@@ -4351,12 +4344,6 @@ static struct pci_driver qla1280_pci_driver = {static int __init qla1280_init (void ) { -if (sizeof (struct srb ) >sizeof (struct scsi_pointer )) { -printk (KERN_WARNING -"qla1280: struct srb too big, aborting\n" ); -return -EINVAL ; - } -#ifdef MODULE /* * If we are called as a module, the qla1280 pointer may not be null
drivers/scsi/qla1280.h +1 -2
@@ -87,8 +87,7 @@#define RESPONSE_ENTRY_CNT 63/* Number of response entries. */ /* -* SCSI Request Block structure (sp) that is placed -* on cmd->SCp location of every I/O +* SCSI Request Block structure (sp) that occurs after each struct scsi_cmnd. */ struct srb {struct list_head list;/* (8/16) LU queue */
PATCH v5 42/49 scsi: qla2xxx: Stop using the SCSI pointer
In reply to Bart Van AsscheInstead of using the SCp.ptr field to track whether or not a command is in flight, use the sp->type field to track this information. sp->type must be set for proper operation of the qla2xxx driver. See e.g. the switch (sp->type) statement in qla2x00_ct_entry().
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/qla2xxx/qla_def.h | 2 -- drivers/scsi/qla2xxx/qla_os.c | 13 +++++-------- 2 files changed, 5 insertions(+), 10 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +0 -2
@@ -5201,8 +5201,6 @@ struct secure_flash_update_block_pk {#define QLA_DSDS_PER_IOCB 37 -#define CMD_SP (Cmnd) ((Cmnd)->SCp.ptr) -#define QLA_SG_ALL 1024enum nexus_wait_type {
drivers/scsi/qla2xxx/qla_os.c +5 -8
@@ -739,7 +739,7 @@ void qla2x00_sp_compl(srb_t *sp, int res)/* kref: INIT */ kref_put (&sp->cmd_kref, qla2x00_sp_release); cmd->result = res; -CMD_SP (cmd) =NULL ; + sp->type =0 ;scsi_done (cmd);if (comp)complete (comp);
@@ -831,7 +831,7 @@ void qla2xxx_qpair_sp_compl(srb_t *sp, int res)/* ref: INIT */ kref_put (&sp->cmd_kref, qla2x00_sp_release); cmd->result = res; -CMD_SP (cmd) =NULL ; + sp->type =0 ;scsi_done (cmd);if (comp)complete (comp);
@@ -934,8 +934,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) sp->u.scmd.cmd = cmd; sp->type =SRB_SCSI_CMD ; - -CMD_SP (cmd) = (void *)sp; sp->free = qla2x00_sp_free_dma; sp->done = qla2x00_sp_compl;
@@ -1025,7 +1023,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, sp->u.scmd.cmd = cmd; sp->type =SRB_SCSI_CMD ; -CMD_SP (cmd) = (void *)sp; sp->free = qla2xxx_qpair_sp_free_dma; sp->done = qla2xxx_qpair_sp_compl;
@@ -1071,6 +1068,7 @@ qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd)unsigned long wait_iter =ABORT_WAIT_ITER ;scsi_qla_host_t *vha =shost_priv (cmd->device->host);struct qla_hw_data *ha = vha->hw; +srb_t *sp =scsi_cmd_priv (cmd);int ret =QLA_SUCCESS ;if (unlikely (pci_channel_offline (ha->pdev)) || ha->flags.eeh_busy) {
@@ -1079,10 +1077,9 @@ qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd)return ret; } -while (CMD_SP (cmd) && wait_iter--) { +while (sp->type && wait_iter--)msleep (ABORT_POLLING_PERIOD ); - } -if (CMD_SP (cmd)) +if (sp->type) ret =QLA_FUNCTION_FAILED ;return ret;
PATCH v5 43/49 scsi: smartpqi: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/smartpqi/smartpqi_init.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +12 -2
@@ -54,6 +54,15 @@ MODULE_DESCRIPTION("Driver for Microchip Smart Family Controller version "MODULE_VERSION (DRIVER_VERSION );MODULE_LICENSE ("GPL" ); +struct pqi_cmd_priv { +int this_residual; +}; + +static struct pqi_cmd_priv *pqi_cmd_priv (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +} +static void pqi_verify_structures (void );static void pqi_take_ctrl_offline (struct pqi_ctrl_info *ctrl_info,enum pqi_ctrl_shutdown_reason ctrl_shutdown_reason);
@@ -5552,7 +5561,7 @@ static void pqi_aio_io_complete(struct pqi_io_request *io_request,scsi_dma_unmap (scmd);if (io_request->status == -EAGAIN ||pqi_raid_bypass_retry_needed (io_request)) {set_host_byte (scmd,DID_IMM_RETRY ); - scmd->SCp.this_residual++; +pqi_cmd_priv (scmd)->this_residual++; }pqi_free_io_request (io_request);
@@ -5814,7 +5823,7 @@ static inline bool pqi_is_bypass_eligible_request(struct scsi_cmnd *scmd)if (blk_rq_is_passthrough (scsi_cmd_to_rq (scmd)))return false; -return scmd->SCp.this_residual ==0 ; +return pqi_cmd_priv (scmd)->this_residual ==0 ; }/*
@@ -7262,6 +7271,7 @@ static struct scsi_host_template pqi_driver_template = { .map_queues = pqi_map_queues, .sdev_groups = pqi_sdev_groups, .shost_groups = pqi_shost_groups, + .cmd_size = sizeof(struct pqi_cmd_priv), };static int pqi_register_scsi (struct pqi_ctrl_info *ctrl_info)
PATCH v5 44/49 scsi: sym53c8xx_2: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/sym53c8xx_2/sym_glue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/sym53c8xx_2/sym_glue.c +2 -2
@@ -118,7 +118,7 @@ struct sym_ucmd { /* Override the SCSI pointer structure */struct completion *eh_done;/* SCSI error handling */ }; -#define SYM_UCMD_PTR (cmd) ((struct sym_ucmd *)(&(cmd)->SCp)) +#define SYM_UCMD_PTR (cmd) ((struct sym_ucmd *)scsi_cmd_priv(cmd))#define SYM_SOFTC_PTR (cmd) sym_get_hcb(cmd->device->host)/*
@@ -127,7 +127,6 @@ struct sym_ucmd { /* Override the SCSI pointer structure */void sym_xpt_done (struct sym_hcb *np,struct scsi_cmnd *cmd) {struct sym_ucmd *ucmd =SYM_UCMD_PTR (cmd); -BUILD_BUG_ON (sizeof (struct scsi_pointer ) <sizeof (struct sym_ucmd ));if (ucmd->eh_done)complete (ucmd->eh_done);
@@ -1630,6 +1629,7 @@ static struct scsi_host_template sym2_template = { .module = THIS_MODULE, .name = "sym53c8xx", .info = sym53c8xx_info, + .cmd_size = sizeof(struct sym_ucmd), .queuecommand = sym53c8xx_queue_command, .slave_alloc = sym53c8xx_slave_alloc, .slave_configure = sym53c8xx_slave_configure,
PATCH v5 45/49 scsi: usb: Stop using the SCSI pointer
In reply to Bart Van AsscheSet scsi_host_template.cmd_size instead of using the SCSI pointer for storing driver-private data. Change the type of the argument of uas_add_work() from struct uas_cmd_info * into struct scsi_cmnd * because it is easier to convert a SCSI command pointer into a uas_cmd_info pointer than the other way around.
This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/usb/storage/uas.c | 43 ++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 23 deletions(-)
drivers/usb/storage/uas.c +20 -23
@@ -113,7 +113,7 @@ static void uas_do_work(struct work_struct *work)continue ; cmnd = devinfo->cmnd[i]; - cmdinfo = (void *)&cmnd->SCp; + cmdinfo =scsi_cmd_priv (cmnd);if (!(cmdinfo->state &IS_IN_WORK_LIST ))continue ;
@@ -139,10 +139,9 @@ static void uas_scan_work(struct work_struct *work)dev_dbg (&devinfo->intf->dev,"scan complete\n" ); } -static void uas_add_work (struct uas_cmd_info *cmdinfo) +static void uas_add_work (struct scsi_cmnd *cmnd) { -struct scsi_pointer *scp = (void *)cmdinfo; - struct scsi_cmnd *cmnd = container_of(scp, struct scsi_cmnd, SCp); +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct uas_dev_info *devinfo = cmnd->device->hostdata;lockdep_assert_held (&devinfo->lock);
@@ -163,7 +162,7 @@ static void uas_zap_pending(struct uas_dev_info *devinfo, int result)continue ; cmnd = devinfo->cmnd[i]; - cmdinfo = (void *)&cmnd->SCp; + cmdinfo =scsi_cmd_priv (cmnd);uas_log_cmd_state (cmnd, __func__,0 );/* Sense urbs were killed, clear COMMAND_INFLIGHT manually */ cmdinfo->state &= ~COMMAND_INFLIGHT ;
@@ -200,15 +199,14 @@ static void uas_sense(struct urb *urb, struct scsi_cmnd *cmnd)static void uas_log_cmd_state (struct scsi_cmnd *cmnd,const char *prefix,int status) { -struct uas_cmd_info *ci = (void *)&cmnd->SCp; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *ci =scsi_cmd_priv (cmnd);if (status == -ENODEV )/* too late */ return ; scmd_printk(KERN_INFO, cmnd, "%s %d uas-tag %d inflight:%s%s%s%s%s%s%s%s%s%s%s%s ", - prefix, status, cmdinfo->uas_tag, + prefix, status, ci->uas_tag, (ci->state & SUBMIT_STATUS_URB) ? " s-st" : "", (ci->state & ALLOC_DATA_IN_URB) ? " a-in" : "", (ci->state & SUBMIT_DATA_IN_URB) ? " s-in" : "",
@@ -231,7 +229,7 @@ static void uas_free_unsubmitted_urbs(struct scsi_cmnd *cmnd)if (!cmnd)return ; - cmdinfo = (void *)&cmnd->SCp; + cmdinfo =scsi_cmd_priv (cmnd);if (cmdinfo->state &SUBMIT_CMD_URB )usb_free_urb (cmdinfo->cmd_urb);
@@ -245,7 +243,7 @@ static void uas_free_unsubmitted_urbs(struct scsi_cmnd *cmnd)static int uas_try_complete (struct scsi_cmnd *cmnd,const char *caller) { -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;lockdep_assert_held (&devinfo->lock);
@@ -263,13 +261,13 @@ static int uas_try_complete(struct scsi_cmnd *cmnd, const char *caller)static void uas_xfer_data (struct urb *urb,struct scsi_cmnd *cmnd,unsigned direction) { -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);int err; cmdinfo->state |= direction |SUBMIT_STATUS_URB ; err =uas_submit_urbs (cmnd, cmnd->device->hostdata);if (err) { -uas_add_work (cmdinfo); +uas_add_work (cmnd); } }
@@ -329,7 +327,7 @@ static void uas_stat_cmplt(struct urb *urb) } cmnd = devinfo->cmnd[idx]; - cmdinfo = (void *)&cmnd->SCp; + cmdinfo =scsi_cmd_priv (cmnd);if (!(cmdinfo->state &COMMAND_INFLIGHT )) {uas_log_cmd_state (cmnd,"unexpected status cmplt" ,0 );
@@ -394,7 +392,7 @@ static void uas_stat_cmplt(struct urb *urb)static void uas_data_cmplt (struct urb *urb) {struct scsi_cmnd *cmnd = urb->context; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;struct scsi_data_buffer *sdb = &cmnd->sdb;unsigned long flags;
@@ -446,7 +444,7 @@ static struct urb *uas_alloc_data_urb(struct uas_dev_info *devinfo, gfp_t gfp, enum dma_data_direction dir) {struct usb_device *udev = devinfo->udev; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct urb *urb =usb_alloc_urb (0 , gfp);struct scsi_data_buffer *sdb = &cmnd->sdb;unsigned int pipe = (dir ==DMA_FROM_DEVICE )
@@ -468,7 +466,7 @@ static struct urb *uas_alloc_sense_urb(struct uas_dev_info *devinfo, gfp_t gfp, struct scsi_cmnd *cmnd) {struct usb_device *udev = devinfo->udev; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct urb *urb =usb_alloc_urb (0 , gfp);struct sense_iu *iu;
@@ -496,7 +494,7 @@ static struct urb *uas_alloc_cmd_urb(struct uas_dev_info *devinfo, gfp_t gfp, {struct usb_device *udev = devinfo->udev;struct scsi_device *sdev = cmnd->device; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct urb *urb =usb_alloc_urb (0 , gfp);struct command_iu *iu;int len;
@@ -558,7 +556,7 @@ static struct urb *uas_submit_sense_urb(struct scsi_cmnd *cmnd, gfp_t gfp)static int uas_submit_urbs (struct scsi_cmnd *cmnd,struct uas_dev_info *devinfo) { -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct urb *urb;int err;
@@ -637,12 +635,10 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd) {struct scsi_device *sdev = cmnd->device;struct uas_dev_info *devinfo = sdev->hostdata; -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);unsigned long flags;int idx, err; -BUILD_BUG_ON (sizeof (struct uas_cmd_info ) >sizeof (struct scsi_pointer )); -/* Re-check scsi_block_requests now that we've the host-lock */ if (cmnd->device->host->host_self_blocked)return SCSI_MLQUEUE_DEVICE_BUSY ;
@@ -712,7 +708,7 @@ static int uas_queuecommand_lck(struct scsi_cmnd *cmnd)spin_unlock_irqrestore (&devinfo->lock, flags);return SCSI_MLQUEUE_DEVICE_BUSY ; } -uas_add_work (cmdinfo); +uas_add_work (cmnd); } devinfo->cmnd[idx] = cmnd;
@@ -730,7 +726,7 @@ static DEF_SCSI_QCMD(uas_queuecommand)*/ static int uas_eh_abort_handler (struct scsi_cmnd *cmnd) { -struct uas_cmd_info *cmdinfo = (void *)&cmnd->SCp; +struct uas_cmd_info *cmdinfo =scsi_cmd_priv (cmnd);struct uas_dev_info *devinfo = (void *)cmnd->device->hostdata;struct urb *data_in_urb =NULL ;struct urb *data_out_urb =NULL ;
@@ -910,6 +906,7 @@ static struct scsi_host_template uas_host_template = { .this_id = -1, .skip_settle_delay = 1, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct uas_cmd_info), }; #define UNUSUAL_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
PATCH v5 46/49 scsi: wd719x: Stop using the SCSI pointer
In reply to Bart Van AsscheMove the DMA handle into the per-command private data instead of using the SCSI pointer from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.
--- drivers/scsi/wd719x.c | 12 ++++++------ drivers/scsi/wd719x.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/scsi/wd719x.c +6 -6
@@ -196,7 +196,7 @@ static void wd719x_finish_cmd(struct wd719x_scb *scb, int result)dma_unmap_single (&wd->pdev->dev, scb->phys,sizeof (struct wd719x_scb ),DMA_BIDIRECTIONAL );scsi_dma_unmap (cmd); -dma_unmap_single (&wd->pdev->dev, cmd->SCp.dma_handle, +dma_unmap_single (&wd->pdev->dev, scb->dma_handle,SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE ); cmd->result = result <<16 ;
@@ -229,11 +229,11 @@ static int wd719x_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)/* map sense buffer */ scb->sense_buf_length =SCSI_SENSE_BUFFERSIZE ; - cmd->SCp.dma_handle =dma_map_single (&wd->pdev->dev, cmd->sense_buffer, -SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE ); -if (dma_mapping_error (&wd->pdev->dev, cmd->SCp.dma_handle)) + scb->dma_handle =dma_map_single (&wd->pdev->dev, cmd->sense_buffer, +SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE ); +if (dma_mapping_error (&wd->pdev->dev, scb->dma_handle)) goto out_unmap_scb; - scb->sense_buf =cpu_to_le32 (cmd->SCp.dma_handle); + scb->sense_buf =cpu_to_le32 (scb->dma_handle);/* request autosense */ scb->SCB_options |=WD719X_SCB_FLAGS_AUTO_REQUEST_SENSE ;
@@ -288,7 +288,7 @@ static int wd719x_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)return 0 ; out_unmap_sense: -dma_unmap_single (&wd->pdev->dev, cmd->SCp.dma_handle, +dma_unmap_single (&wd->pdev->dev, scb->dma_handle,SCSI_SENSE_BUFFERSIZE ,DMA_FROM_DEVICE ); out_unmap_scb: dma_unmap_single(&wd->pdev->dev, scb->phys, sizeof(*scb),
drivers/scsi/wd719x.h +1 -0
@@ -56,6 +56,7 @@ struct wd719x_scb {u8 flags[2 ];/* 62-63 SCB specific flags (local to each thread) */ /* everything below is for driver use (not used by card) */ dma_addr_t phys;/* bus address of the SCB */ +dma_addr_t dma_handle;struct scsi_cmnd *cmd;/* a copy of the pointer we were passed */ struct list_head list;struct wd719x_sglist sg_list[WD719X_SG ]__aligned(8) ;/* SG list */
PATCH v5 47/49 scsi: wd33c93: Move the SCSI pointer to private command data
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/a2091.c | 19 ++++--- drivers/scsi/a3000.c | 19 ++++--- drivers/scsi/gvp11.c | 19 ++++--- drivers/scsi/mvme147.c | 10 ++-- drivers/scsi/sgiwd93.c | 18 ++++--- drivers/scsi/wd33c93.c | 119 ++++++++++++++++++++++------------------- drivers/scsi/wd33c93.h | 4 ++ 7 files changed, 117 insertions(+), 91 deletions(-)
drivers/scsi/a2091.c +11 -8
@@ -44,16 +44,17 @@ static irqreturn_t a2091_intr(int irq, void *data)static int dma_setup (struct scsi_cmnd *cmd,int dir_in) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd);struct Scsi_Host *instance = cmd->device->host;struct a2091_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct a2091_scsiregs *regs = hdata->regs;unsigned short cntr =CNTR_PDMD |CNTR_INTEN ; -unsigned long addr =virt_to_bus (cmd->SCp.ptr); +unsigned long addr =virt_to_bus (scsi_pointer->ptr);/* don't allow DMA if the physical address is bad */ if (addr &A2091_XFER_MASK ) { - wh->dma_bounce_len = (cmd->SCp.this_residual +511 ) & ~0x1ff ; + wh->dma_bounce_len = (scsi_pointer->this_residual +511 ) & ~0x1ff ; wh->dma_bounce_buffer =kmalloc (wh->dma_bounce_len,GFP_KERNEL );
@@ -77,8 +78,8 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (!dir_in) {/* copy to bounce buffer for a write */ -memcpy (wh->dma_bounce_buffer, cmd->SCp.ptr, - cmd->SCp.this_residual); +memcpy (wh->dma_bounce_buffer, scsi_pointer->ptr, + scsi_pointer->this_residual); } }
@@ -96,10 +97,10 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (dir_in) {/* invalidate any cache */ -cache_clear (addr, cmd->SCp.this_residual); +cache_clear (addr, scsi_pointer->this_residual); }else {/* push any dirty cache */ -cache_push (addr, cmd->SCp.this_residual); +cache_push (addr, scsi_pointer->this_residual); }/* start DMA */ regs->ST_DMA =1 ;
@@ -111,6 +112,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)static void dma_stop (struct Scsi_Host *instance,struct scsi_cmnd *SCpnt,int status) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (SCpnt);struct a2091_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct a2091_scsiregs *regs = hdata->regs;
@@ -143,8 +145,8 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,/* copy from a bounce buffer, if necessary */ if (status && wh->dma_bounce_buffer) {if (wh->dma_dir) -memcpy (SCpnt->SCp.ptr, wh->dma_bounce_buffer, - SCpnt->SCp.this_residual); +memcpy (scsi_pointer->ptr, wh->dma_bounce_buffer, + scsi_pointer->this_residual);kfree (wh->dma_bounce_buffer); wh->dma_bounce_buffer =NULL ; wh->dma_bounce_len =0 ;
@@ -165,6 +167,7 @@ static struct scsi_host_template a2091_scsi_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = CMD_PER_LUN, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct scsi_pointer), };static int a2091_probe (struct zorro_dev *z,const struct zorro_device_id *ent)
drivers/scsi/a3000.c +11 -8
@@ -48,12 +48,13 @@ static irqreturn_t a3000_intr(int irq, void *data)static int dma_setup (struct scsi_cmnd *cmd,int dir_in) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd);struct Scsi_Host *instance = cmd->device->host;struct a3000_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct a3000_scsiregs *regs = hdata->regs;unsigned short cntr =CNTR_PDMD |CNTR_INTEN ; -unsigned long addr =virt_to_bus (cmd->SCp.ptr); +unsigned long addr =virt_to_bus (scsi_pointer->ptr);/* * if the physical address has the wrong alignment, or if
@@ -62,7 +63,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)* buffer */ if (addr &A3000_XFER_MASK ) { - wh->dma_bounce_len = (cmd->SCp.this_residual +511 ) & ~0x1ff ; + wh->dma_bounce_len = (scsi_pointer->this_residual +511 ) & ~0x1ff ; wh->dma_bounce_buffer =kmalloc (wh->dma_bounce_len,GFP_KERNEL );
@@ -74,8 +75,8 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (!dir_in) {/* copy to bounce buffer for a write */ -memcpy (wh->dma_bounce_buffer, cmd->SCp.ptr, - cmd->SCp.this_residual); +memcpy (wh->dma_bounce_buffer, scsi_pointer->ptr, + scsi_pointer->this_residual); } addr =virt_to_bus (wh->dma_bounce_buffer);
@@ -95,10 +96,10 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (dir_in) {/* invalidate any cache */ -cache_clear (addr, cmd->SCp.this_residual); +cache_clear (addr, scsi_pointer->this_residual); }else {/* push any dirty cache */ -cache_push (addr, cmd->SCp.this_residual); +cache_push (addr, scsi_pointer->this_residual); }/* start DMA */
@@ -113,6 +114,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)static void dma_stop (struct Scsi_Host *instance,struct scsi_cmnd *SCpnt,int status) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (SCpnt);struct a3000_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct a3000_scsiregs *regs = hdata->regs;
@@ -153,8 +155,8 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,if (status && wh->dma_bounce_buffer) {if (SCpnt) {if (wh->dma_dir && SCpnt) -memcpy (SCpnt->SCp.ptr, wh->dma_bounce_buffer, - SCpnt->SCp.this_residual); +memcpy (scsi_pointer->ptr, wh->dma_bounce_buffer, + scsi_pointer->this_residual);kfree (wh->dma_bounce_buffer); wh->dma_bounce_buffer =NULL ; wh->dma_bounce_len =0 ;
@@ -179,6 +181,7 @@ static struct scsi_host_template amiga_a3000_scsi_template = { .this_id = 7, .sg_tablesize = SG_ALL, .cmd_per_lun = CMD_PER_LUN, + .cmd_size = sizeof(struct scsi_pointer), };static int __init amiga_a3000_scsi_probe (struct platform_device *pdev)
drivers/scsi/gvp11.c +11 -8
@@ -53,18 +53,19 @@ void gvp11_setup(char *str, int *ints)static int dma_setup (struct scsi_cmnd *cmd,int dir_in) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd);struct Scsi_Host *instance = cmd->device->host;struct gvp11_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct gvp11_scsiregs *regs = hdata->regs;unsigned short cntr =GVP11_DMAC_INT_ENABLE ; -unsigned long addr =virt_to_bus (cmd->SCp.ptr); +unsigned long addr =virt_to_bus (scsi_pointer->ptr);int bank_mask;static int scsi_alloc_out_of_range =0 ;/* use bounce buffer if the physical address is bad */ if (addr & wh->dma_xfer_mask) { - wh->dma_bounce_len = (cmd->SCp.this_residual +511 ) & ~0x1ff ; + wh->dma_bounce_len = (scsi_pointer->this_residual +511 ) & ~0x1ff ;if (!scsi_alloc_out_of_range) { wh->dma_bounce_buffer =
@@ -113,8 +114,8 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (!dir_in) {/* copy to bounce buffer for a write */ -memcpy (wh->dma_bounce_buffer, cmd->SCp.ptr, - cmd->SCp.this_residual); +memcpy (wh->dma_bounce_buffer, scsi_pointer->ptr, + scsi_pointer->this_residual); } }
@@ -130,10 +131,10 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (dir_in) {/* invalidate any cache */ -cache_clear (addr, cmd->SCp.this_residual); +cache_clear (addr, scsi_pointer->this_residual); }else {/* push any dirty cache */ -cache_push (addr, cmd->SCp.this_residual); +cache_push (addr, scsi_pointer->this_residual); } bank_mask = (~wh->dma_xfer_mask >>18 ) &0x01c0 ;
@@ -150,6 +151,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)static void dma_stop (struct Scsi_Host *instance,struct scsi_cmnd *SCpnt,int status) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (SCpnt);struct gvp11_hostdata *hdata =shost_priv (instance);struct WD33C93_hostdata *wh = &hdata->wh;struct gvp11_scsiregs *regs = hdata->regs;
@@ -162,8 +164,8 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,/* copy from a bounce buffer, if necessary */ if (status && wh->dma_bounce_buffer) {if (wh->dma_dir && SCpnt) -memcpy (SCpnt->SCp.ptr, wh->dma_bounce_buffer, - SCpnt->SCp.this_residual); +memcpy (scsi_pointer->ptr, wh->dma_bounce_buffer, + scsi_pointer->this_residual);if (wh->dma_buffer_pool ==BUF_SCSI_ALLOCED )kfree (wh->dma_bounce_buffer);
@@ -189,6 +191,7 @@ static struct scsi_host_template gvp11_scsi_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = CMD_PER_LUN, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct scsi_pointer), };static int check_wd33c93 (struct gvp11_scsiregs *regs)
drivers/scsi/mvme147.c +6 -4
@@ -33,10 +33,11 @@ static irqreturn_t mvme147_intr(int irq, void *data)static int dma_setup (struct scsi_cmnd *cmd,int dir_in) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd);struct Scsi_Host *instance = cmd->device->host;struct WD33C93_hostdata *hdata =shost_priv (instance);unsigned char flags =0x01 ; -unsigned long addr =virt_to_bus (cmd->SCp.ptr); +unsigned long addr =virt_to_bus (scsi_pointer->ptr);/* setup dma direction */ if (!dir_in)
@@ -47,14 +48,14 @@ static int dma_setup(struct scsi_cmnd *cmd, int dir_in)if (dir_in) {/* invalidate any cache */ -cache_clear (addr, cmd->SCp.this_residual); +cache_clear (addr, scsi_pointer->this_residual); }else {/* push any dirty cache */ -cache_push (addr, cmd->SCp.this_residual); +cache_push (addr, scsi_pointer->this_residual); }/* start DMA */ - m147_pcc->dma_bcr = cmd->SCp.this_residual | (1 <<24 ); + m147_pcc->dma_bcr = scsi_pointer->this_residual | (1 <<24 ); m147_pcc->dma_dadr = addr; m147_pcc->dma_cntrl = flags;
@@ -81,6 +82,7 @@ static struct scsi_host_template mvme147_host_template = { .this_id = 7, .sg_tablesize = SG_ALL, .cmd_per_lun = CMD_PER_LUN, + .cmd_size = sizeof(struct scsi_pointer), };static struct Scsi_Host *mvme147_shost;
drivers/scsi/sgiwd93.c +11 -7
@@ -69,14 +69,15 @@ static irqreturn_t sgiwd93_intr(int irq, void *dev_id)static inline void fill_hpc_entries (struct ip22_hostdata *hd,struct scsi_cmnd *cmd,int din) { -unsigned long len = cmd->SCp.this_residual; -void *addr = cmd->SCp.ptr; +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd); +unsigned long len = scsi_pointer->this_residual; +void *addr = scsi_pointer->ptr;dma_addr_t physaddr;unsigned long count;struct hpc_chunk *hcp; physaddr =dma_map_single (hd->dev, addr, len,DMA_DIR (din)); - cmd->SCp.dma_handle = physaddr; + scsi_pointer->dma_handle = physaddr; hcp = hd->cpu;while (len) {
@@ -106,6 +107,7 @@ void fill_hpc_entries(struct ip22_hostdata *hd, struct scsi_cmnd *cmd, int din)static int dma_setup (struct scsi_cmnd *cmd,int datainp) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (cmd);struct ip22_hostdata *hdata =host_to_hostdata (cmd->device->host);struct hpc3_scsiregs *hregs = (struct hpc3_scsiregs *) cmd->device->host->base;
@@ -120,7 +122,7 @@ static int dma_setup(struct scsi_cmnd *cmd, int datainp)* obvious). IMHO a better fix would be, not to do these dma setups * in the first place. */ -if (cmd->SCp.ptr ==NULL || cmd->SCp.this_residual ==0 ) +if (scsi_pointer->ptr ==NULL || scsi_pointer->this_residual ==0 )return 1 ;fill_hpc_entries (hdata, cmd, datainp);
@@ -140,13 +142,14 @@ static int dma_setup(struct scsi_cmnd *cmd, int datainp)static void dma_stop (struct Scsi_Host *instance,struct scsi_cmnd *SCpnt,int status) { +struct scsi_pointer *scsi_pointer =WD33C93_scsi_pointer (SCpnt);struct ip22_hostdata *hdata =host_to_hostdata (instance);struct hpc3_scsiregs *hregs;if (!SCpnt)return ; -if (SCpnt->SCp.ptr ==NULL || SCpnt->SCp.this_residual ==0 ) +if (scsi_pointer->ptr ==NULL || scsi_pointer->this_residual ==0 )return ; hregs = (struct hpc3_scsiregs *) SCpnt->device->host->base;
@@ -160,8 +163,8 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt,barrier (); } hregs->ctrl =0 ; -dma_unmap_single (hdata->dev, SCpnt->SCp.dma_handle, - SCpnt->SCp.this_residual, +dma_unmap_single (hdata->dev, scsi_pointer->dma_handle, + scsi_pointer->this_residual,DMA_DIR (hdata->wh.dma_dir));pr_debug ("\n" );
@@ -213,6 +216,7 @@ static struct scsi_host_template sgiwd93_template = { .sg_tablesize = SG_ALL, .cmd_per_lun = 8, .dma_boundary = PAGE_SIZE - 1, + .cmd_size = sizeof(struct scsi_pointer), };static int sgiwd93_probe (struct platform_device *pdev)
drivers/scsi/wd33c93.c +63 -56
297 lines not on this page · raw message
drivers/scsi/wd33c93.h +4 -0
@@ -262,6 +262,10 @@ struct WD33C93_hostdata {#endif }; +static inline struct scsi_pointer *WD33C93_scsi_pointer (struct scsi_cmnd *cmd) +{ +return scsi_cmd_priv (cmd); +}/* defines for hostdata->chip */
PATCH v5 48/49 scsi: zalon: Stop using the SCSI pointer
In reply to Bart Van AsscheSet .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.
--- drivers/scsi/ncr53c8xx.c | 22 ++++++++++++---------- drivers/scsi/ncr53c8xx.h | 6 ++++++ drivers/scsi/zalon.c | 1 + 3 files changed, 19 insertions(+), 10 deletions(-)
drivers/scsi/ncr53c8xx.c +12 -10
@@ -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
@@ -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
@@ -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
PATCH v5 49/49 scsi: core: Remove struct scsi_pointer from struct scsi_cmnd
In reply to Bart Van AsscheRemove struct scsi_pointer from struct scsi_cmnd since the previous patches removed all users of that member of struct scsi_cmnd. Additionally, reorder the members of struct scsi_cmnd such that the statement that the field below can be modified by the SCSI LLD is again correct.
--- include/scsi/scsi_cmnd.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
include/scsi/scsi_cmnd.h +7 -7
@@ -123,11 +123,15 @@ struct scsi_cmnd {* command (auto-sense). Length must be * SCSI_SENSE_BUFFERSIZE bytes. */ +int flags;/* Command flags */ +unsigned long state;/* Command completion state */ + +unsigned int extra_len;/* length of alignment and padding */ +/* -* The following fields can be written to by the host specific code. -* Everything else should be left alone. +* The fields below can be modified by the LLD but the fields above +* must not be modified. */ -struct scsi_pointer SCp;/* Scratchpad used by some host adapters */ unsigned char *host_scribble;/* The host adapter is allowed to * call scsi_malloc and get some memory
@@ -138,10 +142,6 @@ struct scsi_cmnd {* to be at an address < 16Mb). */ int result;/* Status code from lower level driver */ -int flags;/* Command flags */ -unsigned long state;/* Command completion state */ - -unsigned int extra_len;/* length of alignment and padding */ };/* Variant of blk_mq_rq_from_pdu() that verifies the type of its argument. */
Martin K. Petersen
AppliedBart,
Quoted 5 lines
The size of struct
scsi_cmndmatters for embedded devices. One of the largest members of that structure is the SCSI pointer. That structure is relevant for SCSI-II drivers but not for modern SCSI drivers. Hence this patch series that removes the SCSI pointer from structscsi_cmndand moves it into driver-private command data.
Applied to 5.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Martin K. Petersen
AppliedQuoted 9 lines · Bart Van Assche
The size of struct
scsi_cmndmatters for embedded devices. One of the largest members of that structure is the SCSI pointer. That structure is relevant for SCSI-II drivers but not for modern SCSI drivers. Hence this patch series that removes the SCSI pointer from structscsi_cmndand moves it into driver-private command data.Please consider this patch series for kernel v5.18.
[...]
Applied to 5.18/scsi-queue, thanks!
[01/49] scsi: ips: Remove an unreachable statement
https://git.kernel.org/mkp/scsi/c/2cf0e0a9da38 [02/49] scsi: ips: Change the return type of ips_release() into 'void' https://git.kernel.org/mkp/scsi/c/be33e2f8d87f [03/49] scsi: ips: Use true and false instead of TRUE and FALSE https://git.kernel.org/mkp/scsi/c/c4858224096f [04/49] scsi: nsp_cs: Change the return type of two functions into 'void' https://git.kernel.org/mkp/scsi/c/72961735f993 [05/49] scsi: nsp_cs: Use true and false instead of TRUE and FALSE https://git.kernel.org/mkp/scsi/c/dfab1e53eef4 [06/49] scsi: Remove drivers/scsi/scsi.h https://git.kernel.org/mkp/scsi/c/53555fb7bceb [07/49] scsi: NCR5380: Remove the NCR5380_CMD_SIZE macro https://git.kernel.org/mkp/scsi/c/cd614642e1a2 [08/49] scsi: NCR5380: Add SCp members to struct NCR5380_cmd https://git.kernel.org/mkp/scsi/c/ff1269cb3d97 [09/49] scsi: arm: Rename arm/scsi.h into arm/arm_scsi.h https://git.kernel.org/mkp/scsi/c/8c97e2f390f5 [10/49] scsi: arm: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/dc4175459099 [11/49] scsi: 53c700: Stop clearing SCSI pointer fields https://git.kernel.org/mkp/scsi/c/d80624a2aec5 [12/49] scsi: aacraid: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/76a3451b64c6 [13/49] scsi: advansys: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/17d4c2e22aae [14/49] scsi: aha1542: Remove a set-but-not-used array https://git.kernel.org/mkp/scsi/c/ea1c947559d9 [15/49] scsi: aha152x: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/3ac6aba37200 [16/49] scsi: bfa: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/34f5b537a900 [17/49] scsi: csio: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/30564db73b58 [18/49] scsi: dc395x: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/9804db13d3c8 [19/49] scsi: esp_scsi: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/dfae39874f45 [20/49] scsi: fdomain: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/211134c47cfd [21/49] scsi: fnic: Fix a tracing statement https://git.kernel.org/mkp/scsi/c/3032ed77a289 [22/49] scsi: fnic: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/924cb24df4fc [23/49] scsi: hptiop: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/5c113eb3bc58 [24/49] scsi: imm: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/6b66f09c46a8 [25/49] scsi: iscsi: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/db22de3eb035 [26/49] scsi: initio: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/09cc102bb4d6 [27/49] scsi: libfc: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/5d21aa3636fa [28/49] scsi: bnx2fc: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/f4b4216f3e52 [29/49] scsi: qedf: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/a33e7925b5e6 [30/49] scsi: mac53c94: Fix a set-but-not-used compiler warning https://git.kernel.org/mkp/scsi/c/8c0156b10e4d [31/49] scsi: mac53c94: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/cb2b62082c3a [32/49] scsi: megaraid: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/fb597392b1f4 [33/49] scsi: megasas: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/96e77a27431a [34/49] scsi: mesh: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/57cbd78e61cf [35/49] scsi: mvsas: Fix a set-but-not-used warning https://git.kernel.org/mkp/scsi/c/8d1537342ff2 [36/49] scsi: mvumi: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/af0d3c13e468 [37/49] scsi: nsp32: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/195771c5da10 [38/49] scsi: nsp_cs: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/ea39700fa90c [39/49] scsi: sym53c500_cs: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/3d75be6de78e [40/49] scsi: ppa: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/4a938517fbeb [41/49] scsi: qla1280: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/504540d00fd5 [42/49] scsi: qla2xxx: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/5597616333ea [43/49] scsi: smartpqi: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/c1ea387d998a [44/49] scsi: sym53c8xx_2: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/4022bfd63d8e [45/49] scsi: usb: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/5dfcf1ad933f [46/49] scsi: wd719x: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/70d1b920af62 [47/49] scsi: wd33c93: Move the SCSI pointer to private command data https://git.kernel.org/mkp/scsi/c/dbb2da557a6a [48/49] scsi: zalon: Stop using the SCSI pointer https://git.kernel.org/mkp/scsi/c/31160bd3e538 [49/49] scsi: core: Remove struct scsi_pointer from struct scsi_cmnd https://git.kernel.org/mkp/scsi/c/8264aee803a2
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering