Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "This is the main pull request for 3.17.  It contains:

   - misc Cavium Octeon, BCM47xx, BCM63xx and Alchemy  updates
   - MIPS ptrace updates and cleanups
   - various fixes that will also go to -stable
   - a number of cleanups and small non-critical fixes.
   - NUMA support for the Loongson 3.
   - more support for MSA
   - support for MAAR
   - various FP enhancements and fixes"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)
  MIPS: jz4740: remove unnecessary null test before debugfs_remove
  MIPS: Octeon: remove unnecessary null test before debugfs_remove_recursive
  MIPS: ZBOOT: implement stack protector in compressed boot phase
  MIPS: mipsreg: remove duplicate MIPS_CONF4_FTLBSETS_SHIFT
  MIPS: Bonito64: remove a duplicate define
  MIPS: Malta: initialise MAARs
  MIPS: Initialise MAARs
  MIPS: detect presence of MAARs
  MIPS: define MAAR register accessors & bits
  MIPS: mark MSA experimental
  MIPS: Don't build MSA support unless it can be used
  MIPS: consistently clear MSA flags when starting & copying threads
  MIPS: 16 byte align MSA vector context
  MIPS: disable preemption whilst initialising MSA
  MIPS: ensure MSA gets disabled during boot
  MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
  MIPS: fix MSA context for tasks which don't use FP first
  MIPS: init upper 64b of vector registers when MSA is first used
  MIPS: save/disable MSA in lose_fpu
  MIPS: preserve scalar FP CSR when switching vector context
  ...

1 files changed, 34 insertions, 28 deletions

diff --git a/drivers/watchdog/octeon-wdt-main.c b/drivers/watchdog/octeon-wdt-main.c
index 4baf2d788920..8453531545df 100644
--- a/drivers/watchdog/octeon-wdt-main.c
+++ b/drivers/watchdog/octeon-wdt-main.c
@@ -145,35 +145,39 @@ static void __init octeon_wdt_build_stage1(void)
 
         uasm_i_mfc0(&p, K0, C0_STATUS);
 #ifdef CONFIG_HOTPLUG_CPU
-        uasm_il_bbit0(&p, &r, K0, ilog2(ST0_NMI), label_enter_bootloader);
+        if (octeon_bootloader_entry_addr)
+                uasm_il_bbit0(&p, &r, K0, ilog2(ST0_NMI),
+                              label_enter_bootloader);
 #endif
         /* Force 64-bit addressing enabled */
         uasm_i_ori(&p, K0, K0, ST0_UX | ST0_SX | ST0_KX);
         uasm_i_mtc0(&p, K0, C0_STATUS);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        uasm_i_mfc0(&p, K0, C0_EBASE);
-        /* Coreid number in K0 */
-        uasm_i_andi(&p, K0, K0, 0xf);
-        /* 8 * coreid in bits 16-31 */
-        uasm_i_dsll_safe(&p, K0, K0, 3 + 16);
-        uasm_i_ori(&p, K0, K0, 0x8001);
-        uasm_i_dsll_safe(&p, K0, K0, 16);
-        uasm_i_ori(&p, K0, K0, 0x0700);
-        uasm_i_drotr_safe(&p, K0, K0, 32);
-        /*
-         * Should result in: 0x8001,0700,0000,8*coreid which is
-         * CVMX_CIU_WDOGX(coreid) - 0x0500
-         *
-         * Now ld K0, CVMX_CIU_WDOGX(coreid)
-         */
-        uasm_i_ld(&p, K0, 0x500, K0);
-        /*
-         * If bit one set handle the NMI as a watchdog event.
-         * otherwise transfer control to bootloader.
-         */
-        uasm_il_bbit0(&p, &r, K0, 1, label_enter_bootloader);
-        uasm_i_nop(&p);
+        if (octeon_bootloader_entry_addr) {
+                uasm_i_mfc0(&p, K0, C0_EBASE);
+                /* Coreid number in K0 */
+                uasm_i_andi(&p, K0, K0, 0xf);
+                /* 8 * coreid in bits 16-31 */
+                uasm_i_dsll_safe(&p, K0, K0, 3 + 16);
+                uasm_i_ori(&p, K0, K0, 0x8001);
+                uasm_i_dsll_safe(&p, K0, K0, 16);
+                uasm_i_ori(&p, K0, K0, 0x0700);
+                uasm_i_drotr_safe(&p, K0, K0, 32);
+                /*
+                 * Should result in: 0x8001,0700,0000,8*coreid which is
+                 * CVMX_CIU_WDOGX(coreid) - 0x0500
+                 *
+                 * Now ld K0, CVMX_CIU_WDOGX(coreid)
+                 */
+                uasm_i_ld(&p, K0, 0x500, K0);
+                /*
+                 * If bit one set handle the NMI as a watchdog event.
+                 * otherwise transfer control to bootloader.
+                 */
+                uasm_il_bbit0(&p, &r, K0, 1, label_enter_bootloader);
+                uasm_i_nop(&p);
+        }
 #endif
 
         /* Clear Dcache so cvmseg works right. */
@@ -194,11 +198,13 @@ static void __init octeon_wdt_build_stage1(void)
         uasm_i_dmfc0(&p, K0, C0_DESAVE);
 
 #ifdef CONFIG_HOTPLUG_CPU
-        uasm_build_label(&l, p, label_enter_bootloader);
-        /* Jump to the bootloader and restore K0 */
-        UASM_i_LA(&p, K0, (long)octeon_bootloader_entry_addr);
-        uasm_i_jr(&p, K0);
-        uasm_i_dmfc0(&p, K0, C0_DESAVE);
+        if (octeon_bootloader_entry_addr) {
+                uasm_build_label(&l, p, label_enter_bootloader);
+                /* Jump to the bootloader and restore K0 */
+                UASM_i_LA(&p, K0, (long)octeon_bootloader_entry_addr);
+                uasm_i_jr(&p, K0);
+                uasm_i_dmfc0(&p, K0, C0_DESAVE);
+        }
 #endif
         uasm_resolve_relocs(relocs, labels);