hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Warn on driver probe return value greater than zero
  PCI: Drop warning about drivers that don't use pci_set_master()
  PCI: Workaround missing pci_set_master in pci drivers
  PCI: Update pcie_ports 'auto' behavior for non-ACPI platforms
This commit is contained in:
Bjorn Helgaas 2013-11-06 16:26:48 -07:00
parent 589a1b076f f92d74c1f5
commit c245f24220
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/pci/pci-driver.c
View File

@ -267,11 +267,19 @@ static long local_pci_probe(void *_ddi)
pm_runtime_get_sync(dev); pm_runtime_get_sync(dev);
pci_dev->driver = pci_drv; pci_dev->driver = pci_drv;
rc = pci_drv->probe(pci_dev, ddi->id); rc = pci_drv->probe(pci_dev, ddi->id);
if (rc) { if (!rc)
return rc;
if (rc < 0) {
pci_dev->driver = NULL; pci_dev->driver = NULL;
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
return rc;
} }
return rc; /*
* Probe function should return < 0 for failure, 0 for success
* Treat values > 0 as success, but warn.
*/
dev_warn(dev, "Driver probe function unexpectedly returned %d\n", rc);
return 0;
} }
static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,

6
drivers/pci/pci.c
View File

@ -1155,8 +1155,12 @@ static void pci_enable_bridge(struct pci_dev *dev)
pci_enable_bridge(dev->bus->self); pci_enable_bridge(dev->bus->self);
if (pci_is_enabled(dev)) if (pci_is_enabled(dev)) {
if (!dev->is_busmaster)
pci_set_master(dev);
return; return;
}
retval = pci_enable_device(dev); retval = pci_enable_device(dev);
if (retval) if (retval)
dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n", dev_err(&dev->dev, "Error enabling bridge (%d), continuing\n",

15
drivers/pci/pcie/portdrv_core.c
View File

@ -260,13 +260,14 @@ static int get_port_device_capability(struct pci_dev *dev)
if (pcie_ports_disabled) if (pcie_ports_disabled)
return 0; return 0;
err = pcie_port_platform_notify(dev, &cap_mask); cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP
if (!pcie_ports_auto) { | PCIE_PORT_SERVICE_VC;
cap_mask = PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP if (pci_aer_available())
| PCIE_PORT_SERVICE_VC; cap_mask |= PCIE_PORT_SERVICE_AER;
if (pci_aer_available())
cap_mask |= PCIE_PORT_SERVICE_AER; if (pcie_ports_auto) {
} else if (err) { err = pcie_port_platform_notify(dev, &cap_mask);
if (err)
return 0; return 0;
} }