Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  n2_crypto: Attach on Niagara-T3.
  n2rng: Attach on Niagara-T3.
  sparc: Detect and handle UltraSPARC-T3 cpu types.
  sparc: Don't do expensive hypervisor PCR write unless necessary.
  sparc: Add T3 sun4v cpu type and hypervisor group defines.
  sparc: Don't leave sparc_pmu_type NULL on sun4v.

13 files changed, 95 insertions, 34 deletions

diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index cfa9cd2e5519..64f7a00b3747 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -177,9 +177,11 @@ static inline unsigned int sparc64_elf_hwcap(void)
                 cap |= HWCAP_SPARC_ULTRA3;
         else if (tlb_type == hypervisor) {
                 if (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 ||
-                    sun4v_chip_type == SUN4V_CHIP_NIAGARA2)
+                    sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
+                    sun4v_chip_type == SUN4V_CHIP_NIAGARA3)
                         cap |= HWCAP_SPARC_BLKINIT;
-                if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2)
+                if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
+                    sun4v_chip_type == SUN4V_CHIP_NIAGARA3)
                         cap |= HWCAP_SPARC_N2;
         }
 
diff --git a/arch/sparc/include/asm/hypervisor.h b/arch/sparc/include/asm/hypervisor.h
index 75686409be24..7a5f80df15d0 100644
--- a/arch/sparc/include/asm/hypervisor.h
+++ b/arch/sparc/include/asm/hypervisor.h
@@ -2950,6 +2950,7 @@ extern unsigned long sun4v_ncs_request(unsigned long request,
 #define HV_GRP_N2_CPU                   0x0202
 #define HV_GRP_NIU                      0x0204
 #define HV_GRP_VF_CPU                   0x0205
+#define HV_GRP_KT_CPU                   0x0209
 #define HV_GRP_DIAG                     0x0300
 
 #ifndef __ASSEMBLY__
diff --git a/arch/sparc/include/asm/spitfire.h b/arch/sparc/include/asm/spitfire.h
index f0d0c40c44da..55a17c6efeb8 100644
--- a/arch/sparc/include/asm/spitfire.h
+++ b/arch/sparc/include/asm/spitfire.h
@@ -42,6 +42,7 @@
 #define SUN4V_CHIP_INVALID      0x00
 #define SUN4V_CHIP_NIAGARA1     0x01
 #define SUN4V_CHIP_NIAGARA2     0x02
+#define SUN4V_CHIP_NIAGARA3     0x03
 #define SUN4V_CHIP_UNKNOWN      0xff
 
 #ifndef __ASSEMBLY__
diff --git a/arch/sparc/include/asm/xor_64.h b/arch/sparc/include/asm/xor_64.h
index bee4bf4be3af..9ed6ff679ab7 100644
--- a/arch/sparc/include/asm/xor_64.h
+++ b/arch/sparc/include/asm/xor_64.h
@@ -65,6 +65,7 @@ static struct xor_block_template xor_block_niagara = {
 #define XOR_SELECT_TEMPLATE(FASTEST) \
         ((tlb_type == hypervisor && \
           (sun4v_chip_type == SUN4V_CHIP_NIAGARA1 || \
-           sun4v_chip_type == SUN4V_CHIP_NIAGARA2)) ? \
+           sun4v_chip_type == SUN4V_CHIP_NIAGARA2 || \
+           sun4v_chip_type == SUN4V_CHIP_NIAGARA3)) ? \
          &xor_block_niagara : \
          &xor_block_VIS)
diff --git a/arch/sparc/kernel/cpu.c b/arch/sparc/kernel/cpu.c
index 138dbbc8dc84..17cf290dc2bc 100644
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@@ -474,11 +474,18 @@ static void __init sun4v_cpu_probe(void)
                 sparc_pmu_type = "niagara2";
                 break;
 
+        case SUN4V_CHIP_NIAGARA3:
+                sparc_cpu_type = "UltraSparc T3 (Niagara3)";
+                sparc_fpu_type = "UltraSparc T3 integrated FPU";
+                sparc_pmu_type = "niagara3";
+                break;
+
         default:
                 printk(KERN_WARNING "CPU: Unknown sun4v cpu type [%s]\n",
                        prom_cpu_compatible);
                 sparc_cpu_type = "Unknown SUN4V CPU";
                 sparc_fpu_type = "Unknown SUN4V FPU";
+                sparc_pmu_type = "Unknown SUN4V PMU";
                 break;
         }
 }
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index d91fd782743a..4197e8d62d4c 100644
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -324,6 +324,7 @@ static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index)
         switch (sun4v_chip_type) {
         case SUN4V_CHIP_NIAGARA1:
         case SUN4V_CHIP_NIAGARA2:
+        case SUN4V_CHIP_NIAGARA3:
                 rover_inc_table = niagara_iterate_method;
                 break;
         default:
diff --git a/arch/sparc/kernel/head_64.S b/arch/sparc/kernel/head_64.S
index aa594c792d19..c752603a7c0d 100644
--- a/arch/sparc/kernel/head_64.S
+++ b/arch/sparc/kernel/head_64.S
@@ -132,6 +132,8 @@ prom_sun4v_name:
         .asciz  "sun4v"
 prom_niagara_prefix:
         .asciz  "SUNW,UltraSPARC-T"
+prom_sparc_prefix:
+        .asciz  "SPARC-T"
         .align  4
 prom_root_compatible:
         .skip   64
@@ -382,6 +384,22 @@ sun4v_chip_type:
 90:     ldub    [%g7], %g2
         ldub    [%g1], %g4
         cmp     %g2, %g4
+        bne,pn  %icc, 89f
+         add    %g7, 1, %g7
+        subcc   %g3, 1, %g3
+        bne,pt  %xcc, 90b
+         add    %g1, 1, %g1
+        ba,pt   %xcc, 91f
+         nop
+
+89:     sethi   %hi(prom_cpu_compatible), %g1
+        or      %g1, %lo(prom_cpu_compatible), %g1
+        sethi   %hi(prom_sparc_prefix), %g7
+        or      %g7, %lo(prom_sparc_prefix), %g7
+        mov     7, %g3
+90:     ldub    [%g7], %g2
+        ldub    [%g1], %g4
+        cmp     %g2, %g4
         bne,pn  %icc, 4f
          add    %g7, 1, %g7
         subcc   %g3, 1, %g3
@@ -390,6 +408,15 @@ sun4v_chip_type:
 
         sethi   %hi(prom_cpu_compatible), %g1
         or      %g1, %lo(prom_cpu_compatible), %g1
+        ldub    [%g1 + 7], %g2
+        cmp     %g2, '3'
+        be,pt   %xcc, 5f
+         mov    SUN4V_CHIP_NIAGARA3, %g4
+        ba,pt   %xcc, 4f
+         nop
+
+91:     sethi   %hi(prom_cpu_compatible), %g1
+        or      %g1, %lo(prom_cpu_compatible), %g1
         ldub    [%g1 + 17], %g2
         cmp     %g2, '1'
         be,pt   %xcc, 5f
@@ -397,6 +424,7 @@ sun4v_chip_type:
         cmp     %g2, '2'
         be,pt   %xcc, 5f
          mov    SUN4V_CHIP_NIAGARA2, %g4
+        
 4:
         mov     SUN4V_CHIP_UNKNOWN, %g4
 5:      sethi   %hi(sun4v_chip_type), %g2
@@ -514,6 +542,9 @@ niagara_tlb_fixup:
          cmp    %g1, SUN4V_CHIP_NIAGARA2
         be,pt   %xcc, niagara2_patch
          nop
+        cmp     %g1, SUN4V_CHIP_NIAGARA3
+        be,pt   %xcc, niagara2_patch
+         nop
 
         call    generic_patch_copyops
          nop
diff --git a/arch/sparc/kernel/hvapi.c b/arch/sparc/kernel/hvapi.c
index 7c60afb835b0..d306e648c33c 100644
--- a/arch/sparc/kernel/hvapi.c
+++ b/arch/sparc/kernel/hvapi.c
@@ -38,6 +38,7 @@ static struct api_info api_table[] = {
         { .group = HV_GRP_N2_CPU,                               },
         { .group = HV_GRP_NIU,                                  },
         { .group = HV_GRP_VF_CPU,                               },
+        { .group = HV_GRP_KT_CPU,                               },
         { .group = HV_GRP_DIAG,         .flags = FLAG_PRE_API   },
 };
 
diff --git a/arch/sparc/kernel/pcr.c b/arch/sparc/kernel/pcr.c
index 8ac23e660080..343b0f9e2e7b 100644
--- a/arch/sparc/kernel/pcr.c
+++ b/arch/sparc/kernel/pcr.c
@@ -80,8 +80,11 @@ static void n2_pcr_write(u64 val)
 {
         unsigned long ret;
 
-        ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
-        if (ret != HV_EOK)
+        if (val & PCR_N2_HTRACE) {
+                ret = sun4v_niagara2_setperf(HV_N2_PERF_SPARC_CTL, val);
+                if (ret != HV_EOK)
+                        write_pcr(val);
+        } else
                 write_pcr(val);
 }
 
@@ -106,6 +109,10 @@ static int __init register_perf_hsvc(void)
                         perf_hsvc_group = HV_GRP_N2_CPU;
                         break;
 
+                case SUN4V_CHIP_NIAGARA3:
+                        perf_hsvc_group = HV_GRP_KT_CPU;
+                        break;
+
                 default:
                         return -ENODEV;
                 }
diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c
index 171e8d84dc3f..614da624330c 100644
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@ -1343,7 +1343,8 @@ static bool __init supported_pmu(void)
                 sparc_pmu = &niagara1_pmu;
                 return true;
         }
-        if (!strcmp(sparc_pmu_type, "niagara2")) {
+        if (!strcmp(sparc_pmu_type, "niagara2") ||
+            !strcmp(sparc_pmu_type, "niagara3")) {
                 sparc_pmu = &niagara2_pmu;
                 return true;
         }
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index ac6739e085e3..c3de70de00d4 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -1,6 +1,6 @@
 /* n2-drv.c: Niagara-2 RNG driver.
  *
- * Copyright (C) 2008 David S. Miller <davem@davemloft.net>
+ * Copyright (C) 2008, 2011 David S. Miller <davem@davemloft.net>
  */
 
 #include <linux/kernel.h>
@@ -22,8 +22,8 @@
 
 #define DRV_MODULE_NAME         "n2rng"
 #define PFX DRV_MODULE_NAME     ": "
-#define DRV_MODULE_VERSION      "0.1"
-#define DRV_MODULE_RELDATE      "May 15, 2008"
+#define DRV_MODULE_VERSION      "0.2"
+#define DRV_MODULE_RELDATE      "July 27, 2011"
 
 static char version[] __devinitdata =
         DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -623,14 +623,14 @@ static const struct of_device_id n2rng_match[];
 static int __devinit n2rng_probe(struct platform_device *op)
 {
         const struct of_device_id *match;
-        int victoria_falls;
+        int multi_capable;
         int err = -ENOMEM;
         struct n2rng *np;
 
         match = of_match_device(n2rng_match, &op->dev);
         if (!match)
                 return -EINVAL;
-        victoria_falls = (match->data != NULL);
+        multi_capable = (match->data != NULL);
 
         n2rng_driver_version();
         np = kzalloc(sizeof(*np), GFP_KERNEL);
@@ -640,8 +640,8 @@ static int __devinit n2rng_probe(struct platform_device *op)
 
         INIT_DELAYED_WORK(&np->work, n2rng_work);
 
-        if (victoria_falls)
-                np->flags |= N2RNG_FLAG_VF;
+        if (multi_capable)
+                np->flags |= N2RNG_FLAG_MULTI;
 
         err = -ENODEV;
         np->hvapi_major = 2;
@@ -658,10 +658,10 @@ static int __devinit n2rng_probe(struct platform_device *op)
                 }
         }
 
-        if (np->flags & N2RNG_FLAG_VF) {
+        if (np->flags & N2RNG_FLAG_MULTI) {
                 if (np->hvapi_major < 2) {
-                        dev_err(&op->dev, "VF RNG requires HVAPI major "
-                                "version 2 or later, got %lu\n",
+                        dev_err(&op->dev, "multi-unit-capable RNG requires "
+                                "HVAPI major version 2 or later, got %lu\n",
                                 np->hvapi_major);
                         goto out_hvapi_unregister;
                 }
@@ -688,8 +688,8 @@ static int __devinit n2rng_probe(struct platform_device *op)
                 goto out_free_units;
 
         dev_info(&op->dev, "Found %s RNG, units: %d\n",
-                 ((np->flags & N2RNG_FLAG_VF) ?
-                  "Victoria Falls" : "Niagara2"),
+                 ((np->flags & N2RNG_FLAG_MULTI) ?
+                  "multi-unit-capable" : "single-unit"),
                  np->num_units);
 
         np->hwrng.name = "n2rng";
@@ -751,6 +751,11 @@ static const struct of_device_id n2rng_match[] = {
                 .compatible     = "SUNW,vf-rng",
                 .data           = (void *) 1,
         },
+        {
+                .name           = "random-number-generator",
+                .compatible     = "SUNW,kt-rng",
+                .data           = (void *) 1,
+        },
         {},
 };
 MODULE_DEVICE_TABLE(of, n2rng_match);
diff --git a/drivers/char/hw_random/n2rng.h b/drivers/char/hw_random/n2rng.h
index 4bea07f30978..f244ac89087f 100644
--- a/drivers/char/hw_random/n2rng.h
+++ b/drivers/char/hw_random/n2rng.h
@@ -68,7 +68,7 @@ struct n2rng {
         struct platform_device  *op;
 
         unsigned long           flags;
-#define N2RNG_FLAG_VF           0x00000001 /* Victoria Falls RNG, else N2 */
+#define N2RNG_FLAG_MULTI        0x00000001 /* Multi-unit capable RNG */
 #define N2RNG_FLAG_CONTROL      0x00000002 /* Operating in control domain */
 #define N2RNG_FLAG_READY        0x00000008 /* Ready for hw-rng layer      */
 #define N2RNG_FLAG_SHUTDOWN     0x00000010 /* Driver unregistering        */
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 2e5b2044c96f..d0183ddb3076 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -1,6 +1,6 @@
 /* n2_core.c: Niagara2 Stream Processing Unit (SPU) crypto support.
  *
- * Copyright (C) 2010 David S. Miller <davem@davemloft.net>
+ * Copyright (C) 2010, 2011 David S. Miller <davem@davemloft.net>
  */
 
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -31,8 +31,8 @@
 #include "n2_core.h"
 
 #define DRV_MODULE_NAME         "n2_crypto"
-#define DRV_MODULE_VERSION      "0.1"
-#define DRV_MODULE_RELDATE      "April 29, 2010"
+#define DRV_MODULE_VERSION      "0.2"
+#define DRV_MODULE_RELDATE      "July 28, 2011"
 
 static char version[] __devinitdata =
         DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
@@ -1823,22 +1823,17 @@ static int spu_mdesc_scan(struct mdesc_handle *mdesc, struct platform_device *de
 static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node,
                                    struct spu_mdesc_info *ip)
 {
-        const u64 *intr, *ino;
-        int intr_len, ino_len;
+        const u64 *ino;
+        int ino_len;
         int i;
 
-        intr = mdesc_get_property(mdesc, node, "intr", &intr_len);
-        if (!intr)
-                return -ENODEV;
-
         ino = mdesc_get_property(mdesc, node, "ino", &ino_len);
-        if (!ino)
+        if (!ino) {
+                printk("NO 'ino'\n");
                 return -ENODEV;
+        }
 
-        if (intr_len != ino_len)
-                return -EINVAL;
-
-        ip->num_intrs = intr_len / sizeof(u64);
+        ip->num_intrs = ino_len / sizeof(u64);
         ip->ino_table = kzalloc((sizeof(struct ino_blob) *
                                  ip->num_intrs),
                                 GFP_KERNEL);
@@ -1847,7 +1842,7 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node,
 
         for (i = 0; i < ip->num_intrs; i++) {
                 struct ino_blob *b = &ip->ino_table[i];
-                b->intr = intr[i];
+                b->intr = i + 1;
                 b->ino = ino[i];
         }
 
@@ -2204,6 +2199,10 @@ static struct of_device_id n2_crypto_match[] = {
                 .name = "n2cp",
                 .compatible = "SUNW,vf-cwq",
         },
+        {
+                .name = "n2cp",
+                .compatible = "SUNW,kt-cwq",
+        },
         {},
 };
 
@@ -2228,6 +2227,10 @@ static struct of_device_id n2_mau_match[] = {
                 .name = "ncp",
                 .compatible = "SUNW,vf-mau",
         },
+        {
+                .name = "ncp",
+                .compatible = "SUNW,kt-mau",
+        },
         {},
 };