Commit 60f7c503 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI updates from James Bottomley:
 "This consists of the usual driver updates (ufs, qla2xxx, smartpqi,
  target, zfcp, fnic, mpt3sas, ibmvfc) plus a load of cleanups, a major
  power management rework and a load of assorted minor updates.

  There are a few core updates (formatting fixes being the big one) but
  nothing major this cycle"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (279 commits)
  scsi: mpt3sas: Update driver version to 36.100.00.00
  scsi: mpt3sas: Handle trigger page after firmware update
  scsi: mpt3sas: Add persistent MPI trigger page
  scsi: mpt3sas: Add persistent SCSI sense trigger page
  scsi: mpt3sas: Add persistent Event trigger page
  scsi: mpt3sas: Add persistent Master trigger page
  scsi: mpt3sas: Add persistent trigger pages support
  scsi: mpt3sas: Sync time periodically between driver and firmware
  scsi: qla2xxx: Update version to 10.02.00.104-k
  scsi: qla2xxx: Fix device loss on 4G and older HBAs
  scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry
  scsi: qla2xxx: Fix the call trace for flush workqueue
  scsi: qla2xxx: Fix flash update in 28XX adapters on big endian machines
  scsi: qla2xxx: Handle aborts correctly for port undergoing deletion
  scsi: qla2xxx: Fix N2N and NVMe connect retry failure
  scsi: qla2xxx: Fix FW initialization error on big endian machines
  scsi: qla2xxx: Fix crash during driver load on big endian machines
  scsi: qla2xxx: Fix compilation issue in PPC systems
  scsi: qla2xxx: Don't check for fw_started while posting NVMe command
  scsi: qla2xxx: Tear down session if FW say it is down
  ...
parents 69f637c3 be1b5002

Documentation/ABI/testing/sysfs-class-fc_host

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/fc_host/hostX/statistics/fpin_cn_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of congestion notification

		events recorded by the F_Port, reported using fabric

		performance impact notification (FPIN) event.



What:		/sys/class/fc_host/hostX/statistics/fpin_li_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of link integrity error

		events recorded by the F_Port/Nx_Port, reported using fabric

		performance impact notification (FPIN) event.



What:		/sys/class/fc_host/hostX/statistics/fpin_dn_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of delivery related errors

		recorded by the F_Port/Nx_Port, reported using fabric

		performance impact notification (FPIN) event.

Documentation/ABI/testing/sysfs-class-fc_remote_ports

0 → 100644
+23 −0
Original line number Diff line number Diff line 
What:		/sys/class/fc_remote_ports/rport-X:Y-Z/statistics/fpin_cn_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of congestion notification

		events recorded by the F_Port/Nx_Port, reported using fabric

		performance impact notification (FPIN) event.



What:		/sys/class/fc_remote_ports/rport-X:Y-Z/statistics/fpin_li_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of link integrity error

		events recorded by the F_Port/Nx_Port, reported using fabric

		performance impact notification (FPIN) event.



What:		/sys/class/fc_remote_ports/rport-X:Y-Z/statistics/fpin_dn_yyy

Date:		July 2020

Contact:	Shyam Sundar <ssundar@marvell.com>

Description:

		These files contain the number of delivery related errors

		recorded by the F_Port/Nx_Port, reported using fabric

		performance impact notification (FPIN) event.

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -15780,6 +15780,15 @@ F: Documentation/scsi/st.rst 
F:	drivers/scsi/st.*

F:	drivers/scsi/st_*.h













SCSI TARGET CORE USER DRIVER













M:	Bodo Stroesser <bostroesser@gmail.com>













L:	linux-scsi@vger.kernel.org













L:	target-devel@vger.kernel.org













S:	Supported













F:	Documentation/target/tcmu-design.rst













F:	drivers/target/target_core_user.c













F:	include/uapi/linux/target_core_user.h



























SCSI TARGET SUBSYSTEM















M:	"Martin K. Petersen" <martin.petersen@oracle.com>















L:	linux-scsi@vger.kernel.org

































block/blk-mq.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -1404,7 +1404,7 @@ bool blk_mq_dispatch_rq_list(struct blk_mq_hw_ctx *hctx, struct list_head *list,













			break;















		default:















			errors++;













			blk_mq_end_request(rq, BLK_STS_IOERR);













			blk_mq_end_request(rq, ret);















		}















	} while (!list_empty(list));















out:

































drivers/infiniband/ulp/isert/ib_isert.c



+3
−3






























Original line number
Diff line number
Diff line








@@ -1528,12 +1528,12 @@ isert_check_pi_status(struct se_cmd *se_cmd, struct ib_mr *sig_mr)













		}















		sec_offset_err = mr_status.sig_err.sig_err_offset;















		do_div(sec_offset_err, block_size);













		se_cmd->bad_sector = sec_offset_err + se_cmd->t_task_lba;













		se_cmd->sense_info = sec_offset_err + se_cmd->t_task_lba;































		isert_err("PI error found type %d at sector 0x%llx "















			  "expected 0x%x vs actual 0x%x\n",















			  mr_status.sig_err.err_type,













			  (unsigned long long)se_cmd->bad_sector,













			  (unsigned long long)se_cmd->sense_info,















			  mr_status.sig_err.expected,















			  mr_status.sig_err.actual);















		ret = 1;










@@ -2471,7 +2471,7 @@ isert_wait4cmds(struct iscsi_conn *conn)













	isert_info("iscsi_conn %p\n", conn);































	if (conn->sess) {













		target_sess_cmd_list_set_waiting(conn->sess->se_sess);













		target_stop_session(conn->sess->se_sess);















		target_wait_for_sess_cmds(conn->sess->se_sess);















	}















}









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE