9 files changed, 304 insertions, 26 deletions

diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig
index 585ef4fb7591..65840a62bb9c 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.21
-# Fri May 11 14:31:45 2007
+# Linux kernel version: 2.6.22-rc1
+# Mon May 14 04:17:48 2007
 #
 CONFIG_SPARC=y
 CONFIG_SPARC64=y
@@ -508,10 +508,6 @@ CONFIG_ISCSI_TCP=m
 # CONFIG_SCSI_ESP_CORE is not set
 # CONFIG_SCSI_SUNESP is not set
 # CONFIG_SCSI_SRP is not set
-
-#
-# Serial ATA (prod) and Parallel ATA (experimental) drivers
-#
 # CONFIG_ATA is not set
 
 #
@@ -568,10 +564,6 @@ CONFIG_DUMMY=m
 # ARCnet devices
 #
 # CONFIG_ARCNET is not set
-
-#
-# PHY device support
-#
 # CONFIG_PHYLIB is not set
 
 #
@@ -611,10 +603,7 @@ CONFIG_NET_PCI=y
 # CONFIG_SUNDANCE is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_SC92031 is not set
-
-#
-# Ethernet (1000 Mbit)
-#
+CONFIG_NETDEV_1000=y
 # CONFIG_ACENIC is not set
 # CONFIG_DL2K is not set
 CONFIG_E1000=m
@@ -634,10 +623,7 @@ CONFIG_TIGON3=m
 CONFIG_BNX2=m
 # CONFIG_QLA3XXX is not set
 # CONFIG_ATL1 is not set
-
-#
-# Ethernet (10000 Mbit)
-#
+CONFIG_NETDEV_10000=y
 # CONFIG_CHELSIO_T1 is not set
 # CONFIG_CHELSIO_T3 is not set
 # CONFIG_IXGB is not set
@@ -667,10 +653,6 @@ CONFIG_MLX4_DEBUG=y
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_USBNET is not set
-
-#
-# Wan interfaces
-#
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile
index 6bf6fb65bc20..c749dccacc32 100644
--- a/arch/sparc64/kernel/Makefile
+++ b/arch/sparc64/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y		:= process.o setup.o cpu.o idprom.o \
                    irq.o ptrace.o time.o sys_sparc.o signal.o \
                    unaligned.o central.o pci.o starfire.o semaphore.o \
                    power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \
-                   visemul.o prom.o of_device.o
+                   visemul.o prom.o of_device.o hvapi.o
 
 obj-$(CONFIG_STACKTRACE) += stacktrace.o
 obj-$(CONFIG_PCI)        += ebus.o isa.o pci_common.o pci_iommu.o \
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index c15a3edcb826..732b77cb71f8 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1843,3 +1843,97 @@ sun4v_cpu_state:
         mov     %o1, %o0
 1:      retl
          nop
+
+        /* %o0: API group number
+         * %o1: pointer to unsigned long major number storage
+         * %o2: pointer to unsigned long minor number storage
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_get_version
+sun4v_get_version:
+        mov     HV_CORE_GET_VER, %o5
+        mov     %o1, %o3
+        mov     %o2, %o4
+        ta      HV_CORE_TRAP
+        stx     %o1, [%o3]
+        retl
+         stx    %o2, [%o4]
+
+        /* %o0: API group number
+         * %o1: desired major number
+         * %o2: desired minor number
+         * %o3: pointer to unsigned long actual minor number storage
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_set_version
+sun4v_set_version:
+        mov     HV_CORE_SET_VER, %o5
+        mov     %o3, %o4
+        ta      HV_CORE_TRAP
+        retl
+         stx    %o1, [%o4]
+
+        /* %o0: pointer to unsigned long status
+         *
+         * returns %o0: signed character
+         */
+        .globl  sun4v_con_getchar
+sun4v_con_getchar:
+        mov     %o0, %o4
+        mov     HV_FAST_CONS_GETCHAR, %o5
+        clr     %o0
+        clr     %o1
+        ta      HV_FAST_TRAP
+        stx     %o0, [%o4]
+        retl
+         sra    %o1, 0, %o0
+
+        /* %o0: signed long character
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_putchar
+sun4v_con_putchar:
+        mov     HV_FAST_CONS_PUTCHAR, %o5
+        ta      HV_FAST_TRAP
+        retl
+         sra    %o0, 0, %o0
+
+        /* %o0: buffer real address
+         * %o1: buffer size
+         * %o2: pointer to unsigned long bytes_read
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_read
+sun4v_con_read:
+        mov     %o2, %o4
+        mov     HV_FAST_CONS_READ, %o5
+        ta      HV_FAST_TRAP
+        brnz    %o0, 1f
+         cmp    %o1, -1         /* break */
+        be,a,pn %icc, 1f
+         mov    %o1, %o0
+        cmp     %o1, -2         /* hup */
+        be,a,pn %icc, 1f
+         mov    %o1, %o0
+        stx     %o1, [%o4]
+1:      retl
+         nop
+
+        /* %o0: buffer real address
+         * %o1: buffer size
+         * %o2: pointer to unsigned long bytes_written
+         *
+         * returns %o0: status
+         */
+        .globl  sun4v_con_write
+sun4v_con_write:
+        mov     %o2, %o4
+        mov     HV_FAST_CONS_WRITE, %o5
+        ta      HV_FAST_TRAP
+        stx     %o1, [%o4]
+        retl
+         nop
diff --git a/arch/sparc64/kernel/hvapi.c b/arch/sparc64/kernel/hvapi.c
new file mode 100644
index 000000000000..f03ffc829c7a
--- /dev/null
+++ b/arch/sparc64/kernel/hvapi.c
@@ -0,0 +1,189 @@
+/* hvapi.c: Hypervisor API management.
+ *
+ * Copyright (C) 2007 David S. Miller <davem@davemloft.net>
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+
+#include <asm/hypervisor.h>
+#include <asm/oplib.h>
+
+/* If the hypervisor indicates that the API setting
+ * calls are unsupported, by returning HV_EBADTRAP or
+ * HV_ENOTSUPPORTED, we assume that API groups with the
+ * PRE_API flag set are major 1 minor 0.
+ */
+struct api_info {
+        unsigned long group;
+        unsigned long major;
+        unsigned long minor;
+        unsigned int refcnt;
+        unsigned int flags;
+#define FLAG_PRE_API            0x00000001
+};
+
+static struct api_info api_table[] = {
+        { .group = HV_GRP_SUN4V,        .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_CORE,         .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_INTR,                                 },
+        { .group = HV_GRP_SOFT_STATE,                           },
+        { .group = HV_GRP_PCI,          .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_LDOM,                                 },
+        { .group = HV_GRP_SVC_CHAN,     .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_NCS,          .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_NIAG_PERF,    .flags = FLAG_PRE_API   },
+        { .group = HV_GRP_FIRE_PERF,                            },
+        { .group = HV_GRP_DIAG,         .flags = FLAG_PRE_API   },
+};
+
+static DEFINE_SPINLOCK(hvapi_lock);
+
+static struct api_info *__get_info(unsigned long group)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(api_table); i++) {
+                if (api_table[i].group == group)
+                        return &api_table[i];
+        }
+        return NULL;
+}
+
+static void __get_ref(struct api_info *p)
+{
+        p->refcnt++;
+}
+
+static void __put_ref(struct api_info *p)
+{
+        if (--p->refcnt == 0) {
+                unsigned long ignore;
+
+                sun4v_set_version(p->group, 0, 0, &ignore);
+                p->major = p->minor = 0;
+        }
+}
+
+/* Register a hypervisor API specification.  It indicates the
+ * API group and desired major+minor.
+ *
+ * If an existing API registration exists '0' (success) will
+ * be returned if it is compatible with the one being registered.
+ * Otherwise a negative error code will be returned.
+ *
+ * Otherwise an attempt will be made to negotiate the requested
+ * API group/major/minor with the hypervisor, and errors returned
+ * if that does not succeed.
+ */
+int sun4v_hvapi_register(unsigned long group, unsigned long major,
+                         unsigned long *minor)
+{
+        struct api_info *p;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&hvapi_lock, flags);
+        p = __get_info(group);
+        ret = -EINVAL;
+        if (p) {
+                if (p->refcnt) {
+                        ret = -EINVAL;
+                        if (p->major == major) {
+                                *minor = p->minor;
+                                ret = 0;
+                        }
+                } else {
+                        unsigned long actual_minor;
+                        unsigned long hv_ret;
+
+                        hv_ret = sun4v_set_version(group, major, *minor,
+                                                   &actual_minor);
+                        ret = -EINVAL;
+                        if (hv_ret == HV_EOK) {
+                                *minor = actual_minor;
+                                p->major = major;
+                                p->minor = actual_minor;
+                                ret = 0;
+                        } else if (hv_ret == HV_EBADTRAP ||
+                                   HV_ENOTSUPPORTED) {
+                                if (p->flags & FLAG_PRE_API) {
+                                        if (major == 1) {
+                                                p->major = 1;
+                                                p->minor = 0;
+                                                *minor = 0;
+                                                ret = 0;
+                                        }
+                                }
+                        }
+                }
+
+                if (ret == 0)
+                        __get_ref(p);
+        }
+        spin_unlock_irqrestore(&hvapi_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(sun4v_hvapi_register);
+
+void sun4v_hvapi_unregister(unsigned long group)
+{
+        struct api_info *p;
+        unsigned long flags;
+
+        spin_lock_irqsave(&hvapi_lock, flags);
+        p = __get_info(group);
+        if (p)
+                __put_ref(p);
+        spin_unlock_irqrestore(&hvapi_lock, flags);
+}
+EXPORT_SYMBOL(sun4v_hvapi_unregister);
+
+int sun4v_hvapi_get(unsigned long group,
+                    unsigned long *major,
+                    unsigned long *minor)
+{
+        struct api_info *p;
+        unsigned long flags;
+        int ret;
+
+        spin_lock_irqsave(&hvapi_lock, flags);
+        ret = -EINVAL;
+        p = __get_info(group);
+        if (p && p->refcnt) {
+                *major = p->major;
+                *minor = p->minor;
+                ret = 0;
+        }
+        spin_unlock_irqrestore(&hvapi_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(sun4v_hvapi_get);
+
+void __init sun4v_hvapi_init(void)
+{
+        unsigned long group, major, minor;
+
+        group = HV_GRP_SUN4V;
+        major = 1;
+        minor = 0;
+        if (sun4v_hvapi_register(group, major, &minor))
+                goto bad;
+
+        group = HV_GRP_CORE;
+        major = 1;
+        minor = 1;
+        if (sun4v_hvapi_register(group, major, &minor))
+                goto bad;
+
+        return;
+
+bad:
+        prom_printf("HVAPI: Cannot register API group "
+                    "%lx with major(%u) minor(%u)\n",
+                    group, major, minor);
+        prom_halt();
+}
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 7455f5d05519..16cc46a71872 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -537,6 +537,13 @@ static int __init build_one_resource(struct device_node *parent,
                         return 0;
         }
 
+        /* When we miss an I/O space match on PCI, just pass it up
+         * to the next PCI bridge and/or controller.
+         */
+        if (!strcmp(bus->name, "pci") &&
+            (addr[0] & 0x03000000) == 0x01000000)
+                return 0;
+
         return 1;
 }
 
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 451028341c75..dea9c3c9ec5f 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -269,6 +269,7 @@ void __init per_cpu_patch(void)
 
 void __init sun4v_patch(void)
 {
+        extern void sun4v_hvapi_init(void);
         struct sun4v_1insn_patch_entry *p1;
         struct sun4v_2insn_patch_entry *p2;
 
@@ -300,6 +301,8 @@ void __init sun4v_patch(void)
 
                 p2++;
         }
+
+        sun4v_hvapi_init();
 }
 
 #ifdef CONFIG_SMP
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 8087d67a0cf8..24fdf1d0adc5 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -561,6 +561,9 @@ static void hypervisor_xcall_deliver(u64 data0, u64 data1, u64 data2, cpumask_t
         unsigned long flags, status;
         int cnt, retries, this_cpu, prev_sent, i;
 
+        if (cpus_empty(mask))
+                return;
+
         /* We have to do this whole thing with interrupts fully disabled.
          * Otherwise if we send an xcall from interrupt context it will
          * corrupt both our mondo block and cpu list state.
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 6b9a06e42542..2d63d7689962 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -1030,7 +1030,7 @@ void __devinit setup_sparc64_timer(void)
         clockevents_register_device(sevt);
 }
 
-#define SPARC64_NSEC_PER_CYC_SHIFT      32UL
+#define SPARC64_NSEC_PER_CYC_SHIFT      10UL
 
 static struct clocksource clocksource_tick = {
         .rating         = 100,
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index 13fa2a2e4513..fb648de18a8d 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -14,7 +14,7 @@ SECTIONS
   .text 0x0000000000404000 :
   {
     _text = .;
-    *(.text)
+    TEXT_TEXT
     SCHED_TEXT
     LOCK_TEXT
     KPROBES_TEXT
@@ -27,7 +27,7 @@ SECTIONS
 
   .data    :
   {
-    *(.data)
+    DATA_DATA
     CONSTRUCTORS
   }
   .data1   : { *(.data1) }