Commit 5f2554cc authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/error' 

- Make domain/bus/dev/fn format in AER messages match pci_name() format
  (Yicong Yang)

* pci/error:
  Documentation: PCI: Fix typo in pci-error-recovery.rst
  PCI/AER: Use consistent format when printing PCI device
parents 104eb9d8 8e323798

Documentation/PCI/pci-error-recovery.rst

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ and let the driver restart normal I/O processing. 
A driver can still return a critical failure for this function if

it can't get the device operational after reset.  If the platform

previously tried a soft reset, it might now try a hard reset (power

cycle) and then call slot_reset() again.  It the device still can't

cycle) and then call slot_reset() again.  If the device still can't

be recovered, there is nothing more that can be done;  the platform

will typically report a "permanent failure" in such a case.  The

device will be considered "dead" in this case.

drivers/pci/pcie/aer.c

+2 −2
Original line number Diff line number Diff line
@@ -983,7 +983,7 @@ static void aer_recover_work_func(struct work_struct *work) 
		pdev = pci_get_domain_bus_and_slot(entry.domain, entry.bus,

						   entry.devfn);

		if (!pdev) {

			pr_err("AER recover: Can not find pci_dev for %04x:%02x:%02x:%x\n",

			pr_err("no pci_dev for %04x:%02x:%02x.%x\n",

			       entry.domain, entry.bus,

			       PCI_SLOT(entry.devfn), PCI_FUNC(entry.devfn));

			continue;
@@ -1022,7 +1022,7 @@ void aer_recover_queue(int domain, unsigned int bus, unsigned int devfn, 
				 &aer_recover_ring_lock))

		schedule_work(&aer_recover_work);

	else

		pr_err("AER recover: Buffer overflow when recovering AER for %04x:%02x:%02x:%x\n",

		pr_err("buffer overflow in recovery for %04x:%02x:%02x.%x\n",

		       domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));

}

EXPORT_SYMBOL_GPL(aer_recover_queue);