powerpc/64: Call setup_barrier_nospec() from setup_arch()

[mirror_ubuntu-bionic-kernel.git] / arch / powerpc / platforms / powernv / setup.c

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index fc0412d5914965a342c0c38d9fc4ef001cf2f50c..be7eac602402102309f9103186a2a75eb8e4676f 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -217,17 +217,41 @@ static void pnv_prepare_going_down(void)
 
 static void  __noreturn pnv_restart(char *cmd)
 {
-       long rc = OPAL_BUSY;
+       long rc;
 
        pnv_prepare_going_down();
 
-       while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
-               rc = opal_cec_reboot();
-               if (rc == OPAL_BUSY_EVENT)
-                       opal_poll_events(NULL);
+       do {
+               if (!cmd)
+                       rc = opal_cec_reboot();
+               else if (strcmp(cmd, "full") == 0)
+                       rc = opal_cec_reboot2(OPAL_REBOOT_FULL_IPL, NULL);
                else
+                       rc = OPAL_UNSUPPORTED;
+
+               if (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT) {
+                       /* Opal is busy wait for some time and retry */
+                       opal_poll_events(NULL);
                        mdelay(10);
-       }
+
+               } else  if (cmd && rc) {
+                       /* Unknown error while issuing reboot */
+                       if (rc == OPAL_UNSUPPORTED)
+                               pr_err("Unsupported '%s' reboot.\n", cmd);
+                       else
+                               pr_err("Unable to issue '%s' reboot. Err=%ld\n",
+                                      cmd, rc);
+                       pr_info("Forcing a cec-reboot\n");
+                       cmd = NULL;
+                       rc = OPAL_BUSY;
+
+               } else if (rc != OPAL_SUCCESS) {
+                       /* Unknown error while issuing cec-reboot */
+                       pr_err("Unable to reboot. Err=%ld\n", rc);
+               }
+
+       } while (rc == OPAL_BUSY || rc == OPAL_BUSY_EVENT);
+
        for (;;)
                opal_poll_events(NULL);
 }
@@ -362,15 +386,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
 #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
 static unsigned long pnv_memory_block_size(void)
 {
-       /*
-        * We map the kernel linear region with 1GB large pages on radix. For
-        * memory hot unplug to work our memory block size must be at least
-        * this size.
-        */
-       if (radix_enabled())
-               return 1UL * 1024 * 1024 * 1024;
-       else
-               return 256UL * 1024 * 1024;
+       return 256UL * 1024 * 1024;
 }
 #endif