diff options
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 436a76ab4bb1..212c63d780e7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -3179,14 +3179,7 @@ static int pci_pm_reset(struct pci_dev *dev, int probe) | |||
| 3179 | return 0; | 3179 | return 0; |
| 3180 | } | 3180 | } |
| 3181 | 3181 | ||
| 3182 | /** | 3182 | void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) |
| 3183 | * pci_reset_bridge_secondary_bus - Reset the secondary bus on a PCI bridge. | ||
| 3184 | * @dev: Bridge device | ||
| 3185 | * | ||
| 3186 | * Use the bridge control register to assert reset on the secondary bus. | ||
| 3187 | * Devices on the secondary bus are left in power-on state. | ||
| 3188 | */ | ||
| 3189 | void pci_reset_bridge_secondary_bus(struct pci_dev *dev) | ||
| 3190 | { | 3183 | { |
| 3191 | u16 ctrl; | 3184 | u16 ctrl; |
| 3192 | 3185 | ||
| @@ -3211,6 +3204,18 @@ void pci_reset_bridge_secondary_bus(struct pci_dev *dev) | |||
| 3211 | */ | 3204 | */ |
| 3212 | ssleep(1); | 3205 | ssleep(1); |
| 3213 | } | 3206 | } |
| 3207 | |||
| 3208 | /** | ||
| 3209 | * pci_reset_bridge_secondary_bus - Reset the secondary bus on a PCI bridge. | ||
| 3210 | * @dev: Bridge device | ||
| 3211 | * | ||
| 3212 | * Use the bridge control register to assert reset on the secondary bus. | ||
| 3213 | * Devices on the secondary bus are left in power-on state. | ||
| 3214 | */ | ||
| 3215 | void pci_reset_bridge_secondary_bus(struct pci_dev *dev) | ||
| 3216 | { | ||
| 3217 | pcibios_reset_secondary_bus(dev); | ||
| 3218 | } | ||
| 3214 | EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); | 3219 | EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus); |
| 3215 | 3220 | ||
| 3216 | static int pci_parent_bus_reset(struct pci_dev *dev, int probe) | 3221 | static int pci_parent_bus_reset(struct pci_dev *dev, int probe) |
