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

Commit 40df43a1 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 libara fixes from Jeff Garzik:

 - Notable regression fix.  Forbid dynamic runtime power management by
   default, due to issues with suspend/resume and hotplug.

   To re-enable, use sysfs.

 - make ata_print_id atomic, due to ref from multiple contexts

 - sata_mv warning fix

 - ata_piix new PCI ID

* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: forbid port runtime pm by default, fixing regression
  libata: make ata_print_id atomic
  sata_mv: silence an uninitialized variable warning
  ata_piix: IDE-mode SATA patch for Intel DH89xxCC DeviceIDs
parents 9ecf8c0d 0c8d32c2

drivers/ata/ata_piix.c

+2 −0
Original line number Diff line number Diff line
@@ -329,6 +329,8 @@ static const struct pci_device_id piix_pci_tbl[] = { 
	{ 0x8086, 0x8c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (Lynx Point) */

	{ 0x8086, 0x8c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	/* SATA Controller IDE (DH89xxCC) */

	{ 0x8086, 0x2326, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },

	{ }	/* terminate list */

};

drivers/ata/libata-core.c

+2 −2
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev); 
static void ata_dev_xfermask(struct ata_device *dev);

static unsigned long ata_dev_blacklisted(const struct ata_device *dev);



unsigned int ata_print_id = 1;

atomic_t ata_print_id = ATOMIC_INIT(1);



struct ata_force_param {

	const char	*name;
@@ -6029,7 +6029,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 


	/* give ports names and add SCSI hosts */

	for (i = 0; i < host->n_ports; i++)

		host->ports[i]->print_id = ata_print_id++;

		host->ports[i]->print_id = atomic_inc_return(&ata_print_id);





	/* Create associated sysfs transport objects  */

drivers/ata/libata-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -3843,7 +3843,7 @@ int ata_sas_async_port_init(struct ata_port *ap) 
	int rc = ap->ops->port_start(ap);



	if (!rc) {

		ap->print_id = ata_print_id++;

		ap->print_id = atomic_inc_return(&ata_print_id);

		__ata_port_probe(ap);

	}
@@ -3867,7 +3867,7 @@ int ata_sas_port_init(struct ata_port *ap) 
	int rc = ap->ops->port_start(ap);



	if (!rc) {

		ap->print_id = ata_print_id++;

		ap->print_id = atomic_inc_return(&ata_print_id);

		rc = ata_port_probe(ap);

	}

drivers/ata/libata-transport.c

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ int ata_tport_add(struct device *parent, 
	device_enable_async_suspend(dev);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);

	pm_runtime_forbid(dev);



	transport_add_device(dev);

	transport_configure_device(dev);

drivers/ata/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ enum { 
	ATA_DNXFER_QUIET	= (1 << 31),

};



extern unsigned int ata_print_id;

extern atomic_t ata_print_id;

extern int atapi_passthru16;

extern int libata_fua;

extern int libata_noacpi;