Commit a85d6ff9 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:
 "Usual driver updates (ufs, lpfc, fnic, target, mpi3mr).

  The substantive core changes are adding a 'serial' sysfs attribute and
  getting sd to support > PAGE_SIZE sectors"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (98 commits)
  scsi: target: Don't validate ignored fields in PROUT PREEMPT
  scsi: qla2xxx: Use nr_cpu_ids instead of NR_CPUS for qp_cpu_map allocation
  scsi: ufs: core: Disable timestamp for Kioxia THGJFJT0E25BAIP
  scsi: mpi3mr: Fix typo
  scsi: sd: fix missing put_disk() when device_add(&disk_dev) fails
  scsi: libsas: Delete unused to_dom_device() and to_dev_attr()
  scsi: storvsc: Handle PERSISTENT_RESERVE_IN truncation for Hyper-V vFC
  scsi: iscsi_tcp: Remove unneeded selections of CRYPTO and CRYPTO_MD5
  scsi: lpfc: Update lpfc version to 15.0.0.0
  scsi: lpfc: Add PCI ID support for LPe42100 series adapters
  scsi: lpfc: Introduce 128G link speed selection and support
  scsi: lpfc: Check ASIC_ID register to aid diagnostics during failed fw updates
  scsi: lpfc: Update construction of SGL when XPSGL is enabled
  scsi: lpfc: Remove deprecated PBDE feature
  scsi: lpfc: Add REG_VFI mailbox cmd error handling
  scsi: lpfc: Log MCQE contents for mbox commands with no context
  scsi: lpfc: Select mailbox rq_create cmd version based on SLI4 if_type
  scsi: lpfc: Break out of IRQ affinity assignment when mask reaches nr_cpu_ids
  scsi: ufs: core: Make the header files self-contained
  scsi: ufs: core: Remove an include directive from ufshcd-crypto.h
  ...
parents 6e286940 070ec6f6

Documentation/ABI/testing/sysfs-driver-ufs

+23 −0
Original line number Diff line number Diff line
@@ -1768,3 +1768,26 @@ Description: 
		====================   ===========================



		The attribute is read only.



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

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

Date:		March 2026

Contact:	Can Guo <can.guo@oss.qualcomm.com>

Description:

		This attribute reports and clears pending DME (Device Management

		Entity) Quality of Service (QoS) notifications. This attribute

		is a bitfield with the following bit assignments:



		Bit	Description

		===	======================================

		0	DME QoS Monitor has been reset by host

		1	QoS from TX is detected

		2	QoS from RX is detected

		3	QoS from PA_INIT is detected



		Reading this attribute returns the pending DME QoS notification

		bits. Writing '0' to this attribute clears pending DME QoS

		notification bits. Writing any non-zero value is invalid and

		will be rejected.



		The attribute is read/write.

Documentation/devicetree/bindings/ufs/qcom,sc7180-ufshc.yaml

+23 −15
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ select: 
    compatible:

      contains:

        enum:

          - qcom,milos-ufshc

          - qcom,msm8998-ufshc

          - qcom,qcs8300-ufshc

          - qcom,sa8775p-ufshc
@@ -31,8 +32,15 @@ select: 


properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - qcom,x1e80100-ufshc

          - const: qcom,sm8550-ufshc

          - const: qcom,ufshc

      - items:

          - enum:

              - qcom,milos-ufshc

              - qcom,msm8998-ufshc

              - qcom,qcs8300-ufshc

              - qcom,sa8775p-ufshc

Documentation/devicetree/bindings/ufs/qcom,sm8650-ufshc.yaml

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ select: 
    compatible:

      contains:

        enum:

          - qcom,eliza-ufshc

          - qcom,kaanapali-ufshc

          - qcom,sm8650-ufshc

          - qcom,sm8750-ufshc
@@ -25,6 +26,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,eliza-ufshc

          - qcom,kaanapali-ufshc

          - qcom,sm8650-ufshc

          - qcom,sm8750-ufshc
@@ -66,6 +68,18 @@ required: 


allOf:

  - $ref: qcom,ufs-common.yaml

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,eliza-ufshc

    then:

      properties:

        reg:

          minItems: 2

        reg-names:

          minItems: 2



unevaluatedProperties: false

Documentation/devicetree/bindings/ufs/rockchip,rk3576-ufshc.yaml

+4 −3
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ properties: 
    maxItems: 1



  resets:

    maxItems: 4

    maxItems: 5



  reset-names:

    items:
@@ -49,6 +49,7 @@ properties: 
      - const: sys

      - const: ufs

      - const: grf

      - const: mphy



  reset-gpios:

    maxItems: 1
@@ -98,8 +99,8 @@ examples: 
            interrupts = <GIC_SPI 361 IRQ_TYPE_LEVEL_HIGH>;

            power-domains = <&power RK3576_PD_USB>;

            resets = <&cru SRST_A_UFS_BIU>, <&cru SRST_A_UFS_SYS>, <&cru SRST_A_UFS>,

                     <&cru SRST_P_UFS_GRF>;

            reset-names = "biu", "sys", "ufs", "grf";

                     <&cru SRST_P_UFS_GRF>, <&cru SRST_MPHY_INIT>;

            reset-names = "biu", "sys", "ufs", "grf", "mphy";

            reset-gpios = <&gpio4 RK_PD0 GPIO_ACTIVE_LOW>;

        };

    };

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −0
Original line number Diff line number Diff line
@@ -3925,6 +3925,7 @@ static const struct target_core_fabric_ops srpt_template = { 
	.tfc_wwn_attrs			= srpt_wwn_attrs,

	.tfc_tpg_attrib_attrs		= srpt_tpg_attrib_attrs,



	.default_compl_type		= TARGET_QUEUE_COMPL,

	.default_submit_type		= TARGET_DIRECT_SUBMIT,

	.direct_submit_supp		= 1,

};