Commit 746fc76b 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, qla2xx, target, lpfc, smartpqi,
  mpi3mr).

  The main driver change that might cause issues on down the road is the
  conversion of some of our oldest surviving drivers to the DMA API
  (should only affect m68k).

  The only major core change is the rework of async resume; the rest are
  either completely trivial or for updating deprecated APIs"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (195 commits)
  scsi: target: Remove XDWRITEREAD emulated support
  scsi: megaraid: Remove the static variable initialisation
  scsi: ch: Do not initialise statics to 0
  scsi: ufs: core: Fix spelling mistake "Cannnot" -> "Cannot"
  scsi: target: iscsi: Do not require target authentication
  scsi: target: iscsi: Allow AuthMethod=None
  scsi: target: iscsi: Support base64 in CHAP
  scsi: target: iscsi: Add support for extended CDB AHS
  scsi: ufs: dt-bindings: Add SC8280XP binding
  scsi: target: iscsi: Fix clang -Wformat warnings
  scsi: ufs: core: Read device property for ref clock
  scsi: libsas: Resume SAS host for phy reset or enable via sysfs
  scsi: hisi_sas: Modify v3 HW SATA completion error processing
  scsi: hisi_sas: Relocate DMA unmap of SMP task
  scsi: hisi_sas: Remove unnecessary variable to hold DMA map elements
  scsi: hisi_sas: Call hisi_sas_slave_configure() from slave_configure_v3_hw()
  scsi: mpi3mr: Delete a stray tab
  scsi: mpi3mr: Unlock on error path
  scsi: mpi3mr: Reduce VD queue depth on detecting throttling
  scsi: mpi3mr: Resource Based Metering
  ...
parents 328141e5 8fcdc238

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

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

          - qcom,msm8996-ufshc

          - qcom,msm8998-ufshc

          - qcom,sc8280xp-ufshc

          - qcom,sdm845-ufshc

          - qcom,sm6350-ufshc

          - qcom,sm8150-ufshc
@@ -98,6 +99,7 @@ allOf: 
          contains:

            enum:

              - qcom,msm8998-ufshc

              - qcom,sc8280xp-ufshc

              - qcom,sm8250-ufshc

              - qcom,sm8350-ufshc

              - qcom,sm8450-ufshc

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

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/ufs/renesas,ufs.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Renesas R-Car UFS Host Controller



maintainers:

  - Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>



allOf:

  - $ref: ufs-common.yaml



properties:

  compatible:

    const: renesas,r8a779f0-ufs



  reg:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: fck

      - const: ref_clk



  power-domains:

    maxItems: 1



  resets:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - power-domains

  - resets



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/clock/r8a779f0-cpg-mssr.h>

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/power/r8a779f0-sysc.h>



    ufs: ufs@e686000 {

            compatible = "renesas,r8a779f0-ufs";

            reg = <0xe6860000 0x100>;

            interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>;

            clocks = <&cpg CPG_MOD 1514>, <&ufs30_clk>;

            clock-names = "fck", "ref_clk";

            freq-table-hz = <200000000 200000000>, <38400000 38400000>;

            power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;

            resets = <&cpg 1514>;

    };

Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
      - samsung,exynos7-ufs

      - samsung,exynosautov9-ufs

      - samsung,exynosautov9-ufs-vh

      - tesla,fsd-ufs



  reg:

    items:

Documentation/scsi/ufs.rst

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ Universal Flash Storage 
     3.2 UTP Transfer requests

     3.3 UFS error handling

     3.4 SCSI Error handling

   4. BSG Support

   5. UFS Reference Clock Frequency configuration





1. Overview
@@ -193,3 +195,16 @@ UFS specifications can be found at: 


- UFS - http://www.jedec.org/sites/default/files/docs/JESD220.pdf

- UFSHCI - http://www.jedec.org/sites/default/files/docs/JESD223.pdf



5. UFS Reference Clock Frequency configuration

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



Devicetree can define a clock named "ref_clk" under the UFS controller node

to specify the intended reference clock frequency for the UFS storage

parts. ACPI-based system can specify the frequency using ACPI

Device-Specific Data property named "ref-clk-freq". In both ways the value

is interpreted as frequency in Hz and must match one of the values given in

the UFS specification. UFS subsystem will attempt to read the value when

executing common controller initialization. If the value is available, UFS

subsytem will ensure the bRefClkFreq attribute of the UFS storage device is

set accordingly and will modify it if there is a mismatch.

Documentation/userspace-api/ioctl/ioctl-number.rst

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ Code Seq# Include File Comments 
'C'   01-2F  linux/capi.h                                            conflict!

'C'   F0-FF  drivers/net/wan/cosa.h                                  conflict!

'D'   all    arch/s390/include/asm/dasd.h

'D'   40-5F  drivers/scsi/dpt/dtpi_ioctl.h

'D'   40-5F  drivers/scsi/dpt/dtpi_ioctl.h                           Dead since 2022

'D'   05     drivers/scsi/pmcraid.h

'E'   all    linux/input.h                                           conflict!

'E'   00-0F  xen/evtchn.h                                            conflict!