Commit 6ffa01d8 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: add CONFIG_PM to libata core layer 



Conditionalize all PM related stuff in libata core layer using
CONFIG_PM.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 438ac6d5

drivers/ata/libata-core.c

+11 −0
Original line number Diff line number Diff line
@@ -5354,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)
@@ -5469,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.
@@ -6104,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);
@@ -6155,6 +6158,8 @@ int ata_pci_device_resume(struct pci_dev *pdev) 
		ata_host_resume(host);

	return rc;

}

#endif /* CONFIG_PM */



#endif /* CONFIG_PCI */
@@ -6363,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);
@@ -6380,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 */

drivers/ata/libata-scsi.c

+2 −0
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ static void ata_dump_status(unsigned id, struct ata_taskfile *tf) 
	}

}



#ifdef CONFIG_PM

/**

 *	ata_scsi_device_suspend - suspend ATA device associated with sdev

 *	@sdev: the SCSI device to suspend
@@ -634,6 +635,7 @@ int ata_scsi_device_resume(struct scsi_device *sdev) 
	sdev->sdev_gendev.power.power_state = PMSG_ON;

	return 0;

}

#endif /* CONFIG_PM */



/**

 *	ata_to_sense_error - convert ATA error to SCSI error

include/linux/libata.h

+4 −0
Original line number Diff line number Diff line
@@ -718,10 +718,12 @@ extern void ata_std_ports(struct ata_ioports *ioaddr); 
extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,

			     unsigned int n_ports);

extern void ata_pci_remove_one (struct pci_dev *pdev);

#ifdef CONFIG_PM

extern void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);

extern int __must_check ata_pci_device_do_resume(struct pci_dev *pdev);

extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);

extern int ata_pci_device_resume(struct pci_dev *pdev);

#endif

extern int ata_pci_clear_simplex(struct pci_dev *pdev);

#endif /* CONFIG_PCI */

extern int ata_device_add(const struct ata_probe_ent *ent);
@@ -747,10 +749,12 @@ extern int sata_scr_write(struct ata_port *ap, int reg, u32 val); 
extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);

extern int ata_port_online(struct ata_port *ap);

extern int ata_port_offline(struct ata_port *ap);

#ifdef CONFIG_PM

extern int ata_scsi_device_resume(struct scsi_device *);

extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);

extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);

extern void ata_host_resume(struct ata_host *host);

#endif

extern int ata_ratelimit(void);

extern int ata_busy_sleep(struct ata_port *ap,

			  unsigned long timeout_pat, unsigned long timeout);