Commit ef2cc88e 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 is mostly update of the usual drivers: aacraid, ufs, zfcp,
  NCR5380, lpfc, qla2xxx, smartpqi, hisi_sas, target, mpt3sas, pm80xx
  plus a whole load of minor updates and fixes.

  The major core changes are Al Viro's reworking of sg's handling of
  copy to/from user, Ming Lei's removal of the host busy counter to
  avoid contention in the multiqueue case and Damien Le Moal's fixing of
  residual tracking across error handling"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (251 commits)
  scsi: bnx2fc: timeout calculation invalid for bnx2fc_eh_abort()
  scsi: target: core: Fix a pr_debug() argument
  scsi: iscsi: Don't send data to unbound connection
  scsi: target: iscsi: Wait for all commands to finish before freeing a session
  scsi: target: core: Release SPC-2 reservations when closing a session
  scsi: target: core: Document target_cmd_size_check()
  scsi: bnx2i: fix potential use after free
  Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails"
  scsi: NCR5380: Add disconnect_mask module parameter
  scsi: NCR5380: Unconditionally clear ICR after do_abort()
  scsi: NCR5380: Call scsi_set_resid() on command completion
  scsi: scsi_debug: num_tgts must be >= 0
  scsi: lpfc: use hdwq assigned cpu for allocation
  scsi: arcmsr: fix indentation issues
  scsi: qla4xxx: fix double free bug
  scsi: pm80xx: Modified the logic to collect fatal dump
  scsi: pm80xx: Tie the interrupt name to the module instance
  scsi: pm80xx: Controller fatal error through sysfs
  scsi: pm80xx: Do not request 12G sas speeds
  scsi: pm80xx: Cleanup command when a reset times out
  ...
parents 937d6eef 65309ef6

Documentation/devicetree/bindings/ufs/ti,j721e-ufs.yaml

0 → 100644
+68 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/ufs/ti,j721e-ufs.yaml#

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



title: TI J721e UFS Host Controller Glue Driver



maintainers:

  - Vignesh Raghavendra <vigneshr@ti.com>



properties:

  compatible:

    items:

      - const: ti,j721e-ufs



  reg:

    maxItems: 1

    description: address of TI UFS glue registers



  clocks:

    maxItems: 1

    description: phandle to the M-PHY clock



  power-domains:

    maxItems: 1



required:

  - compatible

  - reg

  - clocks

  - power-domains



patternProperties:

  "^ufs@[0-9a-f]+$":

    type: object

    description: |

      Cadence UFS controller node must be the child node. Refer

      Documentation/devicetree/bindings/ufs/cdns,ufshc.txt for binding

      documentation of child node



examples:

  - |

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

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



    ufs_wrapper: ufs-wrapper@4e80000 {

       compatible = "ti,j721e-ufs";

       reg = <0x0 0x4e80000 0x0 0x100>;

       power-domains = <&k3_pds 277>;

       clocks = <&k3_clks 277 1>;

       assigned-clocks = <&k3_clks 277 1>;

       assigned-clock-parents = <&k3_clks 277 4>;

       #address-cells = <2>;

       #size-cells = <2>;



       ufs@4e84000 {

          compatible = "cdns,ufshc-m31-16nm", "jedec,ufs-2.0";

          reg = <0x0 0x4e84000 0x0 0x10000>;

          interrupts = <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;

          freq-table-hz = <19200000 19200000>;

          power-domains = <&k3_pds 277>;

          clocks = <&k3_clks 277 1>;

          assigned-clocks = <&k3_clks 277 1>;

          assigned-clock-parents = <&k3_clks 277 4>;

          clock-names = "core_clk";

       };

    };

Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ Required properties: 
			    "qcom,msm8996-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

			    "qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0"

- interrupts        : <interrupt mapping for UFS host controller IRQ>

- reg               : <registers mapping>

Documentation/scsi/scsi_mid_low_api.txt

+2 −1
Original line number Diff line number Diff line
@@ -1084,7 +1084,8 @@ of interest: 
                   commands to the adapter.

    this_id      - scsi id of host (scsi initiator) or -1 if not known

    sg_tablesize - maximum scatter gather elements allowed by host.

                   0 implies scatter gather not supported by host

                   Set this to SG_ALL or less to avoid chained SG lists.

                   Must be at least 1.

    max_sectors  - maximum number of sectors (usually 512 bytes) allowed

                   in a single SCSI command. The default value of 0 leads

                   to a setting of SCSI_DEFAULT_MAX_SECTORS (defined in

drivers/ata/pata_arasan_cf.c

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ struct arasan_cf_dev { 


static struct scsi_host_template arasan_cf_sht = {

	ATA_BASE_SHT(DRIVER_NAME),

	.sg_tablesize = SG_NONE,

	.dma_boundary = 0xFFFFFFFFUL,

};

drivers/s390/scsi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ 


zfcp-objs := zfcp_aux.o zfcp_ccw.o zfcp_dbf.o zfcp_erp.o \

	     zfcp_fc.o zfcp_fsf.o zfcp_qdio.o zfcp_scsi.o zfcp_sysfs.o \

	     zfcp_unit.o

	     zfcp_unit.o zfcp_diag.o



obj-$(CONFIG_ZFCP) += zfcp.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE