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

Commit 5e23ae49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

Pull libata updates from Jeff Garzik:
 "Notable changes:

   - Updating libata to directly bind with ACPI / runtime power mgmt.
     This is a pre-req for SATA ZPODD (CD-ROM power management).

     Touches ACPI (exports++) and SCSI in minor ways.  Has been in
     linux-next for weeks.

     The rest of this should come via SCSI tree, as it involves a lot of
     updates to the 'sr' driver etc.

  Other, minor changes:

   - module_pci_driver() removes a lot of common boilerplate from each
     PCI driver

   - minor coding style, whitespace cleanups

   - pata_pcmcia bug fix, caught by Coccinelle

   - pata_imx, sata_dwc_460ex minor vendor updates

   - ahci_platform: use simple PM ops, and thereby add hibernation cb's

   - Add a few device-specific quirks"

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (23 commits)
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d958 bits
  libata-acpi: add missing inlines in libata.h
  libata: tell scsi layer device supports runtime power off
  libata: detect Device Attention support
  libata-acpi: register/unregister device to/from power resource
  libata-acpi: add ata port runtime D3Cold support
  libata-acpi: set acpi state for SATA port
  ...
parents bdc0077a 641589bf

drivers/acpi/glue.c

+2 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ int register_acpi_bus_type(struct acpi_bus_type *type) 
	}

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(register_acpi_bus_type);



int unregister_acpi_bus_type(struct acpi_bus_type *type)

{
@@ -54,6 +55,7 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type) 
	}

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(unregister_acpi_bus_type);



static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)

{
@@ -69,7 +71,6 @@ static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type) 
	up_read(&bus_type_sem);

	return ret;

}

EXPORT_SYMBOL_GPL(register_acpi_bus_type);



static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle)

{
@@ -86,7 +87,6 @@ static int acpi_find_bridge_device(struct device *dev, acpi_handle * handle) 
	up_read(&bus_type_sem);

	return ret;

}

EXPORT_SYMBOL_GPL(unregister_acpi_bus_type);



/* Get device's handler per its address under its parent */

struct acpi_find_child {

drivers/acpi/power.c

+2 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ void acpi_power_resource_unregister_device(struct device *dev, acpi_handle handl 
		__acpi_power_resource_unregister_device(dev,

			list->handles[i]);

}

EXPORT_SYMBOL_GPL(acpi_power_resource_unregister_device);



static int __acpi_power_resource_register_device(

	struct acpi_power_managed_device *powered_device, acpi_handle handle)
@@ -462,6 +463,7 @@ int acpi_power_resource_register_device(struct device *dev, acpi_handle handle) 
	printk(KERN_WARNING PREFIX "Invalid Power Resource to register!");

	return -ENODEV;

}

EXPORT_SYMBOL_GPL(acpi_power_resource_register_device);



/**

 * acpi_device_sleep_wake - execute _DSW (Device Sleep Wake) or (deprecated in

drivers/acpi/sleep.c

+2 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in) 
	}

	return d_max;

}

EXPORT_SYMBOL(acpi_pm_device_sleep_state);

#endif /* CONFIG_PM */



#ifdef CONFIG_PM_SLEEP
@@ -845,6 +846,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable) 


	return 0;

}

EXPORT_SYMBOL(acpi_pm_device_run_wake);



/**

 *	acpi_pm_device_sleep_wake - enable or disable the system wake-up

drivers/ata/acard-ahci.c

+1 −12
Original line number Diff line number Diff line
@@ -503,21 +503,10 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id 
				 &acard_ahci_sht);

}



static int __init acard_ahci_init(void)

{

	return pci_register_driver(&acard_ahci_pci_driver);

}



static void __exit acard_ahci_exit(void)

{

	pci_unregister_driver(&acard_ahci_pci_driver);

}

module_pci_driver(acard_ahci_pci_driver);



MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("ACard AHCI SATA low-level driver");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, acard_ahci_pci_tbl);

MODULE_VERSION(DRV_VERSION);
 


module_init(acard_ahci_init);

module_exit(acard_ahci_exit);

drivers/ata/ahci.c

+28 −35
Original line number Diff line number Diff line
@@ -105,31 +105,27 @@ static struct ata_port_operations ahci_p5wdh_ops = { 


static const struct ata_port_info ahci_port_info[] = {

	/* by features */

	[board_ahci] =

	{

	[board_ahci] = {

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_ign_iferr] =

	{

	[board_ahci_ign_iferr] = {

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_IRQ_IF_ERR),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_nosntf] =

	{

	[board_ahci_nosntf] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_SNTF),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_yes_fbs] =

	{

	[board_ahci_yes_fbs] = {

		AHCI_HFLAGS	(AHCI_HFLAG_YES_FBS),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,
@@ -137,8 +133,7 @@ static const struct ata_port_info ahci_port_info[] = { 
		.port_ops	= &ahci_ops,

	},

	/* by chipsets */

	[board_ahci_mcp65] =

	{

	[board_ahci_mcp65] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP |

				 AHCI_HFLAG_YES_NCQ),

		.flags		= AHCI_FLAG_COMMON | ATA_FLAG_NO_DIPM,
@@ -146,24 +141,21 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_mcp77] =

	{

	[board_ahci_mcp77] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_FPDMA_AA | AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_mcp89] =

	{

	[board_ahci_mcp89] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_FPDMA_AA),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_mv] =

	{

	[board_ahci_mv] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_MSI |

				 AHCI_HFLAG_MV_PATA | AHCI_HFLAG_NO_PMP),

		.flags		= ATA_FLAG_SATA | ATA_FLAG_PIO_DMA,
@@ -171,8 +163,7 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_ops,

	},

	[board_ahci_sb600] =

	{

	[board_ahci_sb600] = {

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL |

				 AHCI_HFLAG_NO_MSI | AHCI_HFLAG_SECT255 |

				 AHCI_HFLAG_32BIT_ONLY),
@@ -181,16 +172,14 @@ static const struct ata_port_info ahci_port_info[] = { 
		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_pmp_retry_srst_ops,

	},

	[board_ahci_sb700] =	/* for SB700 and SB800 */

	{

	[board_ahci_sb700] = {	/* for SB700 and SB800 */

		AHCI_HFLAGS	(AHCI_HFLAG_IGN_SERR_INTERNAL),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= ATA_UDMA6,

		.port_ops	= &ahci_pmp_retry_srst_ops,

	},

	[board_ahci_vt8251] =

	{

	[board_ahci_vt8251] = {

		AHCI_HFLAGS	(AHCI_HFLAG_NO_NCQ | AHCI_HFLAG_NO_PMP),

		.flags		= AHCI_FLAG_COMMON,

		.pio_mask	= ATA_PIO4,
@@ -776,6 +765,22 @@ static bool ahci_sb600_enable_64bit(struct pci_dev *pdev) 
				DMI_MATCH(DMI_BOARD_NAME, "MS-7376"),

			},

		},

		/*

		 * All BIOS versions for the MSI K9AGM2 (MS-7327) support

		 * 64bit DMA.

		 *

		 * This board also had the typo mentioned above in the

		 * Manufacturer DMI field (fixed in BIOS version 1.5), so

		 * match on DMI_BOARD_VENDOR of "MICRO-STAR INTER" again.

		 */

		{

			.ident = "MSI K9AGM2",

			.matches = {

				DMI_MATCH(DMI_BOARD_VENDOR,

					  "MICRO-STAR INTER"),

				DMI_MATCH(DMI_BOARD_NAME, "MS-7327"),

			},

		},

		/*

		 * All BIOS versions for the Asus M3A support 64bit DMA.

		 * (all release versions from 0301 to 1206 were tested)
@@ -1233,22 +1238,10 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
				 &ahci_sht);

}



static int __init ahci_init(void)

{

	return pci_register_driver(&ahci_pci_driver);

}



static void __exit ahci_exit(void)

{

	pci_unregister_driver(&ahci_pci_driver);

}



module_pci_driver(ahci_pci_driver);



MODULE_AUTHOR("Jeff Garzik");

MODULE_DESCRIPTION("AHCI SATA low-level driver");

MODULE_LICENSE("GPL");

MODULE_DEVICE_TABLE(pci, ahci_pci_tbl);

MODULE_VERSION(DRV_VERSION);
 


module_init(ahci_init);

module_exit(ahci_exit);