Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a50aaef authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI updates from James Bottomley:
 "This patch set consists of the usual driver updates (megaraid_sas,
  arcmsr, be2iscsi, lpfc, mpt2sas, mpt3sas, qla2xxx, ufs) plus several
  assorted fixes and miscellaneous updates (including the
  pci_msix_enable_range() changes that have been pending for a while)"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (202 commits)
  scsi: add a CONFIG_SCSI_MQ_DEFAULT option
  ufs: definitions for phy interface
  ufs: tune bkops while power managment events
  ufs: Add support for clock scaling using devfreq framework
  ufs: Add freq-table-hz property for UFS device
  ufs: Add support for clock gating
  ufs: refactor configuring power mode
  ufs: add UFS power management support
  ufs: introduce well known logical unit in ufs
  ufs: manually add well known logical units
  ufs: Active Power Mode - configuring bActiveICCLevel
  ufs: improve init sequence
  ufs: refactor query descriptor API support
  ufs: add voting support for host controller power
  ufs: Add clock initialization support
  ufs: Add regulator enable support
  ufs: Allow vendor specific initialization
  scsi: don't add scsi_device if its already visible
  scsi: fix the type for well known LUs
  scsi: fix comment in struct Scsi_Host definition
  ...
parents 1e345ac6 19ac97ff

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

+41 −0
Original line number Diff line number Diff line
@@ -8,9 +8,50 @@ Required properties: 
- interrupts        : <interrupt mapping for UFS host controller IRQ>

- reg               : <registers mapping>



Optional properties:

- vdd-hba-supply        : phandle to UFS host controller supply regulator node

- vcc-supply            : phandle to VCC supply regulator node

- vccq-supply           : phandle to VCCQ supply regulator node

- vccq2-supply          : phandle to VCCQ2 supply regulator node

- vcc-supply-1p8        : For embedded UFS devices, valid VCC range is 1.7-1.95V

                          or 2.7-3.6V. This boolean property when set, specifies

			  to use low voltage range of 1.7-1.95V. Note for external

			  UFS cards this property is invalid and valid VCC range is

			  always 2.7-3.6V.

- 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

                          order as the clocks property.

- 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.



Note: If above properties are not defined it can be assumed that the supply

regulators or clocks are always on.



Example:

	ufshc@0xfc598000 {

		compatible = "jedec,ufs-1.1";

		reg = <0xfc598000 0x800>;

		interrupts = <0 28 0>;



		vdd-hba-supply = <&xxx_reg0>;

		vdd-hba-fixed-regulator;

		vcc-supply = <&xxx_reg1>;

		vcc-supply-1p8;

		vccq-supply = <&xxx_reg2>;

		vccq2-supply = <&xxx_reg3>;

		vcc-max-microamp = 500000;

		vccq-max-microamp = 200000;

		vccq2-max-microamp = 200000;



		clocks = <&core 0>, <&ref 0>, <&iface 0>;

		clock-names = "core_clk", "ref_clk", "iface_clk";

		freq-table-hz = <100000000 200000000>, <0 0>, <0 0>;

	};

Documentation/scsi/ChangeLog.megaraid_sas

+14 −0
Original line number Diff line number Diff line 
Release Date    : Thu. Jun 19, 2014 17:00:00 PST 2014 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

			Kashyap Desai

			Sumit Saxena

			Uday Lingala

Current Version : 06.803.02.00-rc1

Old Version     : 06.803.01.00-rc1

    1. Fix reset_mutex leak in megasas_reset_fusion().

    2. Remove unused variables in megasas_instance.

    3. Fix LD/VF affiliation parsing.

    4. Add missing initial call to megasas_get_ld_vf_affiliation().

    5. Version and Changelog update.

-------------------------------------------------------------------------------

Release Date    : Mon. Mar 10, 2014 17:00:00 PST 2014 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

drivers/message/fusion/mptbase.c

+1 −7
Original line number Diff line number Diff line
@@ -1400,7 +1400,6 @@ mpt_verify_adapter(int iocid, MPT_ADAPTER **iocpp) 
 *	@vendor: pci vendor id

 *	@device: pci device id

 *	@revision: pci revision id

 *	@prod_name: string returned

 *

 *	Returns product string displayed when driver loads,

 *	in /proc/mpt/summary and /sysfs/class/scsi_host/host<X>/version_product
@@ -3172,12 +3171,7 @@ GetIocFacts(MPT_ADAPTER *ioc, int sleepFlag, int reason) 
			facts->FWImageSize = le32_to_cpu(facts->FWImageSize);

		}



		sz = facts->FWImageSize;

		if ( sz & 0x01 )

			sz += 1;

		if ( sz & 0x02 )

			sz += 2;

		facts->FWImageSize = sz;

		facts->FWImageSize = ALIGN(facts->FWImageSize, 4);



		if (!facts->RequestFrameSize) {

			/*  Something is wrong!  */

drivers/message/fusion/mptctl.c

+1 −6
Original line number Diff line number Diff line
@@ -1741,12 +1741,7 @@ mptctl_replace_fw (unsigned long arg) 


	/* Allocate memory for the new FW image

	 */

	newFwSize = karg.newImageSize;



	if (newFwSize & 0x01)

		newFwSize += 1;

	if (newFwSize & 0x02)

		newFwSize += 2;

	newFwSize = ALIGN(karg.newImageSize, 4);



	mpt_alloc_fw_memory(ioc, newFwSize);

	if (ioc->cached_fw == NULL)

drivers/message/fusion/mptspi.c

+5 −0
Original line number Diff line number Diff line
@@ -1419,6 +1419,11 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		goto out_mptspi_probe;

        }



	/* VMWare emulation doesn't properly implement WRITE_SAME

	 */

	if (pdev->subsystem_vendor == 0x15AD)

		sh->no_write_same = 1;



	spin_lock_irqsave(&ioc->FreeQlock, flags);



	/* Attach the SCSI Host to the IOC structure