summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pci.c
diff options
context:
space:
mode:
authorGavin Shan <gwshan@linux.vnet.ibm.com>2014-06-19 03:22:44 -0400
committerBjorn Helgaas <bhelgaas@google.com>2014-07-03 18:39:14 -0400
commit9e33002fd1791bcab626b19301670484c1cb6d50 (patch)
treec082812cab6251a1653550a81870a0fdad0bf627 /drivers/pci/pci.c
parent7171511eaec5bf23fb06078f59784a3a0626b38f (diff)
PCI: Make resetting secondary bus logic common
Commit d92a208d086 ("powerpc/pci: Mask linkDown on resetting PCI bus") implemented same logic (resetting PCI secondary bus by bridge's config register PCI_BRIDGE_CTL_BUS_RESET) in PCI core and arch-dependent code. To avoid the duplication, move the logic to pci_reset_secondary_bus(). That commit did not declare the pcibios_reset_secondary_bus() interface in linux/include/pci.h. Add the declaration. No functional change. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r--drivers/pci/pci.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 63a54a340863..758f1d88f28d 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3193,7 +3193,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe)
3193 return 0; 3193 return 0;
3194} 3194}
3195 3195
3196void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) 3196void pci_reset_secondary_bus(struct pci_dev *dev)
3197{ 3197{
3198 u16 ctrl; 3198 u16 ctrl;
3199 3199
@@ -3219,6 +3219,11 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev)
3219 ssleep(1); 3219 ssleep(1);
3220} 3220}
3221 3221
3222void __weak pcibios_reset_secondary_bus(struct pci_dev *dev)
3223{
3224 pci_reset_secondary_bus(dev);
3225}
3226
3222/** 3227/**
3223 * pci_reset_bridge_secondary_bus - Reset the secondary bus on a PCI bridge. 3228 * pci_reset_bridge_secondary_bus - Reset the secondary bus on a PCI bridge.
3224 * @dev: Bridge device 3229 * @dev: Bridge device