Commit 64e22b86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata updates from Tejun Heo:

 - a number of libata core changes to better support NCQ TRIM.

 - ahci now supports MSI-X in single IRQ mode to support a new
   controller which doesn't implement MSI or INTX.

 - ahci now supports edge-triggered IRQ mode to support a new controller
   which for some odd reason did edge-triggered IRQ.

 - the usual controller support additions and changes.

* 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (27 commits)
  libata: Do not blacklist Micron M500DC
  ata: ahci_mvebu: add suspend/resume support
  ahci, msix: Fix build error for !PCI_MSI
  ahci: Add support for Cavium's ThunderX host controller
  ahci: Add generic MSI-X support for single interrupts to SATA PCI driver
  libata: finally use __initconst in ata_parse_force_one()
  drivers: ata: add support for Ceva sata host controller
  devicetree:bindings: add devicetree bindings for ceva ahci
  ahci: added support for Freescale AHCI sata
  ahci: Store irq number in struct ahci_host_priv
  ahci: Move interrupt enablement code to a separate function
  Doc: libata: Fix spelling typo found in libata.xml
  ata:sata_nv - Change 1 to true for bool type variable.
  ata: add Broadcom AHCI SATA3 driver for STB chips
  Documentation: devicetree: add Broadcom SATA binding
  libata: Fix regression when the NCQ Send and Receive log page is absent
  ata: hpt366: fix constant cast warning
  ata: ahci_xgene: potential NULL dereference in probe
  ata: ahci_xgene: Add AHCI Support for 2nd HW version of APM X-Gene SoC AHCI SATA Host controller.
  libahci: Add support to handle HOST_IRQ_STAT as edge trigger latch.
  ...
parents 6597ac8a 243918be

Documentation/ABI/testing/sysfs-ata

+11 −0
Original line number Diff line number Diff line
@@ -90,6 +90,17 @@ gscr 
	130:	SATA_PMP_GSCR_SII_GPIO

	Only valid if the device is a PM.



trim



	Shows the DSM TRIM mode currently used by the device. Valid

	values are:

	unsupported:		Drive does not support DSM TRIM

	unqueued:		Drive supports unqueued DSM TRIM only

	queued:			Drive supports queued DSM TRIM

	forced_unqueued:	Drive's queued DSM support is known to be

				buggy and only unqueued TRIM commands

				are sent



spdn_cnt



	Number of time libata decided to lower the speed of link due to errors.

Documentation/devicetree/bindings/ata/ahci-ceva.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Binding for CEVA AHCI SATA Controller



Required properties:

  - reg: Physical base address and size of the controller's register area.

  - compatible: Compatibility string. Must be 'ceva,ahci-1v84'.

  - clocks: Input clock specifier. Refer to common clock bindings.

  - interrupts: Interrupt specifier. Refer to interrupt binding.



Optional properties:

  - ceva,broken-gen2: limit to gen1 speed instead of gen2.



Examples:

	ahci@fd0c0000 {

		compatible = "ceva,ahci-1v84";

		reg = <0xfd0c0000 0x200>;

		interrupt-parent = <&gic>;

		interrupts = <0 133 4>;

		clocks = <&clkc SATA_CLK_ID>;

		ceva,broken-gen2;

	};

Documentation/devicetree/bindings/ata/ahci-platform.txt

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ Required properties: 
  - "snps,dwc-ahci"

  - "snps,exynos5440-ahci"

  - "snps,spear-ahci"

  - "fsl,qoriq-ahci" : for qoriq series socs which include ls1021, ls2085, etc.

  - "fsl,<chip>-ahci" : chip could be ls1021, ls2085 etc.

  - "generic-ahci"

- interrupts        : <interrupt mapping for SATA IRQ>

- reg               : <registers mapping>

Documentation/devicetree/bindings/ata/brcm,sata-brcmstb.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* Broadcom SATA3 AHCI Controller for STB



SATA nodes are defined to describe on-chip Serial ATA controllers.

Each SATA controller should have its own node.



Required properties:

- compatible         : compatible list, may contain "brcm,bcm7445-ahci" and/or

                       "brcm,sata3-ahci"

- reg                : register mappings for AHCI and SATA_TOP_CTRL

- reg-names          : "ahci" and "top-ctrl"

- interrupts         : interrupt mapping for SATA IRQ



Also see ahci-platform.txt.



Example:



	sata@f045a000 {

		compatible = "brcm,bcm7445-ahci", "brcm,sata3-ahci";

		reg = <0xf045a000 0xa9c>, <0xf0458040 0x24>;

		reg-names = "ahci", "top-ctrl";

		interrupts = <0 30 0>;

		#address-cells = <1>;

		#size-cells = <0>;



		sata0: sata-port@0 {

			reg = <0>;

			phys = <&sata_phy 0>;

		};



		sata1: sata-port@1 {

			reg = <1>;

			phys = <&sata_phy 1>;

		};

	};

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1791,6 +1791,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			* [no]ncq: Turn on or off NCQ.



			* [no]ncqtrim: Turn off queued DSM TRIM.



			* nohrst, nosrst, norst: suppress hard, soft

                          and both resets.

CRA Git | Maintained and supported by SUSTech CRA and CCSE