e7ae884866
There is a problem with the suspend and resume of PCI Express port service devices that the ->suspend() and ->resume() routines of each service device are called twice in each suspend-resume cycle, which is obviously wrong. The scenario is that first, the PCI Express port driver calls suspend and resume routines of each port service driver from its pcie_portdrv_suspend() and pcie_portdrv_resume() callbacks, respectively (which is correct), and second, the pcie_port_bus_type driver calls them from its ->suspend() and ->resume() callbacks (which is not correct, because it doesn't happen at the right time). The solution is to remove the ->suspend() and ->resume() callbacks from pcie_port_bus_type and the associated functions. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
47 lines
1.3 KiB
C
47 lines
1.3 KiB
C
/*
|
|
* File: portdrv_bus.c
|
|
* Purpose: PCI Express Port Bus Driver's Bus Overloading Functions
|
|
*
|
|
* Copyright (C) 2004 Intel
|
|
* Copyright (C) Tom Long Nguyen (tom.l.nguyen@intel.com)
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/pci.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/pm.h>
|
|
|
|
#include <linux/pcieport_if.h>
|
|
#include "portdrv.h"
|
|
|
|
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv);
|
|
|
|
struct bus_type pcie_port_bus_type = {
|
|
.name = "pci_express",
|
|
.match = pcie_port_bus_match,
|
|
};
|
|
EXPORT_SYMBOL_GPL(pcie_port_bus_type);
|
|
|
|
static int pcie_port_bus_match(struct device *dev, struct device_driver *drv)
|
|
{
|
|
struct pcie_device *pciedev;
|
|
struct pcie_port_service_driver *driver;
|
|
|
|
if (drv->bus != &pcie_port_bus_type || dev->bus != &pcie_port_bus_type)
|
|
return 0;
|
|
|
|
pciedev = to_pcie_device(dev);
|
|
driver = to_service_driver(drv);
|
|
if ( (driver->id_table->vendor != PCI_ANY_ID &&
|
|
driver->id_table->vendor != pciedev->id.vendor) ||
|
|
(driver->id_table->device != PCI_ANY_ID &&
|
|
driver->id_table->device != pciedev->id.device) ||
|
|
(driver->id_table->port_type != PCIE_ANY_PORT &&
|
|
driver->id_table->port_type != pciedev->id.port_type) ||
|
|
driver->id_table->service_type != pciedev->id.service_type )
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|