Commit 818dbde7 authored Jun 05, 2020 by Linus Torvalds

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

Pull SCSI updates from James Bottomley:
 :This series consists of the usual driver updates (qla2xxx, ufs, zfcp,
  target, scsi_debug, lpfc, qedi, qedf, hisi_sas, mpt3sas) plus a host
  of other minor updates.

  There are no major core changes in this series apart from a
  refactoring in scsi_lib.c"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (207 commits)
  scsi: ufs: ti-j721e-ufs: Fix unwinding of pm_runtime changes
  scsi: cxgb3i: Fix some leaks in init_act_open()
  scsi: ibmvscsi: Make some functions static
  scsi: iscsi: Fix deadlock on recovery path during GFP_IO reclaim
  scsi: ufs: Fix WriteBooster flush during runtime suspend
  scsi: ufs: Fix index of attributes query for WriteBooster feature
  scsi: ufs: Allow WriteBooster on UFS 2.2 devices
  scsi: ufs: Remove unnecessary memset for dev_info
  scsi: ufs-qcom: Fix scheduling while atomic issue
  scsi: mpt3sas: Fix reply queue count in non RDPQ mode
  scsi: lpfc: Fix lpfc_nodelist leak when processing unsolicited event
  scsi: target: tcmu: Fix a use after free in tcmu_check_expired_queue_cmd()
  scsi: vhost: Notify TCM about the maximum sg entries supported per command
  scsi: qla2xxx: Remove return value from qla_nvme_ls()
  scsi: qla2xxx: Remove an unused function
  scsi: iscsi: Register sysfs for iscsi workqueue
  scsi: scsi_debug: Parser tables and code interaction
  scsi: core: Refactor scsi_mq_setup_tags function
  scsi: core: Fix incorrect usage of shost_for_each_device
  scsi: qla2xxx: Fix endianness annotations in source files
  ...

parents 242b2331 22617e21

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -10051,7 +10051,7 @@ F: drivers/hid/hid-lg-g15.c

		LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
		M: Sathya Prakash <sathya.prakash@broadcom.com>
		M: Chaitra P B <chaitra.basappa@broadcom.com>
		M: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
		M: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
		L: MPT-FusionLinux.pdl@broadcom.com
		L: linux-scsi@vger.kernel.org

drivers/message/fusion/mptbase.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -5052,9 +5052,11 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
		* @ioc: Pointer to MPT_ADAPTER structure
		* @persist_opcode: see below
		*
		* MPI_SAS_OP_CLEAR_NOT_PRESENT - Free all persist TargetID mappings for
		* =============================== ======================================
		* MPI_SAS_OP_CLEAR_NOT_PRESENT Free all persist TargetID mappings for
		* devices not currently present.
		* MPI_SAS_OP_CLEAR_ALL_PERSISTENT - Clear al persist TargetID mappings
		* MPI_SAS_OP_CLEAR_ALL_PERSISTENT Clear al persist TargetID mappings
		* =============================== ======================================
		*
		* NOTE: Don't use not this function during interrupt time.
		*

drivers/net/ethernet/qlogic/qed/qed.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -1014,6 +1014,7 @@ int qed_device_num_ports(struct qed_dev *cdev);
		int qed_fill_dev_info(struct qed_dev *cdev,
		struct qed_dev_info *dev_info);
		void qed_link_update(struct qed_hwfn hwfn, struct qed_ptt ptt);
		void qed_bw_update(struct qed_hwfn hwfn, struct qed_ptt ptt);
		u32 qed_unzip_data(struct qed_hwfn *p_hwfn,
		u32 input_len, u8 *input_buf,
		u32 max_size, u8 *unzip_buf);

drivers/net/ethernet/qlogic/qed/qed_main.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -1949,6 +1949,15 @@ void qed_link_update(struct qed_hwfn hwfn, struct qed_ptt ptt)
		op->link_update(cookie, &if_link);
		}

		void qed_bw_update(struct qed_hwfn hwfn, struct qed_ptt ptt)
		{
		void *cookie = hwfn->cdev->ops_cookie;
		struct qed_common_cb_ops *op = hwfn->cdev->protocol_ops.common;

		if (IS_LEAD_HWFN(hwfn) && cookie && op && op->bw_update)
		op->bw_update(cookie);
		}

		static int qed_drain(struct qed_dev *cdev)
		{
		struct qed_hwfn *hwfn;

drivers/s390/scsi/zfcp_aux.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		*
		* Module interface and handling of zfcp data structures.
		*
		* Copyright IBM Corp. 2002, 2018
		* Copyright IBM Corp. 2002, 2020
		*/

		/*
		@@ -415,7 +415,6 @@ struct zfcp_adapter zfcp_adapter_enqueue(struct ccw_device ccw_device)

		adapter->stat_read_buf_num = FSF_STATUS_READS_RECOM;

		if (!zfcp_scsi_adapter_register(adapter))
		return adapter;

		failed: