Commit bd31b9ef 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 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()
  ...
parents 9f7b640f 041761f4

Documentation/ABI/testing/sysfs-driver-ufs

+126 −0
Original line number Diff line number Diff line
@@ -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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <cang@codeaurora.org>

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 <asutoshd@codeaurora.org>

Documentation/scsi/scsi_mid_low_api.rst

+3 −4
Original line number Diff line number Diff line
@@ -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

+9 −0
Original line number Diff line number Diff line
@@ -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 <james.smart@broadcom.com>









M:	Ram Vegesna <ram.vegesna@broadcom.com>









L:	linux-scsi@vger.kernel.org









L:	target-devel@vger.kernel.org









S:	Supported









W:	http://www.broadcom.com









F:	drivers/scsi/elx/

















ENE CB710 FLASH CARD READER DRIVER









M:	Michał Mirosław <mirq-linux@rere.qmqm.pl>









S:	Maintained
































block/Kconfig



+9
−0






























Original line number
Diff line number
Diff line







@@ -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



+1
−1






























Original line number
Diff line number
Diff line







@@ -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;