Commit 22d29f11 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:
 "Updates to the usual drivers (ufs, mpi3mr, mpt3sas, lpfc, fnic,
  hisi_sas, arcmsr, ) plus the usual assorted minor fixes and updates.

  This time around there's only a single line update to the core, so
  nothing major and barely anything minor"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (135 commits)
  scsi: ufs: core: Simplify ufshcd_auto_hibern8_update()
  scsi: ufs: core: Rename ufshcd_auto_hibern8_enable() and make it static
  scsi: ufs: qcom: Fix ESI vector mask
  scsi: ufs: host: Fix kernel-doc warning
  scsi: hisi_sas: Correct the number of global debugfs registers
  scsi: hisi_sas: Rollback some operations if FLR failed
  scsi: hisi_sas: Check before using pointer variables
  scsi: hisi_sas: Replace with standard error code return value
  scsi: hisi_sas: Set .phy_attached before notifing phyup event HISI_PHYE_PHY_UP_PM
  scsi: ufs: core: Add sysfs node for UFS RTC update
  scsi: ufs: core: Add UFS RTC support
  scsi: ufs: core: Add ufshcd_is_ufs_dev_busy()
  scsi: ufs: qcom: Remove unused definitions
  scsi: ufs: qcom: Use ufshcd_rmwl() where applicable
  scsi: ufs: qcom: Remove support for host controllers older than v2.0
  scsi: ufs: qcom: Simplify ufs_qcom_{assert/deassert}_reset
  scsi: ufs: qcom: Initialize cycles_in_1us variable in ufs_qcom_set_core_clk_ctrl()
  scsi: ufs: qcom: Sort includes alphabetically
  scsi: ufs: qcom: Remove unused ufs_qcom_hosts struct array
  scsi: ufs: qcom: Use dev_err_probe() to simplify error handling of devm_gpiod_get_optional()
  ...
parents 4c72e2b8 45a2c87f

Documentation/ABI/testing/sysfs-driver-ufs

+56 −0
Original line number Diff line number Diff line
@@ -1223,6 +1223,55 @@ Description: This file shows the total latency (in micro seconds) of write 


		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/lane

What:		/sys/bus/platform/devices/*.ufs/power_info/lane

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows how many lanes are enabled on the UFS link,

		i.e., an output 2 means UFS link is operating with 2 lanes.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/mode

What:		/sys/bus/platform/devices/*.ufs/power_info/mode

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows the PA power mode of UFS.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/rate

What:		/sys/bus/platform/devices/*.ufs/power_info/rate

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows the speed rate of UFS link.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/gear

What:		/sys/bus/platform/devices/*.ufs/power_info/gear

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows the gear of UFS link.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/dev_pm

What:		/sys/bus/platform/devices/*.ufs/power_info/dev_pm

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows the UFS device power mode.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/power_info/link_state

What:		/sys/bus/platform/devices/*.ufs/power_info/link_state

Date:		September 2023

Contact:	Can Guo <quic_cang@quicinc.com>

Description:	This file shows the state of UFS link.



		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/device_descriptor/wb_presv_us_en

What:		/sys/bus/platform/devices/*.ufs/device_descriptor/wb_presv_us_en

Date:		June 2020
@@ -1474,3 +1523,10 @@ Description: Indicates status of Write Booster. 


		The file is read only.



What:		/sys/bus/platform/drivers/ufshcd/*/rtc_update_ms

What:		/sys/bus/platform/devices/*.ufs/rtc_update_ms

Date:		November 2023

Contact:	Bean Huo <beanhuo@micron.com>

Description:

		rtc_update_ms indicates how often the host should synchronize or update the

		UFS RTC. If set to 0, this will disable UFS RTC periodic update.

Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ properties: 
          - qcom,msm8996-ufshc

          - qcom,msm8998-ufshc

          - qcom,sa8775p-ufshc

          - qcom,sc7280-ufshc

          - qcom,sc8280xp-ufshc

          - qcom,sdm845-ufshc

          - qcom,sm6115-ufshc
@@ -118,6 +119,7 @@ allOf: 
            enum:

              - qcom,msm8998-ufshc

              - qcom,sa8775p-ufshc

              - qcom,sc7280-ufshc

              - qcom,sc8280xp-ufshc

              - qcom,sm8250-ufshc

              - qcom,sm8350-ufshc

Documentation/devicetree/bindings/ufs/ufs-common.yaml

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ properties: 
    description:

      Specifies max. load that can be drawn from VCCQ2 supply.



  msi-parent: true



dependencies:

  freq-table-hz: [ clocks ]

  operating-points-v2: [ clocks, clock-names ]

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -22320,7 +22320,8 @@ S: Maintained 
F:	drivers/ufs/host/ufs-exynos*









UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS









M:	Stanley Chu <stanley.chu@mediatek.com>









M:	Peter Wang <peter.wang@mediatek.com>









R:	Stanley Jhu <chu.stanley@gmail.com>









L:	linux-scsi@vger.kernel.org









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









S:	Maintained

























drivers/s390/scsi/zfcp_fc.c



+13
−2






























Original line number
Diff line number
Diff line







@@ -900,8 +900,19 @@ static void zfcp_fc_rspn(struct zfcp_adapter *adapter,







	zfcp_fc_ct_ns_init(&rspn_req->ct_hdr, FC_NS_RSPN_ID,









			   FC_SYMBOLIC_NAME_SIZE);









	hton24(rspn_req->rspn.fr_fid.fp_fid, fc_host_port_id(shost));









	len = strlcpy(rspn_req->rspn.fr_name, fc_host_symbolic_name(shost),









		      FC_SYMBOLIC_NAME_SIZE);



















	BUILD_BUG_ON(sizeof(rspn_req->name) !=









			sizeof(fc_host_symbolic_name(shost)));









	BUILD_BUG_ON(sizeof(rspn_req->name) !=









			type_max(typeof(rspn_req->rspn.fr_name_len)) + 1);









	len = strscpy(rspn_req->name, fc_host_symbolic_name(shost),









		      sizeof(rspn_req->name));









	/*









	 * It should be impossible for this to truncate (see BUILD_BUG_ON()









	 * above), but be robust anyway.









	 */









	if (WARN_ON(len < 0))









		len = sizeof(rspn_req->name) - 1;









	rspn_req->rspn.fr_name_len = len;



















	sg_init_one(&fc_req->sg_req, rspn_req, sizeof(*rspn_req));