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

Commit 9e220385 authored Jul 03, 2013 by Linus Torvalds

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

Pull libata updates from Tejun Heo:
 "Overview of changes:

   - The rest of maintainer email address updates.

   - Some core updates - more robust default behavior for port
     multipliers, better error reporting for SG_IO commands, and a way
     to better work around now ancient and probably pretty rare PATA ->
     SATA bridges with ATAPI devices.

   - sata_rcar stabilization.

   - Some hardware PCI ID additions and one-off low level driver
     updates."

* 'for-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
  AHCI: use ATA_BUSY
  libata-zpodd: must use ata_tf_init()
  ahci: AHCI-mode SATA patch for Intel Coleto Creek DeviceIDs
  ata_piix: IDE-mode SATA patch for Intel Coleto Creek DeviceIDs
  libata: cleanup SAT error translation
  ahci: sata: add support for exynos5440 sata
  libata: skip SRST for all SIMG [34]7x port-multipliers
  ahci: remove pmp link online check in FBS EH
  sata highbank: add bit-banged SGPIO driver support
  ahci: make ahci_transmit_led_message into a function pointer
  sata_rcar: fix compilation warning in sata_rcar_thaw()
  sata_highbank: increase retry count but shorten duration for Calxeda controller
  ata: use pci_get_drvdata()
  ipr: qc_fill_rtf() method should not store alternate status register
  sata_rcar: add 'base' local variable to some functions
  sata_rcar: correct 'sata_rcar_sht'
  sata_rcar: kill superfluous code in sata_rcar_bmdma_fill_sg()
  libata: do not limit R-Car SATA driver to shmobile
  ata: use platform_{get,set}_drvdata()
  AHCI: Make distinct names for ports in /proc/interrupts
  ...

parents 7f0ef026 5a0a6a4f

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,11 @@ Optional properties:
	- calxeda,port-phys: phandle-combophy and lane assignment, which maps each		- calxeda,port-phys: phandle-combophy and lane assignment, which maps each
	SATA port to a combophy and a lane within that		SATA port to a combophy and a lane within that
	combophy		combophy
			- calxeda,sgpio-gpio: phandle-gpio bank, bit offset, and default on or off,
			which indicates that the driver supports SGPIO
			indicator lights using the indicated GPIOs
			- calxeda,led-order : a u32 array that map port numbers to offsets within the
			SGPIO bitstream.
	- dma-coherent : Present if dma operations are coherent		- dma-coherent : Present if dma operations are coherent

	Example:		Example:

Documentation/kernel-parameters.txt

+2 −0

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

	* dump_id: dump IDENTIFY data.		* dump_id: dump IDENTIFY data.

			* atapi_dmadir: Enable ATAPI DMADIR bridge support

	If there are multiple matching configurations changing		If there are multiple matching configurations changing
	the same attribute, the last one is used.		the same attribute, the last one is used.

arch/arm/boot/dts/ecx-common.dtsi

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,8 @@
	calxeda,port-phys = <&combophy5 0 &combophy0 0		calxeda,port-phys = <&combophy5 0 &combophy0 0
	&combophy0 1 &combophy0 2		&combophy0 1 &combophy0 2
	&combophy0 3>;		&combophy0 3>;
			calxeda,sgpio-gpio =<&gpioh 5 1 &gpioh 6 1 &gpioh 7 1>;
			calxeda,led-order = <4 0 1 2 3>;
	};		};

	sdhci@ffe0e000 {		sdhci@ffe0e000 {

drivers/ata/Kconfig

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -263,7 +263,6 @@ config SATA_PROMISE

	config SATA_RCAR		config SATA_RCAR
	tristate "Renesas R-Car SATA support"		tristate "Renesas R-Car SATA support"
	depends on ARCH_SHMOBILE && ARCH_R8A7779
	help		help
	This option enables support for Renesas R-Car Serial ATA.		This option enables support for Renesas R-Car Serial ATA.

drivers/ata/acard-ahci.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,7 @@ static struct pci_driver acard_ahci_pci_driver = {
	#ifdef CONFIG_PM		#ifdef CONFIG_PM
	static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)		static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
	{		{
	struct ata_host *host = dev_get_drvdata(&pdev->dev);		struct ata_host *host = pci_get_drvdata(pdev);
	struct ahci_host_priv *hpriv = host->private_data;		struct ahci_host_priv *hpriv = host->private_data;
	void __iomem *mmio = hpriv->mmio;		void __iomem *mmio = hpriv->mmio;
	u32 ctl;		u32 ctl;
	@@ -156,7 +156,7 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg

	static int acard_ahci_pci_device_resume(struct pci_dev *pdev)		static int acard_ahci_pci_device_resume(struct pci_dev *pdev)
	{		{
	struct ata_host *host = dev_get_drvdata(&pdev->dev);		struct ata_host *host = pci_get_drvdata(pdev);
	int rc;		int rc;

	rc = ata_pci_device_do_resume(pdev);		rc = ata_pci_device_do_resume(pdev);