Commit f0277dce authored Jun 30, 2013 by Linus Torvalds

powerpc

Pull another powerpc fix from Benjamin Herrenschmidt:
 "I mentioned that while we had fixed the kernel crashes, EEH error
  recovery didn't always recover...  It appears that I had a fix for
  that already in powerpc-next (with a stable CC).

  I cherry-picked it today and did a few tests and it seems that things
  now work quite well.  The patch is also pretty simple, so I see no
  reason to wait before merging it."

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/eeh: Fix fetching bus for single-dev-PE

parents 4b483802 ea461abf

arch/powerpc/platforms/pseries/eeh_pe.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -639,7 +639,8 @@ struct pci_bus eeh_pe_bus_get(struct eeh_pe pe)

	if (pe->type & EEH_PE_PHB) {		if (pe->type & EEH_PE_PHB) {
	bus = pe->phb->bus;		bus = pe->phb->bus;
	} else if (pe->type & EEH_PE_BUS) {		} else if (pe->type & EEH_PE_BUS \|\|
			pe->type & EEH_PE_DEVICE) {
	edev = list_first_entry(&pe->edevs, struct eeh_dev, list);		edev = list_first_entry(&pe->edevs, struct eeh_dev, list);
	pdev = eeh_dev_to_pci_dev(edev);		pdev = eeh_dev_to_pci_dev(edev);
	if (pdev)		if (pdev)