Skip to content

Revamp SCSI result values

Hannes Reinecke linux-scsi 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest52 patches 37 repliesIn review
  2. v224 patches 12 repliesSuperseded
  3. v1 RFC24 patches 32 repliesSuperseded

Changes to v1 from the cover letter

- Include reviews from Finn Thain et al
- Make sysbot happy

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/52aic7xxx,aic79xxx: remove driver-defined SAM status definitionsdrivers/scsi/aic7xxx/aic79xx_core.c drivers/scsi/aic7xxx/aic79xx_osm.c drivers/scsi/aic7xxx/aic7xxx_core.c +2 more+21 -360 replies
2/52bfa: drop driver-defined SCSI status codesdrivers/scsi/bfa/bfa_fc.h drivers/scsi/bfa/bfa_fcpim.c drivers/scsi/bfa/bfad_im.c+2 -170 replies
3/52wd33c93: use SCSI statusdrivers/scsi/wd33c93.c+3 -30 replies
4/52acornscsi: use standard definesdrivers/scsi/arm/acornscsi.c+2 -120 replies
5/52libata-scsi: use standard SAM status codesdrivers/ata/libata-scsi.c+1 -11 reply
6/52ib_srp: use standard SAM status codesdrivers/infiniband/ulp/srp/ib_srp.c+1 -11 reply
7/523w-xxxx: use standard SAM status codesdrivers/scsi/3w-xxxx.c+2 -22 replies
8/52arcmsr: use standard SAM status codesdrivers/scsi/arcmsr/arcmsr_hba.c+2 -21 reply
9/52dc395x: use standard SAM status codesdrivers/scsi/dc395x.c+5 -131 reply
10/52megaraid: use standard SAM status codesdrivers/scsi/megaraid.c+5 -51 reply
11/52megaraid_mboxi: use standard SAM status codesdrivers/scsi/megaraid/megaraid_mbox.c+6 -61 reply
12/52gdth: use standard SAM status codesdrivers/scsi/gdth.c+6 -61 reply
13/52dpt_i2o: use standard SAM status codesdrivers/scsi/dpt_i2o.c+1 -11 reply
14/52nsp_cs: use standard SAM status codesdrivers/scsi/pcmcia/nsp_cs.c+1 -11 reply
15/52nsp32: fixup status handlingdrivers/scsi/nsp32.c+1 -10 replies
16/52dc395: drop private SAM status code definitionsdrivers/scsi/dc395x.h+0 -161 reply
17/52qla4xxx: use standard SAM status definitionsdrivers/scsi/qla4xxx/ql4_fw.h drivers/scsi/qla4xxx/ql4_isr.c+1 -21 reply
18/52scsi: change status_byte() to return the standard SCSI statusdrivers/scsi/53c700.c drivers/scsi/NCR5380.c drivers/scsi/arm/acornscsi.c +8 more+47 -491 reply
19/52target_core: Fixup target_complete_cmd() usagedrivers/target/target_core_alua.c drivers/target/target_core_iblock.c drivers/target/target_core_pr.c +3 more+21 -210 replies
20/52sg: use SAM status definitions and avoid using masked_statusdrivers/scsi/sg.c+7 -71 reply
21/52initio: use standard SAM status definitionsdrivers/scsi/initio.c drivers/scsi/initio.h+1 -61 reply
22/52scsi: Kill obsolete linux-specific status codesinclude/scsi/scsi_proto.h+0 -191 reply
23/52scsi: introduce set_status_byte()include/scsi/scsi_cmnd.h+5 -00 replies
24/52advansys: kill driver_defined status byte accessorsdrivers/scsi/advansys.c+20 -580 replies
25/52scsi: introduce scsi_build_sense()drivers/scsi/scsi_lib.c include/scsi/scsi_cmnd.h+21 -01 reply
26/52libata-scsi: use scsi_build_sense()drivers/ata/libata-scsi.c+2 -50 replies
27/52zfcp: use scsi_build_sense()drivers/s390/scsi/zfcp_scsi.c+1 -41 reply
28/523w-xxxx: use scsi_build_sense()drivers/scsi/3w-xxxx.c+1 -22 replies
29/52libiscsi: use scsi_build_sense()drivers/scsi/libiscsi.c+1 -41 reply
30/52lpfc: use scsi_build_sense()drivers/scsi/lpfc/lpfc_scsi.c+12 -240 replies
31/52mpt3sas: use scsi_build_sense()drivers/scsi/mpt3sas/mpt3sas_scsih.c+2 -40 replies
32/52mvumi: use scsi_build_sense()drivers/scsi/mvumi.c+1 -41 reply
33/52myrb: use scsi_build_sense()drivers/scsi/myrb.c+14 -470 replies
34/52myrs: use scsi_build_sense()drivers/scsi/myrs.c+2 -71 reply
35/52ps3rom: use scsi_build_sense()drivers/scsi/ps3rom.c+1 -20 replies
36/52qla2xxx: use scsi_build_sense()drivers/scsi/qla2xxx/qla_isr.c+3 -121 reply
37/52scsi_debug: use scsi_build_sense()drivers/scsi/scsi_debug.c+4 -71 reply
38/52smartpqi: use scsi_build_sense()drivers/scsi/smartpqi/smartpqi_init.c+1 -20 replies
39/52stex: use scsi_build_sense()drivers/scsi/stex.c+1 -41 reply
40/52scsi: Kill DRIVER_SENSEdrivers/ata/libata-scsi.c drivers/scsi/NCR5380.c drivers/scsi/aic7xxx/aic79xx_osm.c +32 more+94 -1381 reply
41/52scsi: Kill DRIVER_HARDdrivers/scsi/constants.c include/scsi/scsi.h include/trace/events/scsi.h+2 -40 replies
42/52scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUTdrivers/scsi/scsi_error.c+2 -20 replies
43/52scsi: Kill DRIVER_TIMEOUTdrivers/scsi/constants.c include/scsi/scsi.h include/trace/events/scsi.h+2 -40 replies
44/52scsi: do not use DRIVER_INVALIDdrivers/scsi/constants.c drivers/scsi/hptiop.c drivers/scsi/mvumi.c +3 more+5 -120 replies
45/52st: return error code in st_scsi_execute()drivers/scsi/st.c+2 -20 replies
46/52scsi_ioctl: return error code when blk_rq_map_kern() failsblock/scsi_ioctl.c+4 -30 replies
47/52scsi_dh_alua: do not interpret DRIVER_ERRORdrivers/scsi/device_handler/scsi_dh_alua.c+0 -40 replies
48/523w-9xxx: Kill unreachable code in twa_interrupt()drivers/scsi/3w-9xxx.c+0 -61 reply
49/52xen-scsiback: stop using DRIVER_ERRORdrivers/xen/xen-scsiback.c+6 -60 replies
50/52scsi: stop using DRIVER_ERRORdrivers/scsi/ch.c drivers/scsi/constants.c drivers/scsi/scsi.c +4 more+16 -130 replies
51/52scsi: Kill DRIVER_MEDIA, DRIVER_SOFT, and DRIVER_BUSYdrivers/message/fusion/mptscsih.c drivers/scsi/constants.c include/scsi/scsi.h +1 more+3 -140 replies
52/52scsi: Drop the now obsolete driver_byte definitionsDocumentation/scsi/scsi_mid_low_api.txt block/bsg-lib.c block/bsg.c +12 more+19 -544 replies

Reviews trailers per patch

30 of 52 patches have a Reviewed-by or Acked-by.

PatchBart Van AsscheAdam RadfordDouglas Gilbert
1/52R-b
2/52R-b
3/52R-b
4/52
5/52R-b
6/52R-b
7/52R-b A-b
8/52R-b
9/52R-b
10/52R-b
11/52R-b
12/52R-b
13/52R-b
14/52
15/52
16/52R-b
17/52R-b
18/52R-b
19/52R-b
20/52A-b
21/52R-b
22/52R-b
23/52R-b
24/52
25/52R-b
26/52
27/52R-b
28/52R-b A-b
29/52R-b
30/52
31/52
32/52R-b
33/52
34/52R-b
35/52
36/52R-b
37/52A-b
38/52
39/52R-b
40/52
41/52
42/52
43/52
44/52
45/52
46/52
47/52
48/52A-b
49/52
50/52
51/52
52/52

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v3 thread

Cover letter [PATCHv3 00/52] Revamp SCSI result values

Hi all,

the 'result' field in the SCSI command is defined as having 4 fields. The top byte is declared as a 'driver_byte', where the driver can signal some internal status back to the midlayer. However, there is quite a bit of overlap between the driver_byte and the host_byte, resulting in the driver_byte being used in very few places, and mostly in legacy drivers. Additionally, we have _two_ sets of definitions for the last byte (status byte), which can specified either in SAM terms or in the linux-specific terms, which are shifted right by one from the SAM ones.
Needless to say, the linux-specific ones are declared obsolete for years now.
And to make the confusion complete, both the status byte and the driver byte have a byte for a valid sense code, resulting in quite some confusion which of those bits to check.

This patchset does several things:
- remove the linux-specific status byte definitions, and use the SAM values throughout
- replace the driver-byte values with either SAM ones (for sense code checking) or host-byte definitions
- remove the driver-byte definitions

As usual, comments and reviews are welcome.

Please note, commit 66cf50e65b18 ("scsi: qla2xxx: fixup incorrect usage of host_byte") from 5.4/scsi-fixes is a prerequisite for this patch series.

Changes to v1:
- Include reviews from Finn Thain et al
- Make sysbot happy

Changes to v2:
- Split patches as suggested by Bart
- more sysbot fixes

Hannes Reinecke (52):
aic7xxx,aic79xxx: remove driver-defined SAM status definitions
bfa: drop driver-defined SCSI status codes
wd33c93: use SCSI status
acornscsi: use standard defines
libata-scsi: use standard SAM status codes
ib_srp: use standard SAM status codes
3w-xxxx: use standard SAM status codes
arcmsr: use standard SAM status codes
dc395x: use standard SAM status codes
megaraid: use standard SAM status codes
megaraid_mboxi: use standard SAM status codes
gdth: use standard SAM status codes
dpt_i2o: use standard SAM status codes
nsp_cs: use standard SAM status codes
nsp32: fixup status handling
dc395: drop private SAM status code definitions
qla4xxx: use standard SAM status definitions
scsi: change status_byte() to return the standard SCSI status
target_core: Fixup target_complete_cmd() usage
sg: use SAM status definitions and avoid using masked_status
initio: use standard SAM status definitions
scsi: Kill obsolete linux-specific status codes
scsi: introduce set_status_byte()
advansys: kill driver_defined status byte accessors
scsi: introduce scsi_build_sense()
libata-scsi: use scsi_build_sense()
zfcp: use scsi_build_sense()
3w-xxxx: use scsi_build_sense()
libiscsi: use scsi_build_sense()
lpfc: use scsi_build_sense()
mpt3sas: use scsi_build_sense()
mvumi: use scsi_build_sense()
myrb: use scsi_build_sense()
myrs: use scsi_build_sense()
ps3rom: use scsi_build_sense()
qla2xxx: use scsi_build_sense()
scsi_debug: use scsi_build_sense()
smartpqi: use scsi_build_sense()
stex: use scsi_build_sense()
scsi: Kill DRIVER_SENSE
scsi: Kill DRIVER_HARD
scsi_error: use DID_TIME_OUT instead of DRIVER_TIMEOUT
scsi: Kill DRIVER_TIMEOUT
scsi: do not use DRIVER_INVALID
st: return error code in st_scsi_execute()
scsi_ioctl: return error code when blk_rq_map_kern() fails
scsi_dh_alua: do not interpret DRIVER_ERROR
3w-9xxx: Kill unreachable code in twa_interrupt()
xen-scsiback: stop using DRIVER_ERROR
scsi: stop using DRIVER_ERROR
scsi: Kill DRIVER_MEDIA, DRIVER_SOFT, and DRIVER_BUSY
scsi: Drop the now obsolete driver_byte definitions

 Documentation/scsi/scsi_mid_low_api.txt     |  3 +-
 block/bsg-lib.c                             |  2 +-
 block/bsg.c                                 |  2 +-
 block/scsi_ioctl.c                          |  9 ++--
 drivers/ata/libata-scsi.c                   | 22 +++-----
 drivers/infiniband/ulp/srp/ib_srp.c         |  2 +-
 drivers/message/fusion/mptscsih.c           |  2 +-
 drivers/s390/scsi/zfcp_scsi.c               |  5 +-
 drivers/scsi/3w-9xxx.c                      |  6 ---
 drivers/scsi/3w-xxxx.c                      |  7 ++-
 drivers/scsi/53c700.c                       |  6 +--
 drivers/scsi/NCR5380.c                      |  4 +-
 drivers/scsi/advansys.c                     | 78 ++++++++---------------------
 drivers/scsi/aic7xxx/aic79xx_core.c         |  8 +--
 drivers/scsi/aic7xxx/aic79xx_osm.c          | 35 ++++++-------
 drivers/scsi/aic7xxx/aic7xxx_core.c         |  6 +--
 drivers/scsi/aic7xxx/aic7xxx_osm.c          | 13 +++--
 drivers/scsi/aic7xxx/aiclib.h               | 15 ------
 drivers/scsi/arcmsr/arcmsr_hba.c            |  5 +-
 drivers/scsi/arm/acornscsi.c                | 24 +++------
 drivers/scsi/arm/fas216.c                   | 10 ++--
 drivers/scsi/bfa/bfa_fc.h                   | 15 ------
 drivers/scsi/bfa/bfa_fcpim.c                |  2 +-
 drivers/scsi/bfa/bfad_im.c                  |  2 +-
 drivers/scsi/ch.c                           |  5 +-
 drivers/scsi/constants.c                    | 15 ------
 drivers/scsi/cxlflash/superpipe.c           | 45 ++++++++---------
 drivers/scsi/dc395x.c                       | 26 +++-------
 drivers/scsi/dc395x.h                       | 16 ------
 drivers/scsi/device_handler/scsi_dh_alua.c  |  4 --
 drivers/scsi/dpt_i2o.c                      |  2 +-
 drivers/scsi/esp_scsi.c                     |  3 +-
 drivers/scsi/gdth.c                         | 12 ++---
 drivers/scsi/hptiop.c                       |  2 +-
 drivers/scsi/ibmvscsi/ibmvscsi.c            |  2 +-
 drivers/scsi/initio.c                       |  2 +-
 drivers/scsi/initio.h                       |  5 --
 drivers/scsi/libiscsi.c                     |  5 +-
 drivers/scsi/lpfc/lpfc_scsi.c               | 36 +++++--------
 drivers/scsi/megaraid.c                     | 22 ++++----
 drivers/scsi/megaraid/megaraid_mbox.c       | 22 ++++----
 drivers/scsi/megaraid/megaraid_sas_base.c   |  2 -
 drivers/scsi/megaraid/megaraid_sas_fusion.c |  1 -
 drivers/scsi/mpt3sas/mpt3sas_scsih.c        |  9 ++--
 drivers/scsi/mvumi.c                        | 10 ++--
 drivers/scsi/myrb.c                         | 61 ++++++----------------
 drivers/scsi/myrs.c                         |  9 +---
 drivers/scsi/nsp32.c                        |  2 +-
 drivers/scsi/pcmcia/nsp_cs.c                |  2 +-
 drivers/scsi/ps3rom.c                       |  3 +-
 drivers/scsi/qla2xxx/qla_isr.c              | 15 ++----
 drivers/scsi/qla4xxx/ql4_fw.h               |  1 -
 drivers/scsi/qla4xxx/ql4_isr.c              |  2 +-
 drivers/scsi/scsi.c                         | 11 ++--
 drivers/scsi/scsi_debug.c                   | 15 +++---
 drivers/scsi/scsi_error.c                   | 52 +++++++++----------
 drivers/scsi/scsi_ioctl.c                   |  2 +-
 drivers/scsi/scsi_lib.c                     | 44 +++++++++++-----
 drivers/scsi/scsi_logging.c                 | 10 +---
 drivers/scsi/scsi_scan.c                    |  2 +-
 drivers/scsi/scsi_transport_spi.c           |  2 +-
 drivers/scsi/sd.c                           | 42 ++++++++--------
 drivers/scsi/sd_zbc.c                       |  4 +-
 drivers/scsi/sg.c                           | 28 +++++------
 drivers/scsi/smartpqi/smartpqi_init.c       |  3 +-
 drivers/scsi/sr.c                           |  2 +-
 drivers/scsi/sr_ioctl.c                     |  2 +-
 drivers/scsi/st.c                           |  8 +--
 drivers/scsi/stex.c                         |  9 ++--
 drivers/scsi/sym53c8xx_2/sym_glue.c         |  6 +--
 drivers/scsi/ufs/ufshcd.c                   |  6 +--
 drivers/scsi/virtio_scsi.c                  |  3 +-
 drivers/scsi/vmw_pvscsi.c                   |  6 ---
 drivers/scsi/wd33c93.c                      |  6 +--
 drivers/target/loopback/tcm_loop.c          |  1 -
 drivers/target/target_core_alua.c           |  6 +--
 drivers/target/target_core_iblock.c         |  2 +-
 drivers/target/target_core_pr.c             |  8 +--
 drivers/target/target_core_sbc.c            | 10 ++--
 drivers/target/target_core_spc.c            | 14 +++---
 drivers/target/target_core_xcopy.c          |  2 +-
 drivers/usb/storage/cypress_atacb.c         |  4 +-
 drivers/xen/xen-scsiback.c                  | 14 +++---
 include/scsi/scsi.h                         | 19 +------
 include/scsi/scsi_cmnd.h                    | 12 +++--
 include/scsi/scsi_proto.h                   | 19 -------
 include/scsi/sg.h                           |  5 +-
 include/trace/events/scsi.h                 | 15 +-----
 88 files changed, 363 insertions(+), 655 deletions(-)
Signature · 1 line
2.16.4