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

Commit bb648a0d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: add CONFIG_PM to libata core layer
  libata: add missing CONFIG_PM in LLDs
  libata: add missing PM callbacks
  pata_qdi: Fix initialisation
  [libata] pata_cmd64x: fix driver description in comments
  [libata] pata_{legacy,sc1200,sl82c105}: add missing hooks
  [libata] change master/slave IDENTIFY order
  libata-core: Fix simplex handling
parents 8b453397 6ffa01d8

drivers/ata/ahci.c

+14 −0
Original line number Diff line number Diff line
@@ -219,10 +219,12 @@ static void ahci_thaw(struct ata_port *ap); 
static void ahci_error_handler(struct ata_port *ap);

static void ahci_vt8251_error_handler(struct ata_port *ap);

static void ahci_post_internal_cmd(struct ata_queued_cmd *qc);

#ifdef CONFIG_PM

static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg);

static int ahci_port_resume(struct ata_port *ap);

static int ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);

static int ahci_pci_device_resume(struct pci_dev *pdev);

#endif



static struct scsi_host_template ahci_sht = {

	.module			= THIS_MODULE,
@@ -241,8 +243,10 @@ static struct scsi_host_template ahci_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.suspend		= ata_scsi_device_suspend,

	.resume			= ata_scsi_device_resume,

#endif

};



static const struct ata_port_operations ahci_ops = {
@@ -271,8 +275,10 @@ static const struct ata_port_operations ahci_ops = { 
	.error_handler		= ahci_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,
@@ -304,8 +310,10 @@ static const struct ata_port_operations ahci_vt8251_ops = { 
	.error_handler		= ahci_vt8251_error_handler,

	.post_internal_cmd	= ahci_post_internal_cmd,



#ifdef CONFIG_PM

	.port_suspend		= ahci_port_suspend,

	.port_resume		= ahci_port_resume,

#endif



	.port_start		= ahci_port_start,

	.port_stop		= ahci_port_stop,
@@ -436,8 +444,10 @@ static struct pci_driver ahci_pci_driver = { 
	.id_table		= ahci_pci_tbl,

	.probe			= ahci_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ahci_pci_device_suspend,

	.resume			= ahci_pci_device_resume,

#endif

};
@@ -577,6 +587,7 @@ static void ahci_power_up(void __iomem *port_mmio, u32 cap) 
	writel(cmd | PORT_CMD_ICC_ACTIVE, port_mmio + PORT_CMD);

}



#ifdef CONFIG_PM

static void ahci_power_down(void __iomem *port_mmio, u32 cap)

{

	u32 cmd, scontrol;
@@ -594,6 +605,7 @@ static void ahci_power_down(void __iomem *port_mmio, u32 cap) 
	cmd &= ~PORT_CMD_SPIN_UP;

	writel(cmd, port_mmio + PORT_CMD);

}

#endif



static void ahci_init_port(void __iomem *port_mmio, u32 cap,

			   dma_addr_t cmd_slot_dma, dma_addr_t rx_fis_dma)
@@ -1335,6 +1347,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc) 
	}

}



#ifdef CONFIG_PM

static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;
@@ -1413,6 +1426,7 @@ static int ahci_pci_device_resume(struct pci_dev *pdev) 


	return 0;

}

#endif



static int ahci_port_start(struct ata_port *ap)

{

drivers/ata/ata_generic.c

+4 −0
Original line number Diff line number Diff line
@@ -119,8 +119,10 @@ static struct scsi_host_template generic_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



static struct ata_port_operations generic_port_ops = {
@@ -230,8 +232,10 @@ static struct pci_driver ata_generic_pci_driver = { 
	.id_table	= ata_generic,

	.probe 		= ata_generic_init_one,

	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

	.resume		= ata_pci_device_resume,

#endif

};



static int __init ata_generic_init(void)

drivers/ata/ata_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -253,8 +253,10 @@ static struct pci_driver piix_pci_driver = { 
	.id_table		= piix_pci_tbl,

	.probe			= piix_init_one,

	.remove			= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend		= ata_pci_device_suspend,

	.resume			= ata_pci_device_resume,

#endif

};



static struct scsi_host_template piix_sht = {
@@ -273,8 +275,10 @@ static struct scsi_host_template piix_sht = { 
	.slave_configure	= ata_scsi_slave_config,

	.slave_destroy		= ata_scsi_slave_destroy,

	.bios_param		= ata_std_bios_param,

#ifdef CONFIG_PM

	.resume			= ata_scsi_device_resume,

	.suspend		= ata_scsi_device_suspend,

#endif

};



static const struct ata_port_operations piix_pata_ops = {

drivers/ata/libata-core.c

+27 −5
Original line number Diff line number Diff line
@@ -1850,8 +1850,11 @@ int ata_bus_probe(struct ata_port *ap) 
	for (i = 0; i < ATA_MAX_DEVICES; i++)

		ap->device[i].pio_mode = XFER_PIO_0;



	/* read IDENTIFY page and configure devices */

	for (i = 0; i < ATA_MAX_DEVICES; i++) {

	/* read IDENTIFY page and configure devices. We have to do the identify

	   specific sequence bass-ackwards so that PDIAG- is released by

	   the slave device */



	for (i = ATA_MAX_DEVICES - 1; i >=  0; i--) {

		dev = &ap->device[i];



		if (tries[i])
@@ -1864,6 +1867,15 @@ int ata_bus_probe(struct ata_port *ap) 
				     dev->id);

		if (rc)

			goto fail;

	}



	/* After the identify sequence we can now set up the devices. We do

	   this in the normal order so that the user doesn't get confused */



	for(i = 0; i < ATA_MAX_DEVICES; i++) {

		dev = &ap->device[i];

		if (!ata_dev_enabled(dev))

			continue;



		ap->eh_context.i.flags |= ATA_EHI_PRINTINFO;

		rc = ata_dev_configure(dev);
@@ -2556,12 +2568,11 @@ int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev) 
	 * host channels are not permitted to do so.

	 */

	if (used_dma && (ap->host->flags & ATA_HOST_SIMPLEX))

		ap->host->simplex_claimed = 1;

		ap->host->simplex_claimed = ap;



	/* step5: chip specific finalisation */

	if (ap->ops->post_set_mode)

		ap->ops->post_set_mode(ap);



 out:

	if (rc)

		*r_failed_dev = dev;
@@ -3444,7 +3455,7 @@ static void ata_dev_xfermask(struct ata_device *dev) 
			       "device is on DMA blacklist, disabling DMA\n");

	}



	if ((host->flags & ATA_HOST_SIMPLEX) && host->simplex_claimed) {

	if ((host->flags & ATA_HOST_SIMPLEX) && host->simplex_claimed != ap) {

		xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);

		ata_dev_printk(dev, KERN_WARNING, "simplex DMA is claimed by "

			       "other device, disabling DMA\n");
@@ -5343,6 +5354,7 @@ int ata_flush_cache(struct ata_device *dev) 
	return 0;

}



#ifdef CONFIG_PM

static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,

			       unsigned int action, unsigned int ehi_flags,

			       int wait)
@@ -5458,6 +5470,7 @@ void ata_host_resume(struct ata_host *host) 
			    ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET, 0);

	host->dev->power.power_state = PMSG_ON;

}

#endif



/**

 *	ata_port_start - Set port up for dma.
@@ -6093,6 +6106,7 @@ int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits) 
	return (tmp == bits->val) ? 1 : 0;

}



#ifdef CONFIG_PM

void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg)

{

	pci_save_state(pdev);
@@ -6144,6 +6158,8 @@ int ata_pci_device_resume(struct pci_dev *pdev) 
		ata_host_resume(host);

	return rc;

}

#endif /* CONFIG_PM */



#endif /* CONFIG_PCI */
@@ -6352,8 +6368,10 @@ EXPORT_SYMBOL_GPL(sata_scr_write); 
EXPORT_SYMBOL_GPL(sata_scr_write_flush);

EXPORT_SYMBOL_GPL(ata_port_online);

EXPORT_SYMBOL_GPL(ata_port_offline);

#ifdef CONFIG_PM

EXPORT_SYMBOL_GPL(ata_host_suspend);

EXPORT_SYMBOL_GPL(ata_host_resume);

#endif /* CONFIG_PM */

EXPORT_SYMBOL_GPL(ata_id_string);

EXPORT_SYMBOL_GPL(ata_id_c_string);

EXPORT_SYMBOL_GPL(ata_id_to_dma_mode);
@@ -6369,16 +6387,20 @@ EXPORT_SYMBOL_GPL(pci_test_config_bits); 
EXPORT_SYMBOL_GPL(ata_pci_init_native_mode);

EXPORT_SYMBOL_GPL(ata_pci_init_one);

EXPORT_SYMBOL_GPL(ata_pci_remove_one);

#ifdef CONFIG_PM

EXPORT_SYMBOL_GPL(ata_pci_device_do_suspend);

EXPORT_SYMBOL_GPL(ata_pci_device_do_resume);

EXPORT_SYMBOL_GPL(ata_pci_device_suspend);

EXPORT_SYMBOL_GPL(ata_pci_device_resume);

#endif /* CONFIG_PM */

EXPORT_SYMBOL_GPL(ata_pci_default_filter);

EXPORT_SYMBOL_GPL(ata_pci_clear_simplex);

#endif /* CONFIG_PCI */



#ifdef CONFIG_PM

EXPORT_SYMBOL_GPL(ata_scsi_device_suspend);

EXPORT_SYMBOL_GPL(ata_scsi_device_resume);

#endif /* CONFIG_PM */



EXPORT_SYMBOL_GPL(ata_eng_timeout);

EXPORT_SYMBOL_GPL(ata_port_schedule_eh);

drivers/ata/libata-eh.c

+29 −0
Original line number Diff line number Diff line
@@ -52,8 +52,33 @@ enum { 


static void __ata_port_freeze(struct ata_port *ap);

static void ata_eh_finish(struct ata_port *ap);

#ifdef CONFIG_PM

static void ata_eh_handle_port_suspend(struct ata_port *ap);

static void ata_eh_handle_port_resume(struct ata_port *ap);

static int ata_eh_suspend(struct ata_port *ap,

			  struct ata_device **r_failed_dev);

static void ata_eh_prep_resume(struct ata_port *ap);

static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev);

#else /* CONFIG_PM */

static void ata_eh_handle_port_suspend(struct ata_port *ap)

{ }



static void ata_eh_handle_port_resume(struct ata_port *ap)

{ }



static int ata_eh_suspend(struct ata_port *ap, struct ata_device **r_failed_dev)

{

	return 0;

}



static void ata_eh_prep_resume(struct ata_port *ap)

{ }



static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev)

{

	return 0;

}

#endif /* CONFIG_PM */



static void ata_ering_record(struct ata_ering *ering, int is_io,

			     unsigned int err_mask)
@@ -1790,6 +1815,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap, 
	return rc;

}



#ifdef CONFIG_PM

/**

 *	ata_eh_suspend - handle suspend EH action

 *	@ap: target host port
@@ -1947,6 +1973,7 @@ static int ata_eh_resume(struct ata_port *ap, struct ata_device **r_failed_dev) 
	DPRINTK("EXIT\n");

	return 0;

}

#endif /* CONFIG_PM */



static int ata_port_nr_enabled(struct ata_port *ap)

{
@@ -2249,6 +2276,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset, 
	ata_eh_finish(ap);

}



#ifdef CONFIG_PM

/**

 *	ata_eh_handle_port_suspend - perform port suspend operation

 *	@ap: port to suspend
@@ -2364,3 +2392,4 @@ static void ata_eh_handle_port_resume(struct ata_port *ap) 
	}

	spin_unlock_irqrestore(ap->lock, flags);

}

#endif /* CONFIG_PM */