From a1eba9d29d17ff44fca1293b071023a9fbf4b938 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan Date: Fri, 27 Jan 2017 18:33:14 +1100 Subject: [PATCH] fast-reboot: creset PHBs on fast reboot On fast reboot, perform a creset of all PHBs. This ensures that any PHBs that are fenced will be working after the reboot. A later patch will disable CAPI mode during cresets - as such, PHBs in CAPI mode will return to regular PCIe mode during a fast reboot. Signed-off-by: Andrew Donnellan Signed-off-by: Stewart Smith --- core/pci.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/core/pci.c b/core/pci.c index 4e417c19e2a4..ecb94c2d4bf9 100644 --- a/core/pci.c +++ b/core/pci.c @@ -1528,6 +1528,8 @@ static void __pci_reset(struct list_head *list) void pci_reset(void) { unsigned int i; + struct pci_slot *slot; + int64_t rc; prlog(PR_NOTICE, "PCI: Clearing all devices...\n"); @@ -1539,6 +1541,25 @@ void pci_reset(void) if (!phb) continue; __pci_reset(&phb->devices); + + slot = phb->slot; + if (!slot || !slot->ops.creset) { + PCINOTICE(phb, 0, "Can't do complete reset\n"); + } else { + rc = slot->ops.creset(slot); + while (rc > 0) { + time_wait(rc); + rc = slot->ops.poll(slot); + } + if (rc < 0) { + PCIERR(phb, 0, "Complete reset failed, aborting" + "fast reboot (rc=%lld)\n", rc); + if (platform.cec_reboot) + platform.cec_reboot(); + while (true) {} + } + } + if (phb->ops->ioda_reset) phb->ops->ioda_reset(phb, true); }