Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

bd31b9ef · Linus Torvalds <[email protected]> · 2021-07-02 15:14:36 -07:00

Pull SCSI updates from James Bottomley:
 "This series consists of the usual driver updates (ufs, ibmvfc,
  megaraid_sas, lpfc, elx, mpi3mr, qedi, iscsi, storvsc, mpt3sas) with
  elx and mpi3mr being new drivers.

  The major core change is a rework to drop the status byte handling
  macros and the old bit shifted definitions and the rest of the updates
  are minor fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (287 commits)
  scsi: aha1740: Avoid over-read of sense buffer
  scsi: arcmsr: Avoid over-read of sense buffer
  scsi: ips: Avoid over-read of sense buffer
  scsi: ufs: ufs-mediatek: Add missing of_node_put() in ufs_mtk_probe()
  scsi: elx: libefc: Fix IRQ restore in efc_domain_dispatch_frame()
  scsi: elx: libefc: Fix less than zero comparison of a unsigned int
  scsi: elx: efct: Fix pointer error checking in debugfs init
  scsi: elx: efct: Fix is_originator return code type
  scsi: elx: efct: Fix link error for _bad_cmpxchg
  scsi: elx: efct: Eliminate unnecessary boolean check in efct_hw_command_cancel()
  scsi: elx: efct: Do not use id uninitialized in efct_lio_setup_session()
  scsi: elx: efct: Fix error handling in efct_hw_init()
  scsi: elx: efct: Remove redundant initialization of variable lun
  scsi: elx: efct: Fix spelling mistake "Unexected" -> "Unexpected"
  scsi: lpfc: Fix build error in lpfc_scsi.c
  scsi: target: iscsi: Remove redundant continue statement
  scsi: qla4xxx: Remove redundant continue statement
  scsi: ppa: Switch to use module_parport_driver()
  scsi: imm: Switch to use module_parport_driver()
  scsi: mpt3sas: Fix error return value in _scsih_expander_add()
  ...

Commit: bd31b9efbf549d9630bf2f269a3a56dcb29fcac1
Parents: 9f7b640f · 041761f4

Merge commit. Changes below are compared with the first parent: 9f7b640f.

Changes

264 files changed · +50070 −3039

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-driver-ufs	modified	+126	−0	View file
Documentation/scsi/scsi_mid_low_api.rst	modified	+3	−4	View file
MAINTAINERS	modified	+9	−0	View file
block/Kconfig	modified	+9	−0	View file
block/bsg-lib.c	modified	+1	−1	View file
block/bsg.c	modified	+3	−1	View file
block/scsi_ioctl.c	modified	+8	−5	View file
drivers/ata/libata-scsi.c	modified	+14	−16	View file
drivers/infiniband/ulp/iser/iscsi_iser.c	modified	+2	−0	View file
drivers/infiniband/ulp/srp/ib_srp.c	modified	+1	−1	View file
drivers/message/fusion/mptbase.c	modified	+0	−2	View file
drivers/message/fusion/mptsas.c	modified	+63	−56	View file
drivers/nvme/host/fc.c	modified	+71	−1	View file
drivers/s390/scsi/zfcp_scsi.c	modified	+1	−4	View file
drivers/scsi/3w-9xxx.c	modified	+36	−38	View file
drivers/scsi/3w-9xxx.h	modified	+62	−59	View file
drivers/scsi/3w-xxxx.c	modified	+3	−3	View file
drivers/scsi/53c700.c	modified	+3	−3	View file
drivers/scsi/FlashPoint.c	modified	+85	−112	View file
drivers/scsi/Kconfig	modified	+17	−1	View file
drivers/scsi/Makefile	modified	+2	−0	View file
drivers/scsi/NCR5380.c	modified	+5	−5	View file
drivers/scsi/aacraid/aachba.c	modified	+5	−5	View file
drivers/scsi/aacraid/aacraid.h	modified	+1	−1	View file
drivers/scsi/advansys.c	modified	+0	−4	View file
drivers/scsi/aha152x.c	modified	+18	−15	View file
drivers/scsi/aha1740.c	modified	+5	−2	View file
drivers/scsi/aic7xxx/aic79xx_osm.c	modified	+7	−12	View file
drivers/scsi/aic7xxx/aic7xxx_osm.c	modified	+0	−1	View file
drivers/scsi/aic94xx/aic94xx_task.c	modified	+1	−1	View file
drivers/scsi/arcmsr/arcmsr.h	modified	+1	−1	View file
drivers/scsi/arcmsr/arcmsr_hba.c	modified	+28	−15	View file
drivers/scsi/arm/acornscsi.c	modified	+12	−34	View file
drivers/scsi/arm/fas216.c	modified	+9	−8	View file
drivers/scsi/be2iscsi/be_iscsi.c	modified	+13	−12	View file
drivers/scsi/be2iscsi/be_main.c	modified	+3	−4	View file
drivers/scsi/bfa/bfa_defs_svc.h	modified	+1	−1	View file
drivers/scsi/bfa/bfa_svc.c	modified	+1	−7	View file
drivers/scsi/bnx2i/bnx2i_iscsi.c	modified	+19	−13	View file
drivers/scsi/ch.c	modified	+3	−2	View file
drivers/scsi/constants.c	modified	+1	−16	View file
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c	modified	+1	−0	View file
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c	modified	+1	−0	View file
drivers/scsi/cxgbi/libcxgbi.c	modified	+10	−7	View file
drivers/scsi/cxlflash/superpipe.c	modified	+1	−2	View file
drivers/scsi/dc395x.c	modified	+25	−55	View file
drivers/scsi/device_handler/scsi_dh_alua.c	modified	+73	−8	View file
drivers/scsi/elx/Kconfig	added	+9	−0	View file
drivers/scsi/elx/Makefile	added	+18	−0	View file
drivers/scsi/elx/efct/efct_driver.c	added	+786	−0	View file
drivers/scsi/elx/efct/efct_driver.h	added	+109	−0	View file
drivers/scsi/elx/efct/efct_hw.c	added	+3581	−0	View file
drivers/scsi/elx/efct/efct_hw.h	added	+764	−0	View file
drivers/scsi/elx/efct/efct_hw_queues.c	added	+677	−0	View file
drivers/scsi/elx/efct/efct_io.c	added	+191	−0	View file
drivers/scsi/elx/efct/efct_io.h	added	+174	−0	View file
drivers/scsi/elx/efct/efct_lio.c	added	+1698	−0	View file
drivers/scsi/elx/efct/efct_lio.h	added	+189	−0	View file
drivers/scsi/elx/efct/efct_scsi.c	added	+1159	−0	View file
drivers/scsi/elx/efct/efct_scsi.h	added	+203	−0	View file
drivers/scsi/elx/efct/efct_unsol.c	added	+492	−0	View file
drivers/scsi/elx/efct/efct_unsol.h	added	+17	−0	View file
drivers/scsi/elx/efct/efct_xport.c	added	+1111	−0	View file
drivers/scsi/elx/efct/efct_xport.h	added	+186	−0	View file
drivers/scsi/elx/include/efc_common.h	added	+37	−0	View file
drivers/scsi/elx/libefc/efc.h	added	+52	−0	View file
drivers/scsi/elx/libefc/efc_cmds.c	added	+777	−0	View file
drivers/scsi/elx/libefc/efc_cmds.h	added	+35	−0	View file
drivers/scsi/elx/libefc/efc_device.c	added	+1603	−0	View file
drivers/scsi/elx/libefc/efc_device.h	added	+72	−0	View file
drivers/scsi/elx/libefc/efc_domain.c	added	+1088	−0	View file
drivers/scsi/elx/libefc/efc_domain.h	added	+54	−0	View file
drivers/scsi/elx/libefc/efc_els.c	added	+1098	−0	View file
drivers/scsi/elx/libefc/efc_els.h	added	+107	−0	View file
drivers/scsi/elx/libefc/efc_fabric.c	added	+1564	−0	View file
drivers/scsi/elx/libefc/efc_fabric.h	added	+116	−0	View file
drivers/scsi/elx/libefc/efc_node.c	added	+1102	−0	View file
drivers/scsi/elx/libefc/efc_node.h	added	+191	−0	View file
drivers/scsi/elx/libefc/efc_nport.c	added	+777	−0	View file
drivers/scsi/elx/libefc/efc_nport.h	added	+50	−0	View file
drivers/scsi/elx/libefc/efc_sm.c	added	+54	−0	View file
drivers/scsi/elx/libefc/efc_sm.h	added	+197	−0	View file
drivers/scsi/elx/libefc/efclib.c	added	+81	−0	View file
drivers/scsi/elx/libefc/efclib.h	added	+620	−0	View file
drivers/scsi/elx/libefc_sli/sli4.c	added	+5162	−0	View file
drivers/scsi/elx/libefc_sli/sli4.h	added	+4132	−0	View file
drivers/scsi/esas2r/atioctl.h	modified	+1	−1	View file
drivers/scsi/esas2r/esas2r_main.c	modified	+1	−1	View file
drivers/scsi/esp_scsi.c	modified	+1	−3	View file
drivers/scsi/fcoe/fcoe.c	modified	+2	−4	View file
drivers/scsi/fdomain.c	modified	+12	−10	View file
drivers/scsi/hisi_sas/hisi_sas.h	modified	+5	−2	View file
drivers/scsi/hisi_sas/hisi_sas_main.c	modified	+71	−28	View file
drivers/scsi/hisi_sas/hisi_sas_v1_hw.c	modified	+10	−10	View file
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c	modified	+5	−5	View file
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c	modified	+5	−5	View file
drivers/scsi/hosts.c	modified	+9	−4	View file
drivers/scsi/hptiop.c	modified	+1	−1	View file
drivers/scsi/ibmvscsi/ibmvfc.c	modified	+41	−19	View file
drivers/scsi/ibmvscsi/ibmvfc.h	modified	+2	−1	View file
drivers/scsi/ibmvscsi/ibmvscsi.c	modified	+1	−1	View file
drivers/scsi/imm.c	modified	+1	−14	View file
drivers/scsi/ips.c	modified	+6	−4	View file
drivers/scsi/isci/request.c	modified	+5	−5	View file
drivers/scsi/isci/task.c	modified	+3	−3	View file
drivers/scsi/iscsi_tcp.c	modified	+7	−0	View file
drivers/scsi/libfc/fc_encode.h	modified	+250	−6	View file
drivers/scsi/libfc/fc_lport.c	modified	+81	−7	View file
drivers/scsi/libiscsi.c	modified	+145	−89	View file
drivers/scsi/libsas/sas_ata.c	modified	+4	−3	View file
drivers/scsi/libsas/sas_expander.c	modified	+1	−1	View file
drivers/scsi/libsas/sas_task.c	modified	+2	−2	View file
drivers/scsi/lpfc/lpfc.h	modified	+124	−0	View file
drivers/scsi/lpfc/lpfc_attr.c	modified	+59	−0	View file
drivers/scsi/lpfc/lpfc_crtn.h	modified	+12	−0	View file
drivers/scsi/lpfc/lpfc_ct.c	modified	+291	−7	View file
drivers/scsi/lpfc/lpfc_debugfs.c	modified	+4	−7	View file
drivers/scsi/lpfc/lpfc_disc.h	modified	+2	−0	View file
drivers/scsi/lpfc/lpfc_els.c	modified	+640	−25	View file
drivers/scsi/lpfc/lpfc_hbadisc.c	modified	+223	−6	View file
drivers/scsi/lpfc/lpfc_hw.h	modified	+120	−4	View file
drivers/scsi/lpfc/lpfc_hw4.h	modified	+12	−0	View file
drivers/scsi/lpfc/lpfc_init.c	modified	+102	−7	View file
drivers/scsi/lpfc/lpfc_mbox.c	modified	+8	−1	View file
drivers/scsi/lpfc/lpfc_nportdisc.c	modified	+32	−8	View file
drivers/scsi/lpfc/lpfc_nvme.c	modified	+12	−2	View file
drivers/scsi/lpfc/lpfc_scsi.c	modified	+374	−42	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+57	−9	View file
drivers/scsi/lpfc/lpfc_sli.h	modified	+10	−1	View file
drivers/scsi/lpfc/lpfc_version.h	modified	+1	−1	View file
drivers/scsi/megaraid.c	modified	+7	−13	View file
drivers/scsi/megaraid/megaraid_mbox.c	modified	+9	−18	View file
drivers/scsi/megaraid/megaraid_sas.h	modified	+14	−2	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+89	−13	View file
drivers/scsi/megaraid/megaraid_sas_fp.c	modified	+5	−1	View file
drivers/scsi/megaraid/megaraid_sas_fusion.c	modified	+16	−5	View file
drivers/scsi/mesh.c	modified	+5	−4	View file
drivers/scsi/mpi3mr/Kconfig	added	+7	−0	View file
drivers/scsi/mpi3mr/Makefile	added	+4	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h	added	+1880	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_image.h	added	+216	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_init.h	added	+159	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_ioc.h	added	+1004	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_sas.h	added	+33	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_transport.h	added	+463	−0	View file
drivers/scsi/mpi3mr/mpi3mr.h	added	+901	−0	View file
drivers/scsi/mpi3mr/mpi3mr_debug.h	added	+60	−0	View file
drivers/scsi/mpi3mr/mpi3mr_fw.c	added	+3958	−0	View file
drivers/scsi/mpi3mr/mpi3mr_os.c	added	+4045	−0	View file
drivers/scsi/mpt3sas/mpt3sas_base.c	modified	+229	−120	View file
drivers/scsi/mpt3sas/mpt3sas_base.h	modified	+8	−0	View file
drivers/scsi/mpt3sas/mpt3sas_config.c	modified	+14	−4	View file
drivers/scsi/mpt3sas/mpt3sas_scsih.c	modified	+170	−23	View file
drivers/scsi/mvsas/mv_sas.c	modified	+5	−5	View file
drivers/scsi/mvumi.c	modified	+3	−7	View file
drivers/scsi/myrb.c	modified	+15	−49	View file
drivers/scsi/myrs.c	modified	+2	−7	View file
drivers/scsi/nsp32.c	modified	+221	−198	View file
drivers/scsi/pcmcia/nsp_cs.c	modified	+1	−1	View file
drivers/scsi/pm8001/pm8001_hwi.c	modified	+8	−8	View file
drivers/scsi/pm8001/pm8001_sas.c	modified	+4	−6	View file
drivers/scsi/pm8001/pm80xx_hwi.c	modified	+7	−7	View file
drivers/scsi/pmcraid.h	modified	+2	−2	View file
drivers/scsi/ppa.c	modified	+1	−13	View file
drivers/scsi/ps3rom.c	modified	+2	−5	View file
drivers/scsi/qedf/qedf_dbg.c	modified	+1	−2	View file
drivers/scsi/qedf/qedf_io.c	modified	+0	−5	View file
drivers/scsi/qedf/qedf_main.c	modified	+5	−4	View file
drivers/scsi/qedi/qedi.h	modified	+1	−0	View file
drivers/scsi/qedi/qedi_fw.c	modified	+118	−173	View file
drivers/scsi/qedi/qedi_gbl.h	modified	+1	−3	View file
drivers/scsi/qedi/qedi_iscsi.c	modified	+68	−37	View file
drivers/scsi/qedi/qedi_iscsi.h	modified	+3	−2	View file
drivers/scsi/qedi/qedi_main.c	modified	+3	−6	View file
drivers/scsi/qla2xxx/qla_gbl.h	modified	+0	−4	View file
drivers/scsi/qla2xxx/qla_init.c	modified	+0	−2	View file
drivers/scsi/qla2xxx/qla_isr.c	modified	+3	−12	View file
drivers/scsi/qla2xxx/qla_nvme.c	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_target.c	modified	+1	−2	View file
drivers/scsi/qla4xxx/ql4_83xx.c	modified	+1	−2	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+2	−2	View file
drivers/scsi/qlogicfas408.c	modified	+81	−57	View file
drivers/scsi/scsi.c	modified	+3	−8	View file
drivers/scsi/scsi_debug.c	modified	+6	−14	View file
drivers/scsi/scsi_error.c	modified	+28	−42	View file
drivers/scsi/scsi_ioctl.c	modified	+4	−3	View file
drivers/scsi/scsi_lib.c	modified	+67	−52	View file
drivers/scsi/scsi_logging.c	modified	+2	−8	View file
drivers/scsi/scsi_scan.c	modified	+3	−3	View file
drivers/scsi/scsi_transport_fc.c	modified	+1	−1	View file
drivers/scsi/scsi_transport_iscsi.c	modified	+298	−201	View file
drivers/scsi/scsi_transport_sas.c	modified	+4	−5	View file
drivers/scsi/scsi_transport_spi.c	modified	+1	−1	View file
drivers/scsi/sd.c	modified	+33	−30	View file
drivers/scsi/sd_zbc.c	modified	+1	−2	View file
drivers/scsi/sg.c	modified	+6	−3	View file
drivers/scsi/smartpqi/smartpqi_init.c	modified	+1	−2	View file
drivers/scsi/snic/snic_ctl.c	modified	+1	−4	View file
drivers/scsi/sr.c	modified	+2	−2	View file
drivers/scsi/sr_ioctl.c	modified	+5	−1	View file
drivers/scsi/st.c	modified	+4	−4	View file
drivers/scsi/stex.c	modified	+3	−6	View file
drivers/scsi/storvsc_drv.c	modified	+56	−63	View file
drivers/scsi/sym53c8xx_2/sym_glue.c	modified	+2	−4	View file
drivers/scsi/ufs/Kconfig	modified	+1	−0	View file
drivers/scsi/ufs/cdns-pltfrm.c	modified	+2	−0	View file
drivers/scsi/ufs/tc-dwc-g210-pci.c	modified	+2	−0	View file
drivers/scsi/ufs/ufs-debugfs.c	modified	+3	−3	View file
drivers/scsi/ufs/ufs-debugfs.h	modified	+1	−1	View file
drivers/scsi/ufs/ufs-exynos.c	modified	+29	−2	View file
drivers/scsi/ufs/ufs-exynos.h	modified	+0	−26	View file
drivers/scsi/ufs/ufs-hisi.c	modified	+3	−1	View file
drivers/scsi/ufs/ufs-mediatek.c	modified	+39	−6	View file
drivers/scsi/ufs/ufs-qcom.c	modified	+2	−0	View file
drivers/scsi/ufs/ufs-sysfs.c	modified	+253	−16	View file
drivers/scsi/ufs/ufs_bsg.c	modified	+3	−3	View file
drivers/scsi/ufs/ufshcd-pci.c	modified	+5	−31	View file
drivers/scsi/ufs/ufshcd.c	modified	+756	−407	View file
drivers/scsi/ufs/ufshcd.h	modified	+68	−14	View file
drivers/scsi/ufs/ufshci.h	modified	+1	−0	View file
drivers/scsi/virtio_scsi.c	modified	+2	−3	View file
drivers/scsi/vmw_pvscsi.c	modified	+0	−6	View file
drivers/scsi/wd33c93.c	modified	+23	−20	View file
drivers/scsi/xen-scsifront.c	modified	+7	−1	View file
drivers/target/iscsi/cxgbit/cxgbit_ddp.c	modified	+10	−9	View file
drivers/target/iscsi/cxgbit/cxgbit_target.c	modified	+18	−3	View file
drivers/target/iscsi/iscsi_target_erl1.c	modified	+0	−2	View file
drivers/target/iscsi/iscsi_target_nego.c	modified	+1	−10	View file
drivers/target/iscsi/iscsi_target_parameters.c	modified	+1	−3	View file
drivers/target/loopback/tcm_loop.c	modified	+0	−1	View file
drivers/target/sbp/sbp_target.c	modified	+0	−1	View file
drivers/target/target_core_alua.c	modified	+3	−3	View file
drivers/target/target_core_configfs.c	modified	+50	−0	View file
drivers/target/target_core_device.c	modified	+5	−0	View file
drivers/target/target_core_iblock.c	modified	+1	−1	View file
drivers/target/target_core_pr.c	modified	+4	−4	View file
drivers/target/target_core_pr.h	modified	+1	−1	View file
drivers/target/target_core_pscsi.c	modified	+1	−1	View file
drivers/target/target_core_sbc.c	modified	+5	−5	View file
drivers/target/target_core_spc.c	modified	+64	−33	View file
drivers/target/target_core_user.c	modified	+5	−5	View file
drivers/target/target_core_xcopy.c	modified	+3	−16	View file
drivers/usb/storage/cypress_atacb.c	modified	+2	−2	View file
drivers/xen/xen-scsiback.c	modified	+8	−9	View file
include/linux/blk-cgroup.h	modified	+63	−0	View file
include/linux/cgroup.h	modified	+6	−0	View file
include/scsi/fc/fc_ms.h	modified	+50	−9	View file
include/scsi/iscsi_proto.h	modified	+1	−1	View file
include/scsi/libfc.h	modified	+3	−3	View file
include/scsi/libiscsi.h	modified	+14	−6	View file
include/scsi/libsas.h	modified	+9	−3	View file
include/scsi/scsi.h	modified	+49	−110	View file
include/scsi/scsi_bsg_iscsi.h	modified	+1	−1	View file
include/scsi/scsi_cmnd.h	modified	+34	−4	View file
include/scsi/scsi_host.h	modified	+1	−1	View file
include/scsi/scsi_proto.h	modified	+26	−32	View file
include/scsi/scsi_status.h	added	+74	−0	View file
include/scsi/scsi_transport_fc.h	modified	+24	−1	View file
include/scsi/scsi_transport_iscsi.h	modified	+13	−1	View file
include/scsi/sg.h	modified	+34	−1	View file
include/target/target_core_base.h	modified	+1	−0	View file
include/trace/events/scsi.h	modified	+2	−46	View file
include/trace/events/ufs.h	modified	+20	−0	View file
kernel/cgroup/cgroup.c	modified	+25	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-driver-ufs

View file

diff --git a/Documentation/ABI/testing/sysfs-driver-ufs b/Documentation/ABI/testing/sysfs-driver-ufs
index eaac689..b4a5d55 100644
--- a/Documentation/ABI/testing/sysfs-driver-ufs
+++ b/Documentation/ABI/testing/sysfs-driver-ufs
@@ -995,6 +995,132 @@ Description:	This entry shows the target state of an UFS UIC link
 
 		The file is read only.
 
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/monitor_enable
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the status of performance monitor enablement
+		and it can be used to start/stop the monitor. When the monitor
+		is stopped, the performance data collected is also cleared.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/monitor_chunk_size
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file tells the monitor to focus on requests transferring
+		data of specific chunk size (in Bytes). 0 means any chunk size.
+		It can only be changed when monitor is disabled.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_total_sectors
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how many sectors (in 512 Bytes) have been
+		sent from device to host after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_total_busy
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how long (in micro seconds) has been spent
+		sending data from device to host after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_nr_requests
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how many read requests have been sent after
+		monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_req_latency_max
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the maximum latency (in micro seconds) of
+		read requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_req_latency_min
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the minimum latency (in micro seconds) of
+		read requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_req_latency_avg
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the average latency (in micro seconds) of
+		read requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/read_req_latency_sum
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the total latency (in micro seconds) of
+		read requests sent after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_total_sectors
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how many sectors (in 512 Bytes) have been sent
+		from host to device after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_total_busy
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how long (in micro seconds) has been spent
+		sending data from host to device after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_nr_requests
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows how many write requests have been sent after
+		monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_req_latency_max
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the maximum latency (in micro seconds) of write
+		requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_req_latency_min
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the minimum latency (in micro seconds) of write
+		requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_req_latency_avg
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the average latency (in micro seconds) of write
+		requests after monitor gets started.
+
+		The file is read only.
+
+What:		/sys/bus/platform/drivers/ufshcd/*/monitor/write_req_latency_sum
+Date:		January 2021
+Contact:	Can Guo <[email protected]>
+Description:	This file shows the total latency (in micro seconds) of write
+		requests after monitor gets started.
+
+		The file is read only.
+
 What:		/sys/bus/platform/drivers/ufshcd/*/device_descriptor/wb_presv_us_en
 Date:		June 2020
 Contact:	Asutosh Das <[email protected]>

Documentation/scsi/scsi_mid_low_api.rst

View file

diff --git a/Documentation/scsi/scsi_mid_low_api.rst b/Documentation/scsi/scsi_mid_low_api.rst
index 096ffe9..63ddea2 100644
--- a/Documentation/scsi/scsi_mid_low_api.rst
+++ b/Documentation/scsi/scsi_mid_low_api.rst
@@ -1172,10 +1172,9 @@ Members of interest:
                    of 0 implies a successfully completed command (and all
                    data (if any) has been transferred to or from the SCSI
                    target device). 'result' is a 32 bit unsigned integer that
-                   can be viewed as 4 related bytes. The SCSI status value is
-                   in the LSB. See include/scsi/scsi.h status_byte(),
-                   msg_byte(), host_byte() and driver_byte() macros and
-                   related constants.
+                   can be viewed as 2 related bytes. The SCSI status value is
+                   in the LSB. See include/scsi/scsi.h status_byte() and
+                   host_byte() macros and related constants.
     sense_buffer
 		 - an array (maximum size: SCSI_SENSE_BUFFERSIZE bytes) that
                    should be written when the SCSI status (LSB of 'result')

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 4d42bc8..401d066 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6800,6 +6800,15 @@ S:	Supported
 W:	http://www.broadcom.com
 F:	drivers/scsi/lpfc/
 
+EMULEX/BROADCOM EFCT FC/FCOE SCSI TARGET DRIVER
+M:	James Smart <[email protected]>
+M:	Ram Vegesna <[email protected]>
+L:	[email protected]
+L:	[email protected]
+S:	Supported
+W:	http://www.broadcom.com
+F:	drivers/scsi/elx/
+
 ENE CB710 FLASH CARD READER DRIVER
 M:	Michał Mirosław <[email protected]>
 S:	Maintained

block/Kconfig

View file

diff --git a/block/Kconfig b/block/Kconfig
index e71c63e..7885a27 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -151,6 +151,15 @@ config BLK_CGROUP_IOLATENCY
 
 	Note, this is an experimental interface and could be changed someday.
 
+config BLK_CGROUP_FC_APPID
+	bool "Enable support to track FC I/O Traffic across cgroup applications"
+	depends on BLK_CGROUP=y
+	help
+	  Enabling this option enables the support to track FC I/O traffic across
+	  cgroup applications. It enables the Fabric and the storage targets to
+	  identify, monitor, and handle FC traffic based on VM tags by inserting
+	  application specific identification into the FC frame.
+
 config BLK_CGROUP_IOCOST
 	bool "Enable support for cost model based cgroup IO controller"
 	depends on BLK_CGROUP=y

block/bsg-lib.c

View file

diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 330fede..cf18112 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -84,7 +84,7 @@ static int bsg_transport_complete_rq(struct request *rq, struct sg_io_v4 *hdr)
 	 */
 	hdr->device_status = job->result & 0xff;
 	hdr->transport_status = host_byte(job->result);
-	hdr->driver_status = driver_byte(job->result);
+	hdr->driver_status = 0;
 	hdr->info = 0;
 	if (hdr->device_status || hdr->transport_status || hdr->driver_status)
 		hdr->info |= SG_INFO_CHECK;

block/bsg.c

View file

diff --git a/block/bsg.c b/block/bsg.c
index bd10922..33e3f82 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -96,7 +96,9 @@ static int bsg_scsi_complete_rq(struct request *rq, struct sg_io_v4 *hdr)
 	 */
 	hdr->device_status = sreq->result & 0xff;
 	hdr->transport_status = host_byte(sreq->result);
-	hdr->driver_status = driver_byte(sreq->result);
+	hdr->driver_status = 0;
+	if (scsi_status_is_check_condition(sreq->result))
+		hdr->driver_status = DRIVER_SENSE;
 	hdr->info = 0;
 	if (hdr->device_status || hdr->transport_status || hdr->driver_status)
 		hdr->info |= SG_INFO_CHECK;

block/scsi_ioctl.c

View file

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 1b3fe99..fa6df11 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -254,9 +254,11 @@ static int blk_complete_sghdr_rq(struct request *rq, struct sg_io_hdr *hdr,
 	 */
 	hdr->status = req->result & 0xff;
 	hdr->masked_status = status_byte(req->result);
-	hdr->msg_status = msg_byte(req->result);
+	hdr->msg_status = COMMAND_COMPLETE;
 	hdr->host_status = host_byte(req->result);
-	hdr->driver_status = driver_byte(req->result);
+	hdr->driver_status = 0;
+	if (scsi_status_is_check_condition(hdr->status))
+		hdr->driver_status = DRIVER_SENSE;
 	hdr->info = 0;
 	if (hdr->masked_status || hdr->host_status || hdr->driver_status)
 		hdr->info |= SG_INFO_CHECK;
@@ -484,9 +486,10 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
 		break;
 	}
 
-	if (bytes && blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO)) {
-		err = DRIVER_ERROR << 24;
-		goto error;
+	if (bytes) {
+		err = blk_rq_map_kern(q, rq, buffer, bytes, GFP_NOIO);
+		if (err)
+			goto error;
 	}
 
 	blk_execute_rq(disk, rq, 0);

drivers/ata/libata-scsi.c

View file

diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index fd8b6fe..b9588c5 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -196,9 +196,7 @@ void ata_scsi_set_sense(struct ata_device *dev, struct scsi_cmnd *cmd,
 	if (!cmd)
 		return;
 
-	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
-
-	scsi_build_sense_buffer(d_sense, cmd->sense_buffer, sk, asc, ascq);
+	scsi_build_sense(cmd, d_sense, sk, asc, ascq);
 }
 
 void ata_scsi_set_sense_information(struct ata_device *dev,
@@ -409,13 +407,16 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
 	cmd_result = scsi_execute(scsidev, scsi_cmd, data_dir, argbuf, argsize,
 				  sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);
 
-	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
+	if (cmd_result < 0) {
+		rc = cmd_result;
+		goto error;
+	}
+	if (scsi_sense_valid(&sshdr)) {/* sense data available */
 		u8 *desc = sensebuf + 8;
-		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
 
 		/* If we set cc then ATA pass-through will cause a
 		 * check condition even if no error. Filter that. */
-		if (cmd_result & SAM_STAT_CHECK_CONDITION) {
+		if (scsi_status_is_check_condition(cmd_result)) {
 			if (sshdr.sense_key == RECOVERED_ERROR &&
 			    sshdr.asc == 0 && sshdr.ascq == 0x1d)
 				cmd_result &= ~SAM_STAT_CHECK_CONDITION;
@@ -490,9 +491,12 @@ int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg)
 	cmd_result = scsi_execute(scsidev, scsi_cmd, DMA_NONE, NULL, 0,
 				sensebuf, &sshdr, (10*HZ), 5, 0, 0, NULL);
 
-	if (driver_byte(cmd_result) == DRIVER_SENSE) {/* sense data available */
+	if (cmd_result < 0) {
+		rc = cmd_result;
+		goto error;
+	}
+	if (scsi_sense_valid(&sshdr)) {/* sense data available */
 		u8 *desc = sensebuf + 8;
-		cmd_result &= ~(0xFF<<24); /* DRIVER_SENSE is not an error */
 
 		/* If we set cc then ATA pass-through will cause a
 		 * check condition even if no error. Filter that. */
@@ -638,7 +642,7 @@ static struct ata_queued_cmd *ata_scsi_qc_new(struct ata_device *dev,
 		if (cmd->request->rq_flags & RQF_QUIET)
 			qc->flags |= ATA_QCFLAG_QUIET;
 	} else {
-		cmd->result = (DID_OK << 16) | (QUEUE_FULL << 1);
+		cmd->result = (DID_OK << 16) | SAM_STAT_TASK_SET_FULL;
 		cmd->scsi_done(cmd);
 	}
 
@@ -858,8 +862,6 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
 
 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
 
-	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
-
 	/*
 	 * Use ata_to_sense_error() to map status register bits
 	 * onto sense key, asc & ascq.
@@ -874,8 +876,7 @@ static void ata_gen_passthru_sense(struct ata_queued_cmd *qc)
 		 * ATA PASS-THROUGH INFORMATION AVAILABLE
 		 * Always in descriptor format sense.
 		 */
-		scsi_build_sense_buffer(1, cmd->sense_buffer,
-					RECOVERED_ERROR, 0, 0x1D);
+		scsi_build_sense(cmd, 1, RECOVERED_ERROR, 0, 0x1D);
 	}
 
 	if ((cmd->sense_buffer[0] & 0x7f) >= 0x72) {
@@ -957,8 +958,6 @@ static void ata_gen_ata_sense(struct ata_queued_cmd *qc)
 
 	memset(sb, 0, SCSI_SENSE_BUFFERSIZE);
 
-	cmd->result = (DRIVER_SENSE << 24) | SAM_STAT_CHECK_CONDITION;
-
 	if (ata_dev_disabled(dev)) {
 		/* Device disabled after error recovery */
 		/* LOGICAL UNIT NOT READY, HARD RESET REQUIRED */
@@ -4196,7 +4195,6 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)
 
 	case REQUEST_SENSE:
 		ata_scsi_set_sense(dev, cmd, 0, 0, 0);
-		cmd->result = (DRIVER_SENSE << 24);
 		break;
 
 	/* if we reach this, then writeback caching is disabled,

drivers/infiniband/ulp/iser/iscsi_iser.c

View file

diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 8fcaa11..776e46e 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -506,6 +506,7 @@ iscsi_iser_conn_bind(struct iscsi_cls_session *cls_session,
 	iser_conn->iscsi_conn = conn;
 
 out:
+	iscsi_put_endpoint(ep);
 	mutex_unlock(&iser_conn->state_mutex);
 	return error;
 }
@@ -1002,6 +1003,7 @@ static struct iscsi_transport iscsi_iser_transport = {
 	/* connection management */
 	.create_conn            = iscsi_iser_conn_create,
 	.bind_conn              = iscsi_iser_conn_bind,
+	.unbind_conn		= iscsi_conn_unbind,
 	.destroy_conn           = iscsi_conn_teardown,
 	.attr_is_visible	= iser_attr_is_visible,
 	.set_param              = iscsi_iser_set_param,

drivers/infiniband/ulp/srp/ib_srp.c

View file

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 6ba48a0..8d5cf5e 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -2209,7 +2209,7 @@ static int srp_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *scmnd)
 		 * to reduce queue depth temporarily.
 		 */
 		scmnd->result = len == -ENOMEM ?
-			DID_OK << 16 | QUEUE_FULL << 1 : DID_ERROR << 16;
+			DID_OK << 16 | SAM_STAT_TASK_SET_FULL : DID_ERROR << 16;
 		goto err_iu;
 	}
 

drivers/message/fusion/mptbase.c

View file

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index f4f89cf..7f7abc9 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -6993,8 +6993,6 @@ mpt_SoftResetHandler(MPT_ADAPTER *ioc, int sleepFlag)
 	ioc->ioc_reset_in_progress = 1;
 	spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);
 
-	rc = -1;
-
 	for (cb_idx = MPT_MAX_PROTOCOL_DRIVERS-1; cb_idx; cb_idx--) {
 		if (MptResetHandlers[cb_idx])
 			mpt_signal_reset(cb_idx, ioc, MPT_IOC_SETUP_RESET);

drivers/message/fusion/mptsas.c

View file

diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index e0a65a3..85285ba 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -86,7 +86,7 @@ MODULE_PARM_DESC(mpt_pt_clear,
 		" Clear persistency table: enable=1  "
 		"(default=MPTSCSIH_PT_CLEAR=0)");
 
-/* scsi-mid layer global parmeter is max_report_luns, which is 511 */
+/* scsi-mid layer global parameter is max_report_luns, which is 511 */
 #define MPTSAS_MAX_LUN (16895)
 static int max_lun = MPTSAS_MAX_LUN;
 module_param(max_lun, int, 0);
@@ -420,12 +420,14 @@ mptsas_find_portinfo_by_handle(MPT_ADAPTER *ioc, u16 handle)
 }
 
 /**
- *	mptsas_find_portinfo_by_sas_address -
+ *	mptsas_find_portinfo_by_sas_address - find and return portinfo for
+ *		this sas_address
  *	@ioc: Pointer to MPT_ADAPTER structure
- *	@handle:
+ *	@sas_address: expander sas address
  *
- *	This function should be called with the sas_topology_mutex already held
+ *	This function should be called with the sas_topology_mutex already held.
  *
+ *	Return: %NULL if not found.
  **/
 static struct mptsas_portinfo *
 mptsas_find_portinfo_by_sas_address(MPT_ADAPTER *ioc, u64 sas_address)
@@ -567,12 +569,14 @@ starget)
 }
 
 /**
- *	mptsas_add_device_component -
+ *	mptsas_add_device_component - adds a new device component to our lists
  *	@ioc: Pointer to MPT_ADAPTER structure
- *	@channel: fw mapped id's
- *	@id:
- *	@sas_address:
- *	@device_info:
+ *	@channel: channel number
+ *	@id: Logical Target ID for reset (if appropriate)
+ *	@sas_address: expander sas address
+ *	@device_info: specific bits (flags) for devices
+ *	@slot: enclosure slot ID
+ *	@enclosure_logical_id: enclosure WWN
  *
  **/
 static void
@@ -634,10 +638,10 @@ mptsas_add_device_component(MPT_ADAPTER *ioc, u8 channel, u8 id,
 }
 
 /**
- *	mptsas_add_device_component_by_fw -
+ *	mptsas_add_device_component_by_fw - adds a new device component by FW ID
  *	@ioc: Pointer to MPT_ADAPTER structure
- *	@channel:  fw mapped id's
- *	@id:
+ *	@channel: channel number
+ *	@id: Logical Target ID
  *
  **/
 static void
@@ -668,8 +672,7 @@ mptsas_add_device_component_by_fw(MPT_ADAPTER *ioc, u8 channel, u8 id)
 /**
  *	mptsas_add_device_component_starget_ir - Handle Integrated RAID, adding each individual device to list
  *	@ioc: Pointer to MPT_ADAPTER structure
- *	@channel: fw mapped id's
- *	@id:
+ *	@starget: SCSI target for this SCSI device
  *
  **/
 static void
@@ -771,9 +774,9 @@ mptsas_add_device_component_starget_ir(MPT_ADAPTER *ioc,
 }
 
 /**
- *	mptsas_add_device_component_starget -
+ *	mptsas_add_device_component_starget - adds a SCSI target device component
  *	@ioc: Pointer to MPT_ADAPTER structure
- *	@starget:
+ *	@starget: SCSI target for this SCSI device
  *
  **/
 static void
@@ -806,7 +809,7 @@ mptsas_add_device_component_starget(MPT_ADAPTER *ioc,
  *	mptsas_del_device_component_by_os - Once a device has been removed, we mark the entry in the list as being cached
  *	@ioc: Pointer to MPT_ADAPTER structure
  *	@channel: os mapped id's
- *	@id:
+ *	@id: Logical Target ID
  *
  **/
 static void
@@ -978,11 +981,12 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
 }
 
 /**
- * csmisas_find_vtarget
+ * mptsas_find_vtarget - find a virtual target device (FC LUN device or
+ *				SCSI target device)
  *
- * @ioc
- * @volume_id
- * @volume_bus
+ * @ioc: Pointer to MPT_ADAPTER structure
+ * @channel: channel number
+ * @id: Logical Target ID
  *
  **/
 static VirtTarget *
@@ -1047,15 +1051,14 @@ mptsas_queue_rescan(MPT_ADAPTER *ioc)
 
 
 /**
- * mptsas_target_reset
- *
- * Issues TARGET_RESET to end device using handshaking method
+ * mptsas_target_reset - Issues TARGET_RESET to end device using
+ *			 handshaking method
  *
- * @ioc
- * @channel
- * @id
+ * @ioc: Pointer to MPT_ADAPTER structure
+ * @channel: channel number
+ * @id: Logical Target ID for reset
  *
- * Returns (1) success
+ * Return: (1) success
  *         (0) failure
  *
  **/
@@ -1119,15 +1122,15 @@ mptsas_block_io_starget(struct scsi_target *starget)
 }
 
 /**
- * mptsas_target_reset_queue
+ * mptsas_target_reset_queue - queue a target reset
  *
- * Receive request for TARGET_RESET after receiving an firmware
+ * @ioc: Pointer to MPT_ADAPTER structure
+ * @sas_event_data: SAS Device Status Change Event data
+ *
+ * Receive request for TARGET_RESET after receiving a firmware
  * event NOT_RESPONDING_EVENT, then put command in link list
  * and queue if task_queue already in use.
  *
- * @ioc
- * @sas_event_data
- *
  **/
 static void
 mptsas_target_reset_queue(MPT_ADAPTER *ioc,
@@ -1207,9 +1210,11 @@ mptsas_schedule_target_reset(void *iocp)
 /**
  *	mptsas_taskmgmt_complete - complete SAS task management function
  *	@ioc: Pointer to MPT_ADAPTER structure
+ *	@mf: MPT message frame
+ *	@mr: SCSI Task Management Reply structure ptr (may be %NULL)
  *
  *	Completion for TARGET_RESET after NOT_RESPONDING_EVENT, enable work
- *	queue to finish off removing device from upper layers. then send next
+ *	queue to finish off removing device from upper layers, then send next
  *	TARGET_RESET in the queue.
  **/
 static int
@@ -1300,10 +1305,10 @@ mptsas_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
 }
 
 /**
- * mptscsih_ioc_reset
+ * mptsas_ioc_reset - issue an IOC reset for this reset phase
  *
- * @ioc
- * @reset_phase
+ * @ioc: Pointer to MPT_ADAPTER structure
+ * @reset_phase: id of phase of reset
  *
  **/
 static int
@@ -1350,7 +1355,7 @@ mptsas_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 
 
 /**
- * enum device_state -
+ * enum device_state - TUR device state
  * @DEVICE_RETRY: need to retry the TUR
  * @DEVICE_ERROR: TUR return error, don't add device
  * @DEVICE_READY: device can be added
@@ -1941,7 +1946,7 @@ mptsas_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *SCpnt)
 }
 
 /**
- *	mptsas_mptsas_eh_timed_out - resets the scsi_cmnd timeout
+ *	mptsas_eh_timed_out - resets the scsi_cmnd timeout
  *		if the device under question is currently in the
  *		device removal delay.
  *	@sc: scsi command that the midlayer is about to time out
@@ -2839,14 +2844,15 @@ struct rep_manu_reply{
 };
 