Commit d1cd7c85 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: qla2xxx, qedf, smartpqi,
  hpsa, lpfc, ufs, mpt3sas, ibmvfc and hisi_sas. Plus number of minor
  changes, spelling fixes and other trivia"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (298 commits)
  scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session()
  scsi: qla2xxx: Avoid that qlt_send_resp_ctio() corrupts memory
  scsi: qla2xxx: Fix hardirq-unsafe locking
  scsi: qla2xxx: Complain loudly about reference count underflow
  scsi: qla2xxx: Use __le64 instead of uint32_t[2] for sending DMA addresses to firmware
  scsi: qla2xxx: Introduce the dsd32 and dsd64 data structures
  scsi: qla2xxx: Check the size of firmware data structures at compile time
  scsi: qla2xxx: Pass little-endian values to the firmware
  scsi: qla2xxx: Fix race conditions in the code for aborting SCSI commands
  scsi: qla2xxx: Use an on-stack completion in qla24xx_control_vp()
  scsi: qla2xxx: Make qla24xx_async_abort_cmd() static
  scsi: qla2xxx: Remove unnecessary locking from the target code
  scsi: qla2xxx: Remove qla_tgt_cmd.released
  scsi: qla2xxx: Complain if a command is released that is owned by the firmware
  scsi: qla2xxx: target: Fix offline port handling and host reset handling
  scsi: qla2xxx: Fix abort handling in tcm_qla2xxx_write_pending()
  scsi: qla2xxx: Fix error handling in qlt_alloc_qfull_cmd()
  scsi: qla2xxx: Simplify qlt_send_term_imm_notif()
  scsi: qla2xxx: Fix use-after-free issues in qla2xxx_qpair_sp_free_dma()
  scsi: qla2xxx: Fix a qla24xx_enable_msix() error path
  ...
parents b3a5e648 d4023db7

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

+3 −2
Original line number Diff line number Diff line
@@ -5,8 +5,9 @@ Each UFS controller instance should have its own node. 
Please see the ufshcd-pltfrm.txt for a list of all available properties.



Required properties:

- compatible	: Compatible list, contains the following controller:

			"cdns,ufshc"

- compatible	: Compatible list, contains one of the following controllers:

			"cdns,ufshc" - Generic CDNS HCI,

			"cdns,ufshc-m31-16nm" - CDNS UFS HC + M31 16nm PHY

		  complemented with the JEDEC version:

			"jedec,ufs-2.0"

Documentation/devicetree/bindings/ufs/ufs-mediatek.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
* Mediatek Universal Flash Storage (UFS) Host Controller



UFS nodes are defined to describe on-chip UFS hardware macro.

Each UFS Host Controller should have its own node.



To bind UFS PHY with UFS host controller, the controller node should

contain a phandle reference to UFS M-PHY node.



Required properties for UFS nodes:

- compatible         : Compatible list, contains the following controller:

                       "mediatek,mt8183-ufshci" for MediaTek UFS host controller

                       present on MT81xx chipsets.

- reg                : Address and length of the UFS register set.

- phys               : phandle to m-phy.

- clocks             : List of phandle and clock specifier pairs.

- clock-names        : List of clock input name strings sorted in the same

                       order as the clocks property. "ufs" is mandatory.

                       "ufs": ufshci core control clock.

- freq-table-hz      : Array of <min max> operating frequencies stored in the same

                       order as the clocks property. If this property is not

                       defined or a value in the array is "0" then it is assumed

                       that the frequency is set by the parent clock or a

                       fixed rate clock source.

- vcc-supply         : phandle to VCC supply regulator node.



Example:



	ufsphy: phy@11fa0000 {

		...

	};



	ufshci@11270000 {

		compatible = "mediatek,mt8183-ufshci";

		reg = <0 0x11270000 0 0x2300>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>;

		phys = <&ufsphy>;



		clocks = <&infracfg_ao INFRACFG_AO_UFS_CG>;

		clock-names = "ufs";

		freq-table-hz = <0 0>;



		vcc-supply = <&mt_pmic_vemc_ldo_reg>;

	};

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

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ Optional properties: 
- vcc-max-microamp      : specifies max. load that can be drawn from vcc supply

- vccq-max-microamp     : specifies max. load that can be drawn from vccq supply

- vccq2-max-microamp    : specifies max. load that can be drawn from vccq2 supply

- <name>-fixed-regulator : boolean property specifying that <name>-supply is a fixed regulator



- clocks                : List of phandle and clock specifier pairs

- clock-names           : List of clock input name strings sorted in the same
@@ -65,7 +64,6 @@ Example: 
		interrupts = <0 28 0>;



		vdd-hba-supply = <&xxx_reg0>;

		vdd-hba-fixed-regulator;

		vcc-supply = <&xxx_reg1>;

		vcc-supply-1p8;

		vccq-supply = <&xxx_reg2>;

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -16057,6 +16057,13 @@ L: linux-scsi@vger.kernel.org 
S:	Supported

F:	drivers/scsi/ufs/*dwc*



UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS

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

L:	linux-scsi@vger.kernel.org

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

S:	Maintained

F:	drivers/scsi/ufs/ufs-mediatek*



UNSORTED BLOCK IMAGES (UBI)

M:	Artem Bityutskiy <dedekind1@gmail.com>

M:	Richard Weinberger <richard@nod.at>

drivers/message/fusion/mptbase.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ mptbase_reply(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req, MPT_FRAME_HDR *reply) 
			freereq = 0;

		if (event != MPI_EVENT_EVENT_CHANGE)

			break;

		/* else: fall through */

		/* fall through */

	case MPI_FUNCTION_CONFIG:

	case MPI_FUNCTION_SAS_IO_UNIT_CONTROL:

		ioc->mptbase_cmds.status |= MPT_MGMT_STATUS_COMMAND_GOOD;

CRA Git | Maintained and supported by SUSTech CRA and CCSE