Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Warn user if cpu is ignored.
  [SPARC64]: Fix lockdep, particularly on SMP.
  [SPARC64]: Update defconfig.

6 files changed, 73 insertions, 39 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 68338a601f70..7d07297db878 100644
--- a/arch/sparc64/defconfig
+++ b/arch/sparc64/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.23-rc1
-# Sun Jul 22 19:24:37 2007
+# Linux kernel version: 2.6.23-rc6
+# Sun Sep 16 09:52:11 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -32,15 +32,11 @@ CONFIG_HZ=100
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 
 #
-# Code maturity level options
+# General setup
 #
 CONFIG_EXPERIMENTAL=y
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SWAP=y
@@ -555,6 +551,7 @@ CONFIG_E1000_NAPI=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 CONFIG_TIGON3=m
 CONFIG_BNX2=m
@@ -809,6 +806,7 @@ CONFIG_HWMON=y
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_SMSC47M192 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_THMC50 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_VT1211 is not set
 # CONFIG_SENSORS_VT8231 is not set
@@ -1162,10 +1160,6 @@ CONFIG_USB_STORAGE=m
 # CONFIG_MMC is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_INFINIBAND is not set
-
-#
-# Real Time Clock
-#
 # CONFIG_RTC_CLASS is not set
 
 #
diff --git a/arch/sparc64/kernel/head.S b/arch/sparc64/kernel/head.S
index 63144ad476f6..c4147ad8677b 100644
--- a/arch/sparc64/kernel/head.S
+++ b/arch/sparc64/kernel/head.S
@@ -98,7 +98,7 @@ sparc64_boot:
         .globl  prom_boot_mapped_pc, prom_boot_mapping_mode
         .globl  prom_boot_mapping_phys_high, prom_boot_mapping_phys_low
         .globl  prom_compatible_name, prom_cpu_path, prom_cpu_compatible
-        .globl  is_sun4v, sun4v_chip_type
+        .globl  is_sun4v, sun4v_chip_type, prom_set_trap_table_name
 prom_peer_name:
         .asciz  "peer"
 prom_compatible_name:
@@ -121,6 +121,8 @@ prom_map_name:
         .asciz  "map"
 prom_unmap_name:
         .asciz  "unmap"
+prom_set_trap_table_name:
+        .asciz  "SUNW,set-trap-table"
 prom_sun4v_name:
         .asciz  "sun4v"
 prom_niagara_prefix:
@@ -691,15 +693,38 @@ setup_trap_table:
         sethi   %hi(kern_base), %g3
         ldx     [%g3 + %lo(kern_base)], %g3
         add     %g2, %g3, %o1
+        sethi   %hi(sparc64_ttable_tl0), %o0
 
-        call    prom_set_trap_table_sun4v
-         sethi  %hi(sparc64_ttable_tl0), %o0
+        set     prom_set_trap_table_name, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x00]
+        mov     2, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x08]
+        mov     0, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x10]
+        stx     %o0, [%sp + 2047 + 128 + 0x18]
+        stx     %o1, [%sp + 2047 + 128 + 0x20]
+        sethi   %hi(p1275buf), %g2
+        or      %g2, %lo(p1275buf), %g2
+        ldx     [%g2 + 0x08], %o1
+        call    %o1
+         add    %sp, (2047 + 128), %o0
 
         ba,pt   %xcc, 2f
          nop
 
-1:      call    prom_set_trap_table
-         sethi  %hi(sparc64_ttable_tl0), %o0
+1:      sethi   %hi(sparc64_ttable_tl0), %o0
+        set     prom_set_trap_table_name, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x00]
+        mov     1, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x08]
+        mov     0, %g2
+        stx     %g2, [%sp + 2047 + 128 + 0x10]
+        stx     %o0, [%sp + 2047 + 128 + 0x18]
+        sethi   %hi(p1275buf), %g2
+        or      %g2, %lo(p1275buf), %g2
+        ldx     [%g2 + 0x08], %o1
+        call    %o1
+         add    %sp, (2047 + 128), %o0
 
         /* Start using proper page size encodings in ctx register.  */
 2:      sethi   %hi(sparc64_kern_pri_context), %g3
diff --git a/arch/sparc64/kernel/mdesc.c b/arch/sparc64/kernel/mdesc.c
index 9f22e4ff6015..856659bb1311 100644
--- a/arch/sparc64/kernel/mdesc.c
+++ b/arch/sparc64/kernel/mdesc.c
@@ -777,8 +777,12 @@ void __devinit mdesc_fill_in_cpu_data(cpumask_t mask)
                 cpuid = *id;
 
 #ifdef CONFIG_SMP
-                if (cpuid >= NR_CPUS)
+                if (cpuid >= NR_CPUS) {
+                        printk(KERN_WARNING "Ignoring CPU %d which is "
+                               ">= NR_CPUS (%d)\n",
+                               cpuid, NR_CPUS);
                         continue;
+                }
                 if (!cpu_isset(cpuid, mask))
                         continue;
 #else
diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index d1a78c976cef..0614dff63d7c 100644
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1583,8 +1583,12 @@ static void __init of_fill_in_cpu_data(void)
                 ncpus_probed++;
 
 #ifdef CONFIG_SMP
-                if (cpuid >= NR_CPUS)
+                if (cpuid >= NR_CPUS) {
+                        printk(KERN_WARNING "Ignoring CPU %d which is "
+                               ">= NR_CPUS (%d)\n",
+                               cpuid, NR_CPUS);
                         continue;
+                }
 #else
                 /* On uniprocessor we only want the values for the
                  * real physical cpu the kernel booted onto, however
diff --git a/arch/sparc64/kernel/trampoline.S b/arch/sparc64/kernel/trampoline.S
index 9533a25ce5d2..04e81dda13d0 100644
--- a/arch/sparc64/kernel/trampoline.S
+++ b/arch/sparc64/kernel/trampoline.S
@@ -345,7 +345,7 @@ after_lock_tlb:
         sethi           %hi(tramp_stack), %g1
         or              %g1, %lo(tramp_stack), %g1
         add             %g1, TRAMP_STACK_SIZE, %g1
-        sub             %g1, STACKFRAME_SZ + STACK_BIAS, %sp
+        sub             %g1, STACKFRAME_SZ + STACK_BIAS + 256, %sp
         mov             0, %fp
 
         /* Put garbage in these registers to trap any access to them.  */
@@ -411,15 +411,38 @@ after_lock_tlb:
         sethi           %hi(kern_base), %g3
         ldx             [%g3 + %lo(kern_base)], %g3
         add             %g2, %g3, %o1
+        sethi           %hi(sparc64_ttable_tl0), %o0
 
-        call            prom_set_trap_table_sun4v
-         sethi          %hi(sparc64_ttable_tl0), %o0
+        set             prom_set_trap_table_name, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             2, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        stx             %o1, [%sp + 2047 + 128 + 0x20]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
 
         ba,pt           %xcc, 2f
          nop
 
-1:      call            prom_set_trap_table
-         sethi          %hi(sparc64_ttable_tl0), %o0
+1:      sethi           %hi(sparc64_ttable_tl0), %o0
+        set             prom_set_trap_table_name, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x00]
+        mov             1, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x08]
+        mov             0, %g2
+        stx             %g2, [%sp + 2047 + 128 + 0x10]
+        stx             %o0, [%sp + 2047 + 128 + 0x18]
+        sethi           %hi(p1275buf), %g2
+        or              %g2, %lo(p1275buf), %g2
+        ldx             [%g2 + 0x08], %o1
+        call            %o1
+         add            %sp, (2047 + 128), %o0
 
 2:      ldx             [%l0], %g6
         ldx             [%g6 + TI_TASK], %g4
diff --git a/arch/sparc64/prom/misc.c b/arch/sparc64/prom/misc.c
index 68c83ad04ad9..bbec7522826c 100644
--- a/arch/sparc64/prom/misc.c
+++ b/arch/sparc64/prom/misc.c
@@ -143,22 +143,6 @@ unsigned char prom_get_idprom(char *idbuf, int num_bytes)
         return 0xff;
 }
 
-/* Install Linux trap table so PROM uses that instead of its own. */
-void prom_set_trap_table(unsigned long tba)
-{
-        p1275_cmd("SUNW,set-trap-table",
-                  (P1275_ARG(0, P1275_ARG_IN_64B) |
-                   P1275_INOUT(1, 0)), tba);
-}
-
-void prom_set_trap_table_sun4v(unsigned long tba, unsigned long mmfsa)
-{
-        p1275_cmd("SUNW,set-trap-table",
-                  (P1275_ARG(0, P1275_ARG_IN_64B) |
-                   P1275_ARG(1, P1275_ARG_IN_64B) |
-                   P1275_INOUT(2, 0)), tba, mmfsa);
-}
-
 int prom_get_mmu_ihandle(void)
 {
         int node, ret;