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

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

libata: PCI device should be powered up before being accessed 



PCI device should be powered up or powered up before its PCI regsiters
are accessed.  Although PCI configuration register access is allowed
in D3hot, PCI device is free to reset its status when transiting from
D3hot to D0 causing configuration data to change.

Many libata SFF drivers which use ata_pci_init_one() read and update
configuration registers before calling ata_pci_init_one() which
enables the PCI device.  Also, in resume paths, some drivers access
registers without resuming the PCI device.

This patch adds a call to pcim_enable_device() in init path if
register is accessed before calling ata_pci_init_one() and make resume
paths first resume PCI devices, access PCI configuration regiters then
resume ATA host.

While at it...

* cmd640 was strange in that it set ->resume even when CONFIG_PM is
  not.  This is by-product of minimal build fix.  Updated.

* In cs5530, Don't BUG() on reinit failure.  Just whine and fail
  resume.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent b558eddd

drivers/ata/pata_ali.c

+13 −1
Original line number Diff line number Diff line
@@ -637,6 +637,11 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	const struct ata_port_info *ppi[] = { NULL, NULL };

	u8 tmp;

	struct pci_dev *isa_bridge;

	int rc;



	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;



	/*

	 * The chipset revision selects the driver operations and
@@ -672,8 +677,15 @@ static int ali_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
#ifdef CONFIG_PM

static int ali_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

	if (rc)

		return rc;

	ali_init_chipset(pdev);

	return ata_pci_device_resume(pdev);

	ata_host_resume(host);

	return 0;

}

#endif

drivers/ata/pata_amd.c

+15 −1
Original line number Diff line number Diff line
@@ -659,10 +659,15 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	static int printed_version;

	int type = id->driver_data;

	u8 fifo;

	int rc;



	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");



	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;



	pci_read_config_byte(pdev, 0x41, &fifo);



	/* Check for AMD7409 without swdma errata and if found adjust type */
@@ -706,6 +711,13 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
#ifdef CONFIG_PM

static int amd_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

	if (rc)

		return rc;



	if (pdev->vendor == PCI_VENDOR_ID_AMD) {

		u8 fifo;

		pci_read_config_byte(pdev, 0x41, &fifo);
@@ -718,7 +730,9 @@ static int amd_reinit_one(struct pci_dev *pdev) 
		    pdev->device == PCI_DEVICE_ID_AMD_COBRA_7401)

		    	ata_pci_clear_simplex(pdev);

	}

	return ata_pci_device_resume(pdev);



	ata_host_resume(host);

	return 0;

}

#endif

drivers/ata/pata_artop.c

+5 −0
Original line number Diff line number Diff line
@@ -446,11 +446,16 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id) 
		.port_ops	= &artop6260_ops,

	};

	const struct ata_port_info *ppi[] = { NULL, NULL };

	int rc;



	if (!printed_version++)

		dev_printk(KERN_DEBUG, &pdev->dev,

			   "version " DRV_VERSION "\n");



	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;



	if (id->driver_data == 0) {	/* 6210 variant */

		ppi[0] = &info_6210;

		ppi[1] = &ata_dummy_port_info;

drivers/ata/pata_cmd640.c

+16 −5
Original line number Diff line number Diff line
@@ -254,20 +254,31 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		.port_ops = &cmd640_port_ops

	};

	const struct ata_port_info *ppi[] = { &info, NULL };

	int rc;



	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;



	cmd640_hardware_init(pdev);



	return ata_pci_init_one(pdev, ppi);

}



#ifdef CONFIG_PM

static int cmd640_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	int rc;



	rc = ata_pci_device_do_resume(pdev);

	if (rc)

		return rc;

	cmd640_hardware_init(pdev);

#ifdef CONFIG_PM

	return ata_pci_device_resume(pdev);

#else

	ata_host_resume(host);

	return 0;

#endif

}

#endif



static const struct pci_device_id cmd640[] = {

	{ PCI_VDEVICE(CMD, 0x640), 0 },
@@ -281,8 +292,8 @@ static struct pci_driver cmd640_pci_driver = { 
	.remove		= ata_pci_remove_one,

#ifdef CONFIG_PM

	.suspend	= ata_pci_device_suspend,

#endif

	.resume		= cmd640_reinit_one,

#endif

};



static int __init cmd640_init(void)

drivers/ata/pata_cmd64x.c

+14 −1
Original line number Diff line number Diff line
@@ -435,6 +435,11 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	};

	const struct ata_port_info *ppi[] = { &cmd_info[id->driver_data], NULL };

	u8 mrdmode;

	int rc;



	rc = pcim_enable_device(pdev);

	if (rc)

		return rc;



	pci_read_config_dword(pdev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xFF;
@@ -470,7 +475,14 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
#ifdef CONFIG_PM

static int cmd64x_reinit_one(struct pci_dev *pdev)

{

	struct ata_host *host = dev_get_drvdata(&pdev->dev);

	u8 mrdmode;

	int rc;



	rc = ata_pci_device_do_resume(pdev);

	if (rc)

		return rc;



	pci_write_config_byte(pdev, PCI_LATENCY_TIMER, 64);

	pci_read_config_byte(pdev, MRDMODE, &mrdmode);

	mrdmode &= ~ 0x30;	/* IRQ set up */
@@ -479,7 +491,8 @@ static int cmd64x_reinit_one(struct pci_dev *pdev) 
#ifdef CONFIG_PPC

	pci_write_config_byte(pdev, UDIDETCR0, 0xF0);

#endif

	return ata_pci_device_resume(pdev);

	ata_host_resume(host);

	return 0;

}

#endif