fast-reboot: move pci_reset error handling into fast-reboot code

pci_reset() currently does a platform reboot if it fails. It
should not know about fast-reboot at this level, so instead have
it return an error, and the fast reboot caller will do the
platform reboot.

The code essentially does the same thing, but flexibility is
improved. Ideally the fast reboot code should perform pci_reset
and all such fail-able operations before the CPU resets itself
and destroys its own stack. That's not the case now, but that
should be the goal.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Acked-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>

1 files changed, 5 insertions, 6 deletions

diff --git a/core/pci.c b/core/pci.c
index 0809521..494a33a 100644
--- a/core/pci.c
+++ b/core/pci.c
@@ -1668,7 +1668,7 @@ static void __pci_reset(struct list_head *list)
 	}
 }
 
-void pci_reset(void)
+int64_t pci_reset(void)
 {
 	unsigned int i;
 	struct pci_slot *slot;
@@ -1695,11 +1695,9 @@ void pci_reset(void)
 				rc = slot->ops.run_sm(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) {}
+				PCIERR(phb, 0, "Complete reset failed "
+				               "(rc=%lld)\n", rc);
+				return rc;
 			}
 		}
 
@@ -1710,6 +1708,7 @@ void pci_reset(void)
 	/* Re-Initialize all discovered PCI slots */
 	pci_init_slots();
 
+	return 0;
 }
 
 static void pci_do_jobs(void (*fn)(void *))