Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / arch / sparc64 / kernel / devices.c
index d710274..007e892 100644 (file)
@@ -12,6 +12,7 @@
 #include <linux/string.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
+#include <linux/bootmem.h>
 
 #include <asm/page.h>
 #include <asm/oplib.h>
@@ -20,6 +21,8 @@
 #include <asm/spitfire.h>
 #include <asm/timer.h>
 #include <asm/cpudata.h>
+#include <asm/vdev.h>
+#include <asm/irq.h>
 
 /* Used to synchronize acceses to NatSemi SUPER I/O chip configure
  * operations in asm/ns87303.h
@@ -29,13 +32,158 @@ DEFINE_SPINLOCK(ns87303_lock);
 extern void cpu_probe(void);
 extern void central_probe(void);
 
-static char *cpu_mid_prop(void)
+u32 sun4v_vdev_devhandle;
+int sun4v_vdev_root;
+
+struct vdev_intmap {
+       unsigned int phys;
+       unsigned int irq;
+       unsigned int cnode;
+       unsigned int cinterrupt;
+};
+
+struct vdev_intmask {
+       unsigned int phys;
+       unsigned int interrupt;
+       unsigned int __unused;
+};
+
+static struct vdev_intmap *vdev_intmap;
+static int vdev_num_intmap;
+static struct vdev_intmask vdev_intmask;
+
+static void __init sun4v_virtual_device_probe(void)
+{
+       struct linux_prom64_registers regs;
+       struct vdev_intmap *ip;
+       int node, sz, err;
+
+       if (tlb_type != hypervisor)
+               return;
+
+       node = prom_getchild(prom_root_node);
+       node = prom_searchsiblings(node, "virtual-devices");
+       if (!node) {
+               prom_printf("SUN4V: Fatal error, no virtual-devices node.\n");
+               prom_halt();
+       }
+
+       sun4v_vdev_root = node;
+
+       prom_getproperty(node, "reg", (char *)&regs, sizeof(regs));
+       sun4v_vdev_devhandle = (regs.phys_addr >> 32UL) & 0x0fffffff;
+
+       sz = prom_getproplen(node, "interrupt-map");
+       if (sz <= 0) {
+               prom_printf("SUN4V: Error, no vdev interrupt-map.\n");
+               prom_halt();
+       }
+
+       if ((sz % sizeof(*ip)) != 0) {
+               prom_printf("SUN4V: Bogus interrupt-map property size %d\n",
+                           sz);
+               prom_halt();
+       }
+
+       vdev_intmap = ip = alloc_bootmem_low_pages(sz);
+       if (!vdev_intmap) {
+               prom_printf("SUN4V: Error, cannot allocate vdev_intmap.\n");
+               prom_halt();
+       }
+
+       err = prom_getproperty(node, "interrupt-map", (char *) ip, sz);
+       if (err == -1) {
+               prom_printf("SUN4V: Fatal error, no vdev interrupt-map.\n");
+               prom_halt();
+       }
+       if (err != sz) {
+               prom_printf("SUN4V: Inconsistent interrupt-map size, "
+                           "proplen(%d) vs getprop(%d).\n", sz,err);
+               prom_halt();
+       }
+
+       vdev_num_intmap = err / sizeof(*ip);
+
+       err = prom_getproperty(node, "interrupt-map-mask",
+                              (char *) &vdev_intmask,
+                              sizeof(vdev_intmask));
+       if (err <= 0) {
+               prom_printf("SUN4V: Fatal error, no vdev "
+                           "interrupt-map-mask.\n");
+               prom_halt();
+       }
+       if (err % sizeof(vdev_intmask)) {
+               prom_printf("SUN4V: Bogus interrupt-map-mask "
+                           "property size %d\n", err);
+               prom_halt();
+       }
+
+       printk("SUN4V: virtual-devices devhandle[%x]\n",
+              sun4v_vdev_devhandle);
+}
+
+unsigned int sun4v_vdev_device_interrupt(unsigned int dev_node)
+{
+       unsigned int irq, reg;
+       int err, i;
+
+       err = prom_getproperty(dev_node, "interrupts",
+                              (char *) &irq, sizeof(irq));
+       if (err <= 0) {
+               printk("VDEV: Cannot get \"interrupts\" "
+                      "property for OBP node %x\n", dev_node);
+               return 0;
+       }
+
+       err = prom_getproperty(dev_node, "reg",
+                              (char *) &reg, sizeof(reg));
+       if (err <= 0) {
+               printk("VDEV: Cannot get \"reg\" "
+                      "property for OBP node %x\n", dev_node);
+               return 0;
+       }
+
+       for (i = 0; i < vdev_num_intmap; i++) {
+               if (vdev_intmap[i].phys == (reg & vdev_intmask.phys) &&
+                   vdev_intmap[i].irq == (irq & vdev_intmask.interrupt)) {
+                       irq = vdev_intmap[i].cinterrupt;
+                       break;
+               }
+       }
+
+       if (i == vdev_num_intmap) {
+               printk("VDEV: No matching interrupt map entry "
+                      "for OBP node %x\n", dev_node);
+               return 0;
+       }
+
+       return sun4v_build_irq(sun4v_vdev_devhandle, irq, 5, 0);
+}
+
+static const char *cpu_mid_prop(void)
 {
        if (tlb_type == spitfire)
                return "upa-portid";
        return "portid";
 }
 
+static int get_cpu_mid(int prom_node)
+{
+       if (tlb_type == hypervisor) {
+               struct linux_prom64_registers reg;
+
+               if (prom_getproplen(prom_node, "cpuid") == 4)
+                       return prom_getintdefault(prom_node, "cpuid", 0);
+
+               prom_getproperty(prom_node, "reg", (char *) &reg, sizeof(reg));
+               return (reg.phys_addr >> 32) & 0x0fffffffUL;
+       } else {
+               const char *prop_name = cpu_mid_prop();
+
+               return prom_getintdefault(prom_node, prop_name, 0);
+       }
+}
+
 static int check_cpu_node(int nd, int *cur_inst,
                          int (*compare)(int, int, void *), void *compare_arg,
                          int *prom_node, int *mid)
@@ -50,7 +198,7 @@ static int check_cpu_node(int nd, int *cur_inst,
                if (prom_node)
                        *prom_node = nd;
                if (mid)
-                       *mid = prom_getintdefault(nd, cpu_mid_prop(), 0);
+                       *mid = get_cpu_mid(nd);
                return 0;
        }
 
@@ -105,7 +253,7 @@ static int cpu_mid_compare(int nd, int instance, void *_arg)
        int desired_mid = (int) (long) _arg;
        int this_mid;
 
-       this_mid = prom_getintdefault(nd, cpu_mid_prop(), 0);
+       this_mid = get_cpu_mid(nd);
        if (this_mid == desired_mid)
                return 0;
        return -ENODEV;
@@ -126,7 +274,8 @@ void __init device_scan(void)
 
 #ifndef CONFIG_SMP
        {
-               int err, cpu_node;
+               int err, cpu_node, def;
+
                err = cpu_find_by_instance(0, &cpu_node, NULL);
                if (err) {
                        prom_printf("No cpu nodes, cannot continue\n");
@@ -135,9 +284,51 @@ void __init device_scan(void)
                cpu_data(0).clock_tick = prom_getintdefault(cpu_node,
                                                            "clock-frequency",
                                                            0);
+
+               def = ((tlb_type == hypervisor) ?
+                      (8 * 1024) :
+                      (16 * 1024));
+               cpu_data(0).dcache_size = prom_getintdefault(cpu_node,
+                                                            "dcache-size",
+                                                            def);
+
+               def = 32;
+               cpu_data(0).dcache_line_size =
+                       prom_getintdefault(cpu_node, "dcache-line-size",
+                                          def);
+
+               def = 16 * 1024;
+               cpu_data(0).icache_size = prom_getintdefault(cpu_node,
+                                                            "icache-size",
+                                                            def);
+
+               def = 32;
+               cpu_data(0).icache_line_size =
+                       prom_getintdefault(cpu_node, "icache-line-size",
+                                          def);
+
+               def = ((tlb_type == hypervisor) ?
+                      (3 * 1024 * 1024) :
+                      (4 * 1024 * 1024));
+               cpu_data(0).ecache_size = prom_getintdefault(cpu_node,
+                                                            "ecache-size",
+                                                            def);
+
+               def = 64;
+               cpu_data(0).ecache_line_size =
+                       prom_getintdefault(cpu_node, "ecache-line-size",
+                                          def);
+               printk("CPU[0]: Caches "
+                      "D[sz(%d):line_sz(%d)] "
+                      "I[sz(%d):line_sz(%d)] "
+                      "E[sz(%d):line_sz(%d)]\n",
+                      cpu_data(0).dcache_size, cpu_data(0).dcache_line_size,
+                      cpu_data(0).icache_size, cpu_data(0).icache_line_size,
+                      cpu_data(0).ecache_size, cpu_data(0).ecache_line_size);
        }
 #endif
 
+       sun4v_virtual_device_probe();
        central_probe();
 
        cpu_probe();