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

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

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] PCI: reverse pci config space restore order
  [PATCH] PCI: Improve PCI config space writeback
  [PATCH] PCI: Error handling on PCI device resume
  [PATCH] PCI: fix pciehp compile issue when CONFIG_ACPI is not enabled
parents c0bbbc73 8b8c8d28

drivers/pci/pci-driver.c

+8 −5
Original line number Diff line number Diff line
@@ -285,9 +285,9 @@ static int pci_device_suspend(struct device * dev, pm_message_t state) 
 * Default resume method for devices that have no driver provided resume,

 * or not even a driver at all.

 */

static void pci_default_resume(struct pci_dev *pci_dev)

static int pci_default_resume(struct pci_dev *pci_dev)

{

	int retval;

	int retval = 0;



	/* restore the PCI config space */

	pci_restore_state(pci_dev);
@@ -297,18 +297,21 @@ static void pci_default_resume(struct pci_dev *pci_dev) 
	/* if the device was busmaster before the suspend, make it busmaster again */

	if (pci_dev->is_busmaster)

		pci_set_master(pci_dev);



	return retval;

}



static int pci_device_resume(struct device * dev)

{

	int error;

	struct pci_dev * pci_dev = to_pci_dev(dev);

	struct pci_driver * drv = pci_dev->driver;



	if (drv && drv->resume)

		drv->resume(pci_dev);

		error = drv->resume(pci_dev);

	else

		pci_default_resume(pci_dev);

	return 0;

		error = pci_default_resume(pci_dev);

	return error;

}



static void pci_device_shutdown(struct device *dev)

drivers/pci/pci.c

+16 −2
Original line number Diff line number Diff line
@@ -461,9 +461,23 @@ int 
pci_restore_state(struct pci_dev *dev)

{

	int i;

	int val;



	for (i = 0; i < 16; i++)

		pci_write_config_dword(dev,i * 4, dev->saved_config_space[i]);

	/*

	 * The Base Address register should be programmed before the command

	 * register(s)

	 */

	for (i = 15; i >= 0; i--) {

		pci_read_config_dword(dev, i * 4, &val);

		if (val != dev->saved_config_space[i]) {

			printk(KERN_DEBUG "PM: Writing back config space on "

				"device %s at offset %x (was %x, writing %x)\n",

				pci_name(dev), i,

				val, (int)dev->saved_config_space[i]);

			pci_write_config_dword(dev,i * 4,

				dev->saved_config_space[i]);

		}

	}

	pci_restore_msi_state(dev);

	pci_restore_msix_state(dev);

	return 0;

include/linux/pci-acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
extern acpi_status pci_osc_control_set(acpi_handle handle, u32 flags);

extern acpi_status pci_osc_support_set(u32 flags);

#else

#if !defined(acpi_status)

#if !defined(AE_ERROR)

typedef u32 		acpi_status;

#define AE_ERROR      	(acpi_status) (0x0001)

#endif