Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 381634ca authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

PCI: Hide pci_reset_bridge_secondary_bus() from drivers 



Rename pci_reset_bridge_secondary_bus() to pci_bridge_secondary_bus_reset()
and move the declaration from linux/pci.h to drivers/pci.h to be used
internally in PCI directory only.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 409888e0

drivers/pci/hotplug/pciehp_hpc.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ int pciehp_reset_slot(struct slot *slot, int probe) 
	if (pciehp_poll_mode)

		del_timer_sync(&ctrl->poll_timer);



	rc = pci_reset_bridge_secondary_bus(ctrl->pcie->port);

	rc = pci_bridge_secondary_bus_reset(ctrl->pcie->port);



	pcie_capability_write_word(pdev, PCI_EXP_SLTSTA, stat_mask);

	pcie_write_cmd_nowait(ctrl, ctrl_mask, ctrl_mask);

drivers/pci/pci.c

+5 −6
Original line number Diff line number Diff line
@@ -4224,19 +4224,18 @@ void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) 
}



/**

 * pci_reset_bridge_secondary_bus - Reset the secondary bus on a PCI bridge.

 * pci_bridge_secondary_bus_reset - Reset the secondary bus on a PCI bridge.

 * @dev: Bridge device

 *

 * Use the bridge control register to assert reset on the secondary bus.

 * Devices on the secondary bus are left in power-on state.

 */

int pci_reset_bridge_secondary_bus(struct pci_dev *dev)

int pci_bridge_secondary_bus_reset(struct pci_dev *dev)

{

	pcibios_reset_secondary_bus(dev);



	return pci_dev_wait(dev, "bus reset", PCIE_RESET_READY_POLL_MS);

}

EXPORT_SYMBOL_GPL(pci_reset_bridge_secondary_bus);



static int pci_parent_bus_reset(struct pci_dev *dev, int probe)

{
@@ -4253,7 +4252,7 @@ static int pci_parent_bus_reset(struct pci_dev *dev, int probe) 
	if (probe)

		return 0;



	return pci_reset_bridge_secondary_bus(dev->bus->self);

	return pci_bridge_secondary_bus_reset(dev->bus->self);

}



static int pci_reset_hotplug_slot(struct hotplug_slot *hotplug, int probe)
@@ -4860,7 +4859,7 @@ static int pci_bus_reset(struct pci_bus *bus, int probe) 


	might_sleep();



	ret = pci_reset_bridge_secondary_bus(bus->self);

	ret = pci_bridge_secondary_bus_reset(bus->self);



	pci_bus_unlock(bus);
@@ -4924,7 +4923,7 @@ int pci_try_reset_bus(struct pci_bus *bus) 


	if (pci_bus_trylock(bus)) {

		might_sleep();

		rc = pci_reset_bridge_secondary_bus(bus->self);

		rc = pci_bridge_secondary_bus_reset(bus->self);

		pci_bus_unlock(bus);

	} else

		rc = -EAGAIN;

drivers/pci/pci.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ int pci_mmap_fits(struct pci_dev *pdev, int resno, struct vm_area_struct *vmai, 
		  enum pci_mmap_api mmap_api);



int pci_probe_reset_function(struct pci_dev *dev);

int pci_bridge_secondary_bus_reset(struct pci_dev *dev);



/**

 * struct pci_platform_pm_ops - Firmware PM callbacks

drivers/pci/pcie/aer.c

+1 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev) 
	reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;

	pci_write_config_dword(dev, pos + PCI_ERR_ROOT_COMMAND, reg32);



	rc = pci_reset_bridge_secondary_bus(dev);

	rc = pci_bridge_secondary_bus_reset(dev);

	pci_printk(KERN_DEBUG, dev, "Root Port link has been reset\n");



	/* Clear Root Error Status */

drivers/pci/pcie/err.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static pci_ers_result_t default_reset_link(struct pci_dev *dev) 
{

	int rc;



	rc = pci_reset_bridge_secondary_bus(dev);

	rc = pci_bridge_secondary_bus_reset(dev);

	pci_printk(KERN_DEBUG, dev, "downstream link has been reset\n");

	return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;

}