PCI/PM: Add pcie_wait_for_link_delay() (4827d638) · Commits · 戴 / test

drivers/pci/pci.c

+18 −3

Original line number	Diff line number	Diff line
		@@ -4586,14 +4586,17 @@ static int pci_pm_reset(struct pci_dev *dev, int probe)

		return pci_dev_wait(dev, "PM D3hot->D0", PCIE_RESET_READY_POLL_MS);
		}

		/**
		* pcie_wait_for_link - Wait until link is active or inactive
		* pcie_wait_for_link_delay - Wait until link is active or inactive
		* @pdev: Bridge device
		* @active: waiting for active or inactive?
		* @delay: Delay to wait after link has become active (in ms)
		*
		* Use this to wait till link becomes active or inactive.
		*/
		bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
		static bool pcie_wait_for_link_delay(struct pci_dev *pdev, bool active,
		int delay)
		{
		int timeout = 1000;
		bool ret;
		@@ -4630,13 +4633,25 @@ bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
		timeout -= 10;
		}
		if (active && ret)
		msleep(100);
		msleep(delay);
		else if (ret != active)
		pci_info(pdev, "Data Link Layer Link Active not %s in 1000 msec\n",
		active ? "set" : "cleared");
		return ret == active;
		}

		/**
		* pcie_wait_for_link - Wait until link is active or inactive
		* @pdev: Bridge device
		* @active: waiting for active or inactive?
		*
		* Use this to wait till link becomes active or inactive.
		*/
		bool pcie_wait_for_link(struct pci_dev *pdev, bool active)
		{
		return pcie_wait_for_link_delay(pdev, active, 100);
		}

		void pci_reset_secondary_bus(struct pci_dev *dev)
		{
		u16 ctrl;