mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
PCI updates for v3.7:
Power management PCI/PM: Fix proc config reg access for D3cold and bridge suspending PCI/PM: Resume device before shutdown PCI/PM: Fix deadlock when unbinding device if parent in D3cold Hotplug PCI/portdrv: Don't create hotplug slots unless port supports hotplug -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAABAgAGBQJQnT6FAAoJEPGMOI97Hn6zafMP/iSU/2uBShzoM72Y6GYySdfT X+b0mUKcTsBaptR7z8ppoQussccL1KcII4u6gREEdiByiP3aoL2ANNlOmhIELxwT qFivhUkQp8mVibhp7LeajWT2G5hLDgUS0VbKusO7E3+W/aBKUIc5ZQljdoLO1BG2 gYsXqux3/JLM8kDg4vGFgZe5RO4C8jfhKArEj+u4XBdX0dmrBtAVcR/rislkiHQz hPN/DIsmAUWAgmMrYKIcOdzgs27Kk+kReVIZwecXxJgeBLmzSJOo+qfVWQkLNdaC gSekVBfmOr+pG3te+BWecJnYtqAgVeMOTnIenuGolVex5oiWU9TyPeMTSlCCeOwb 2uGGuoClfCi5J1fpAS9NBTsCvdPEUswV/FksjqVoI5EYAe/lTKI9ddKFRPg8s0VE rS8WZDPu857CEIq77n1m+jatN0rLFu2BVzNKWUcAFNHKaUQtqwxMyVQISLwMqeiA aL8RQvEE0EfqKPUns0kc7hCATsgxLNQ30c9Jv2UgOI+q6VfivFC6Pj6uJCw615Z/ 01aQtuI7bK6KHocYEalJCND4Rf6ka4UhrKdkzS59wBmAdtp6mFgmspMpSA3YirS2 1AIXneiSB/+ZShifs7LD7ko+EiNxUpVfHPBct3H8U6TzuaP9OdIBimdw9vtecbOj 2eUJ2JnML78DUGO/iyhF =h+Y9 -----END PGP SIGNATURE----- Merge tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci Pull PCI fixes from Bjorn Helgaas: "Power management: - PCI/PM: Fix proc config reg access for D3cold and bridge suspending - PCI/PM: Resume device before shutdown - PCI/PM: Fix deadlock when unbinding device if parent in D3cold Hotplug: - PCI/portdrv: Don't create hotplug slots unless port supports hotplug" * tag '3.7-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: PCI/portdrv: Don't create hotplug slots unless port supports hotplug PCI/PM: Fix proc config reg access for D3cold and bridge suspending PCI/PM: Resume device before shutdown PCI/PM: Fix deadlock when unbinding device if parent in D3cold
This commit is contained in:
commit
63d4ec8731
8 changed files with 62 additions and 52 deletions
|
@ -320,10 +320,7 @@ void pci_walk_bus(struct pci_bus *top, int (*cb)(struct pci_dev *, void *),
|
||||||
} else
|
} else
|
||||||
next = dev->bus_list.next;
|
next = dev->bus_list.next;
|
||||||
|
|
||||||
/* Run device routines with the device locked */
|
|
||||||
device_lock(&dev->dev);
|
|
||||||
retval = cb(dev, userdata);
|
retval = cb(dev, userdata);
|
||||||
device_unlock(&dev->dev);
|
|
||||||
if (retval)
|
if (retval)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -398,6 +398,8 @@ static void pci_device_shutdown(struct device *dev)
|
||||||
struct pci_dev *pci_dev = to_pci_dev(dev);
|
struct pci_dev *pci_dev = to_pci_dev(dev);
|
||||||
struct pci_driver *drv = pci_dev->driver;
|
struct pci_driver *drv = pci_dev->driver;
|
||||||
|
|
||||||
|
pm_runtime_resume(dev);
|
||||||
|
|
||||||
if (drv && drv->shutdown)
|
if (drv && drv->shutdown)
|
||||||
drv->shutdown(pci_dev);
|
drv->shutdown(pci_dev);
|
||||||
pci_msi_shutdown(pci_dev);
|
pci_msi_shutdown(pci_dev);
|
||||||
|
@ -408,16 +410,6 @@ static void pci_device_shutdown(struct device *dev)
|
||||||
* continue to do DMA
|
* continue to do DMA
|
||||||
*/
|
*/
|
||||||
pci_disable_device(pci_dev);
|
pci_disable_device(pci_dev);
|
||||||
|
|
||||||
/*
|
|
||||||
* Devices may be enabled to wake up by runtime PM, but they need not
|
|
||||||
* be supposed to wake up the system from its "power off" state (e.g.
|
|
||||||
* ACPI S5). Therefore disable wakeup for all devices that aren't
|
|
||||||
* supposed to wake up the system at this point. The state argument
|
|
||||||
* will be ignored by pci_enable_wake().
|
|
||||||
*/
|
|
||||||
if (!device_may_wakeup(dev))
|
|
||||||
pci_enable_wake(pci_dev, PCI_UNKNOWN, false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
|
|
|
@ -458,40 +458,6 @@ boot_vga_show(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
}
|
}
|
||||||
struct device_attribute vga_attr = __ATTR_RO(boot_vga);
|
struct device_attribute vga_attr = __ATTR_RO(boot_vga);
|
||||||
|
|
||||||
static void
|
|
||||||
pci_config_pm_runtime_get(struct pci_dev *pdev)
|
|
||||||
{
|
|
||||||
struct device *dev = &pdev->dev;
|
|
||||||
struct device *parent = dev->parent;
|
|
||||||
|
|
||||||
if (parent)
|
|
||||||
pm_runtime_get_sync(parent);
|
|
||||||
pm_runtime_get_noresume(dev);
|
|
||||||
/*
|
|
||||||
* pdev->current_state is set to PCI_D3cold during suspending,
|
|
||||||
* so wait until suspending completes
|
|
||||||
*/
|
|
||||||
pm_runtime_barrier(dev);
|
|
||||||
/*
|
|
||||||
* Only need to resume devices in D3cold, because config
|
|
||||||
* registers are still accessible for devices suspended but
|
|
||||||
* not in D3cold.
|
|
||||||
*/
|
|
||||||
if (pdev->current_state == PCI_D3cold)
|
|
||||||
pm_runtime_resume(dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
pci_config_pm_runtime_put(struct pci_dev *pdev)
|
|
||||||
{
|
|
||||||
struct device *dev = &pdev->dev;
|
|
||||||
struct device *parent = dev->parent;
|
|
||||||
|
|
||||||
pm_runtime_put(dev);
|
|
||||||
if (parent)
|
|
||||||
pm_runtime_put_sync(parent);
|
|
||||||
}
|
|
||||||
|
|
||||||
static ssize_t
|
static ssize_t
|
||||||
pci_read_config(struct file *filp, struct kobject *kobj,
|
pci_read_config(struct file *filp, struct kobject *kobj,
|
||||||
struct bin_attribute *bin_attr,
|
struct bin_attribute *bin_attr,
|
||||||
|
|
|
@ -1858,6 +1858,38 @@ bool pci_dev_run_wake(struct pci_dev *dev)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(pci_dev_run_wake);
|
EXPORT_SYMBOL_GPL(pci_dev_run_wake);
|
||||||
|
|
||||||
|
void pci_config_pm_runtime_get(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
struct device *dev = &pdev->dev;
|
||||||
|
struct device *parent = dev->parent;
|
||||||
|
|
||||||
|
if (parent)
|
||||||
|
pm_runtime_get_sync(parent);
|
||||||
|
pm_runtime_get_noresume(dev);
|
||||||
|
/*
|
||||||
|
* pdev->current_state is set to PCI_D3cold during suspending,
|
||||||
|
* so wait until suspending completes
|
||||||
|
*/
|
||||||
|
pm_runtime_barrier(dev);
|
||||||
|
/*
|
||||||
|
* Only need to resume devices in D3cold, because config
|
||||||
|
* registers are still accessible for devices suspended but
|
||||||
|
* not in D3cold.
|
||||||
|
*/
|
||||||
|
if (pdev->current_state == PCI_D3cold)
|
||||||
|
pm_runtime_resume(dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
void pci_config_pm_runtime_put(struct pci_dev *pdev)
|
||||||
|
{
|
||||||
|
struct device *dev = &pdev->dev;
|
||||||
|
struct device *parent = dev->parent;
|
||||||
|
|
||||||
|
pm_runtime_put(dev);
|
||||||
|
if (parent)
|
||||||
|
pm_runtime_put_sync(parent);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pci_pm_init - Initialize PM functions of given PCI device
|
* pci_pm_init - Initialize PM functions of given PCI device
|
||||||
* @dev: PCI device to handle.
|
* @dev: PCI device to handle.
|
||||||
|
|
|
@ -72,6 +72,8 @@ extern void pci_disable_enabled_device(struct pci_dev *dev);
|
||||||
extern int pci_finish_runtime_suspend(struct pci_dev *dev);
|
extern int pci_finish_runtime_suspend(struct pci_dev *dev);
|
||||||
extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign);
|
extern int __pci_pme_wakeup(struct pci_dev *dev, void *ign);
|
||||||
extern void pci_wakeup_bus(struct pci_bus *bus);
|
extern void pci_wakeup_bus(struct pci_bus *bus);
|
||||||
|
extern void pci_config_pm_runtime_get(struct pci_dev *dev);
|
||||||
|
extern void pci_config_pm_runtime_put(struct pci_dev *dev);
|
||||||
extern void pci_pm_init(struct pci_dev *dev);
|
extern void pci_pm_init(struct pci_dev *dev);
|
||||||
extern void platform_pci_wakeup_init(struct pci_dev *dev);
|
extern void platform_pci_wakeup_init(struct pci_dev *dev);
|
||||||
extern void pci_allocate_cap_save_buffers(struct pci_dev *dev);
|
extern void pci_allocate_cap_save_buffers(struct pci_dev *dev);
|
||||||
|
|
|
@ -213,6 +213,7 @@ static int report_error_detected(struct pci_dev *dev, void *data)
|
||||||
struct aer_broadcast_data *result_data;
|
struct aer_broadcast_data *result_data;
|
||||||
result_data = (struct aer_broadcast_data *) data;
|
result_data = (struct aer_broadcast_data *) data;
|
||||||
|
|
||||||
|
device_lock(&dev->dev);
|
||||||
dev->error_state = result_data->state;
|
dev->error_state = result_data->state;
|
||||||
|
|
||||||
if (!dev->driver ||
|
if (!dev->driver ||
|
||||||
|
@ -231,12 +232,14 @@ static int report_error_detected(struct pci_dev *dev, void *data)
|
||||||
dev->driver ?
|
dev->driver ?
|
||||||
"no AER-aware driver" : "no driver");
|
"no AER-aware driver" : "no driver");
|
||||||
}
|
}
|
||||||
return 0;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
err_handler = dev->driver->err_handler;
|
err_handler = dev->driver->err_handler;
|
||||||
vote = err_handler->error_detected(dev, result_data->state);
|
vote = err_handler->error_detected(dev, result_data->state);
|
||||||
result_data->result = merge_result(result_data->result, vote);
|
result_data->result = merge_result(result_data->result, vote);
|
||||||
|
out:
|
||||||
|
device_unlock(&dev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -247,14 +250,17 @@ static int report_mmio_enabled(struct pci_dev *dev, void *data)
|
||||||
struct aer_broadcast_data *result_data;
|
struct aer_broadcast_data *result_data;
|
||||||
result_data = (struct aer_broadcast_data *) data;
|
result_data = (struct aer_broadcast_data *) data;
|
||||||
|
|
||||||
|
device_lock(&dev->dev);
|
||||||
if (!dev->driver ||
|
if (!dev->driver ||
|
||||||
!dev->driver->err_handler ||
|
!dev->driver->err_handler ||
|
||||||
!dev->driver->err_handler->mmio_enabled)
|
!dev->driver->err_handler->mmio_enabled)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
err_handler = dev->driver->err_handler;
|
err_handler = dev->driver->err_handler;
|
||||||
vote = err_handler->mmio_enabled(dev);
|
vote = err_handler->mmio_enabled(dev);
|
||||||
result_data->result = merge_result(result_data->result, vote);
|
result_data->result = merge_result(result_data->result, vote);
|
||||||
|
out:
|
||||||
|
device_unlock(&dev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,14 +271,17 @@ static int report_slot_reset(struct pci_dev *dev, void *data)
|
||||||
struct aer_broadcast_data *result_data;
|
struct aer_broadcast_data *result_data;
|
||||||
result_data = (struct aer_broadcast_data *) data;
|
result_data = (struct aer_broadcast_data *) data;
|
||||||
|
|
||||||
|
device_lock(&dev->dev);
|
||||||
if (!dev->driver ||
|
if (!dev->driver ||
|
||||||
!dev->driver->err_handler ||
|
!dev->driver->err_handler ||
|
||||||
!dev->driver->err_handler->slot_reset)
|
!dev->driver->err_handler->slot_reset)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
err_handler = dev->driver->err_handler;
|
err_handler = dev->driver->err_handler;
|
||||||
vote = err_handler->slot_reset(dev);
|
vote = err_handler->slot_reset(dev);
|
||||||
result_data->result = merge_result(result_data->result, vote);
|
result_data->result = merge_result(result_data->result, vote);
|
||||||
|
out:
|
||||||
|
device_unlock(&dev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -280,15 +289,18 @@ static int report_resume(struct pci_dev *dev, void *data)
|
||||||
{
|
{
|
||||||
const struct pci_error_handlers *err_handler;
|
const struct pci_error_handlers *err_handler;
|
||||||
|
|
||||||
|
device_lock(&dev->dev);
|
||||||
dev->error_state = pci_channel_io_normal;
|
dev->error_state = pci_channel_io_normal;
|
||||||
|
|
||||||
if (!dev->driver ||
|
if (!dev->driver ||
|
||||||
!dev->driver->err_handler ||
|
!dev->driver->err_handler ||
|
||||||
!dev->driver->err_handler->resume)
|
!dev->driver->err_handler->resume)
|
||||||
return 0;
|
goto out;
|
||||||
|
|
||||||
err_handler = dev->driver->err_handler;
|
err_handler = dev->driver->err_handler;
|
||||||
err_handler->resume(dev);
|
err_handler->resume(dev);
|
||||||
|
out:
|
||||||
|
device_unlock(&dev->dev);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -272,7 +272,8 @@ static int get_port_device_capability(struct pci_dev *dev)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Hot-Plug Capable */
|
/* Hot-Plug Capable */
|
||||||
if (cap_mask & PCIE_PORT_SERVICE_HP) {
|
if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
|
||||||
|
dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
|
||||||
pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
|
pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, ®32);
|
||||||
if (reg32 & PCI_EXP_SLTCAP_HPC) {
|
if (reg32 & PCI_EXP_SLTCAP_HPC) {
|
||||||
services |= PCIE_PORT_SERVICE_HP;
|
services |= PCIE_PORT_SERVICE_HP;
|
||||||
|
|
|
@ -76,6 +76,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
|
||||||
if (!access_ok(VERIFY_WRITE, buf, cnt))
|
if (!access_ok(VERIFY_WRITE, buf, cnt))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
pci_config_pm_runtime_get(dev);
|
||||||
|
|
||||||
if ((pos & 1) && cnt) {
|
if ((pos & 1) && cnt) {
|
||||||
unsigned char val;
|
unsigned char val;
|
||||||
pci_user_read_config_byte(dev, pos, &val);
|
pci_user_read_config_byte(dev, pos, &val);
|
||||||
|
@ -121,6 +123,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
|
||||||
cnt--;
|
cnt--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pci_config_pm_runtime_put(dev);
|
||||||
|
|
||||||
*ppos = pos;
|
*ppos = pos;
|
||||||
return nbytes;
|
return nbytes;
|
||||||
}
|
}
|
||||||
|
@ -146,6 +150,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
|
||||||
if (!access_ok(VERIFY_READ, buf, cnt))
|
if (!access_ok(VERIFY_READ, buf, cnt))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
pci_config_pm_runtime_get(dev);
|
||||||
|
|
||||||
if ((pos & 1) && cnt) {
|
if ((pos & 1) && cnt) {
|
||||||
unsigned char val;
|
unsigned char val;
|
||||||
__get_user(val, buf);
|
__get_user(val, buf);
|
||||||
|
@ -191,6 +197,8 @@ proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, lof
|
||||||
cnt--;
|
cnt--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pci_config_pm_runtime_put(dev);
|
||||||
|
|
||||||
*ppos = pos;
|
*ppos = pos;
|
||||||
i_size_write(ino, dp->size);
|
i_size_write(ino, dp->size);
|
||||||
return nbytes;
|
return nbytes;
|
||||||
|
|
Loading…
Reference in a new issue