]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/sparc/kernel/sun4d_irq.c
clarify usage expectations for cnt32_to_63()
[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / sun4d_irq.c
index 1290b5998f831ede12dd28416cf967e088ba267c..d3cb76ce418bde420d5d7e397679091ba5cd5cf8 100644 (file)
@@ -19,6 +19,8 @@
 #include <linux/smp.h>
 #include <linux/spinlock.h>
 #include <linux/seq_file.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <asm/ptrace.h>
 #include <asm/processor.h>
@@ -34,7 +36,6 @@
 #include <asm/io.h>
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
-#include <asm/sbus.h>
 #include <asm/sbi.h>
 #include <asm/cacheflush.h>
 #include <asm/irq_regs.h>
 /* If you trust current SCSI layer to handle different SCSI IRQs, enable this. I don't trust it... -jj */
 /* #define DISTRIBUTE_IRQS */
 
-struct sun4d_timer_regs *sun4d_timers;
+struct sun4d_timer_regs {
+       u32     l10_timer_limit;
+       u32     l10_cur_countx;
+       u32     l10_limit_noclear;
+       u32     ctrl;
+       u32     l10_cur_count;
+};
+
+static struct sun4d_timer_regs __iomem *sun4d_timers;
+
 #define TIMER_IRQ      10
 
 #define MAX_STATIC_ALLOC       4
 extern struct irqaction static_irqaction[MAX_STATIC_ALLOC];
 extern int static_irq_count;
-unsigned char cpu_leds[32];
-#ifdef CONFIG_SMP
 static unsigned char sbus_tid[32];
-#endif
 
 static struct irqaction *irq_action[NR_IRQS];
 extern spinlock_t irq_action_lock;
@@ -72,9 +79,9 @@ static int sbus_to_pil[] = {
 };
 
 static int nsbi;
-#ifdef CONFIG_SMP
+
+/* Exported for sun4d_smp.c */
 DEFINE_SPINLOCK(sun4d_imsk_lock);
-#endif
 
 int show_sun4d_interrupts(struct seq_file *p, void *v)
 {
@@ -257,26 +264,6 @@ void sun4d_handler_irq(int irq, struct pt_regs * regs)
        set_irq_regs(old_regs);
 }
 
-unsigned int sun4d_build_irq(struct sbus_dev *sdev, int irq)
-{
-       int sbusl = pil_to_sbus[irq];
-
-       if (sbusl)
-               return ((sdev->bus->board + 1) << 5) + (sbusl << 2) + sdev->slot;
-       else
-               return irq;
-}
-
-static unsigned int sun4d_sbint_to_irq(struct sbus_dev *sdev,
-                                      unsigned int sbint)
-{
-       if (sbint >= sizeof(sbus_to_pil)) {
-               printk(KERN_ERR "%s: bogus SBINT %d\n", sdev->prom_name, sbint);
-               BUG();
-       }
-       return sun4d_build_irq(sdev, sbus_to_pil[sbint]);
-}
-
 int sun4d_request_irq(unsigned int irq,
                irq_handler_t handler,
                unsigned long irqflags, const char * devname, void *dev_id)
@@ -360,36 +347,28 @@ out:
 
 static void sun4d_disable_irq(unsigned int irq)
 {
-#ifdef CONFIG_SMP
        int tid = sbus_tid[(irq >> 5) - 1];
        unsigned long flags;
-#endif 
        
-       if (irq < NR_IRQS) return;
-#ifdef CONFIG_SMP
+       if (irq < NR_IRQS)
+               return;
+
        spin_lock_irqsave(&sun4d_imsk_lock, flags);
        cc_set_imsk_other(tid, cc_get_imsk_other(tid) | (1 << sbus_to_pil[(irq >> 2) & 7]));
        spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
-#else          
-       cc_set_imsk(cc_get_imsk() | (1 << sbus_to_pil[(irq >> 2) & 7]));
-#endif
 }
 
 static void sun4d_enable_irq(unsigned int irq)
 {
-#ifdef CONFIG_SMP
        int tid = sbus_tid[(irq >> 5) - 1];
        unsigned long flags;
-#endif 
        
-       if (irq < NR_IRQS) return;
-#ifdef CONFIG_SMP
+       if (irq < NR_IRQS)
+               return;
+
        spin_lock_irqsave(&sun4d_imsk_lock, flags);
        cc_set_imsk_other(tid, cc_get_imsk_other(tid) & ~(1 << sbus_to_pil[(irq >> 2) & 7]));
        spin_unlock_irqrestore(&sun4d_imsk_lock, flags);
-#else          
-       cc_set_imsk(cc_get_imsk() & ~(1 << sbus_to_pil[(irq >> 2) & 7]));
-#endif
 }
 
 #ifdef CONFIG_SMP
@@ -409,47 +388,55 @@ static void sun4d_set_udt(int cpu)
 /* Setup IRQ distribution scheme. */
 void __init sun4d_distribute_irqs(void)
 {
+       struct device_node *dp;
+
 #ifdef DISTRIBUTE_IRQS
-       struct sbus_bus *sbus;
-       unsigned long sbus_serving_map;
+       cpumask_t sbus_serving_map;
 
        sbus_serving_map = cpu_present_map;
-       for_each_sbus(sbus) {
-               if ((sbus->board * 2) == boot_cpu_id && (cpu_present_map & (1 << (sbus->board * 2 + 1))))
-                       sbus_tid[sbus->board] = (sbus->board * 2 + 1);
-               else if (cpu_present_map & (1 << (sbus->board * 2)))
-                       sbus_tid[sbus->board] = (sbus->board * 2);
-               else if (cpu_present_map & (1 << (sbus->board * 2 + 1)))
-                       sbus_tid[sbus->board] = (sbus->board * 2 + 1);
+       for_each_node_by_name(dp, "sbi") {
+               int board = of_getintprop_default(dp, "board#", 0);
+
+               if ((board * 2) == boot_cpu_id && cpu_isset(board * 2 + 1, cpu_present_map))
+                       sbus_tid[board] = (board * 2 + 1);
+               else if (cpu_isset(board * 2, cpu_present_map))
+                       sbus_tid[board] = (board * 2);
+               else if (cpu_isset(board * 2 + 1, cpu_present_map))
+                       sbus_tid[board] = (board * 2 + 1);
                else
-                       sbus_tid[sbus->board] = 0xff;
-               if (sbus_tid[sbus->board] != 0xff)
-                       sbus_serving_map &= ~(1 << sbus_tid[sbus->board]);
+                       sbus_tid[board] = 0xff;
+               if (sbus_tid[board] != 0xff)
+                       cpu_clear(sbus_tid[board], sbus_serving_map);
        }
-       for_each_sbus(sbus)
-               if (sbus_tid[sbus->board] == 0xff) {
+       for_each_node_by_name(dp, "sbi") {
+               int board = of_getintprop_default(dp, "board#", 0);
+               if (sbus_tid[board] == 0xff) {
                        int i = 31;
                                
-                       if (!sbus_serving_map)
+                       if (cpus_empty(sbus_serving_map))
                                sbus_serving_map = cpu_present_map;
-                       while (!(sbus_serving_map & (1 << i)))
+                       while (cpu_isset(i, sbus_serving_map))
                                i--;
-                       sbus_tid[sbus->board] = i;
-                       sbus_serving_map &= ~(1 << i);
+                       sbus_tid[board] = i;
+                       cpu_clear(i, sbus_serving_map);
                }
-       for_each_sbus(sbus) {
-               printk("sbus%d IRQs directed to CPU%d\n", sbus->board, sbus_tid[sbus->board]);
-               set_sbi_tid(sbus->devid, sbus_tid[sbus->board] << 3);
+       }
+       for_each_node_by_name(dp, "sbi") {
+               int devid = of_getintprop_default(dp, "device-id", 0);
+               int board = of_getintprop_default(dp, "board#", 0);
+               printk("sbus%d IRQs directed to CPU%d\n", board, sbus_tid[board]);
+               set_sbi_tid(devid, sbus_tid[board] << 3);
        }
 #else
-       struct sbus_bus *sbus;
        int cpuid = cpu_logical_map(1);
 
        if (cpuid == -1)
                cpuid = cpu_logical_map(0);
-       for_each_sbus(sbus) {
-               sbus_tid[sbus->board] = cpuid;
-               set_sbi_tid(sbus->devid, cpuid << 3);
+       for_each_node_by_name(dp, "sbi") {
+               int devid = of_getintprop_default(dp, "device-id", 0);
+               int board = of_getintprop_default(dp, "board#", 0);
+               sbus_tid[board] = cpuid;
+               set_sbi_tid(devid, cpuid << 3);
        }
        printk("All sbus IRQs directed to CPU%d\n", cpuid);
 #endif
@@ -458,13 +445,7 @@ void __init sun4d_distribute_irqs(void)
  
 static void sun4d_clear_clock_irq(void)
 {
-       volatile unsigned int clear_intr;
-       clear_intr = sun4d_timers->l10_timer_limit;
-}
-
-static void sun4d_clear_profile_irq(int cpu)
-{
-       bw_get_prof_limit(cpu);
+       sbus_readl(&sun4d_timers->l10_timer_limit);
 }
 
 static void sun4d_load_profile_irq(int cpu, unsigned int limit)
@@ -472,98 +453,121 @@ static void sun4d_load_profile_irq(int cpu, unsigned int limit)
        bw_set_prof_limit(cpu, limit);
 }
 
-static void __init sun4d_init_timers(irq_handler_t counter_fn)
+static void __init sun4d_load_profile_irqs(void)
 {
-       int irq;
-       int cpu;
-       struct resource r;
-       int mid;
+       int cpu = 0, mid;
 
-       /* Map the User Timer registers. */
-       memset(&r, 0, sizeof(r));
+       while (!cpu_find_by_instance(cpu, NULL, &mid)) {
+               sun4d_load_profile_irq(mid >> 3, 0);
+               cpu++;
+       }
+}
+
+static void __init sun4d_fixup_trap_table(void)
+{
 #ifdef CONFIG_SMP
-       r.start = CSR_BASE(boot_cpu_id)+BW_TIMER_LIMIT;
-#else
-       r.start = CSR_BASE(0)+BW_TIMER_LIMIT;
+       unsigned long flags;
+       extern unsigned long lvl14_save[4];
+       struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)];
+       extern unsigned int real_irq_entry[], smp4d_ticker[];
+       extern unsigned int patchme_maybe_smp_msg[];
+
+       /* Adjust so that we jump directly to smp4d_ticker */
+       lvl14_save[2] += smp4d_ticker - real_irq_entry;
+
+       /* For SMP we use the level 14 ticker, however the bootup code
+        * has copied the firmware's level 14 vector into the boot cpu's
+        * trap table, we must fix this now or we get squashed.
+        */
+       local_irq_save(flags);
+       patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */
+       trap_table->inst_one = lvl14_save[0];
+       trap_table->inst_two = lvl14_save[1];
+       trap_table->inst_three = lvl14_save[2];
+       trap_table->inst_four = lvl14_save[3];
+       local_flush_cache_all();
+       local_irq_restore(flags);
 #endif
-       r.flags = 0xf;
-       sun4d_timers = (struct sun4d_timer_regs *) sbus_ioremap(&r, 0,
-           PAGE_SIZE, "user timer");
+}
 
-       sun4d_timers->l10_timer_limit =  (((1000000/HZ) + 1) << 10);
-       master_l10_counter = &sun4d_timers->l10_cur_count;
-       master_l10_limit = &sun4d_timers->l10_timer_limit;
+static void __init sun4d_init_timers(irq_handler_t counter_fn)
+{
+       struct device_node *dp;
+       struct resource res;
+       const u32 *reg;
+       int err;
+
+       dp = of_find_node_by_name(NULL, "cpu-unit");
+       if (!dp) {
+               prom_printf("sun4d_init_timers: Unable to find cpu-unit\n");
+               prom_halt();
+       }
 
-       irq = request_irq(TIMER_IRQ,
-                         counter_fn,
-                         (IRQF_DISABLED | SA_STATIC_ALLOC),
-                         "timer", NULL);
-       if (irq) {
-               prom_printf("time_init: unable to attach IRQ%d\n",TIMER_IRQ);
+       /* Which cpu-unit we use is arbitrary, we can view the bootbus timer
+        * registers via any cpu's mapping.  The first 'reg' property is the
+        * bootbus.
+        */
+       reg = of_get_property(dp, "reg", NULL);
+       if (!reg) {
+               prom_printf("sun4d_init_timers: No reg property\n");
                prom_halt();
        }
-       
-       /* Enable user timer free run for CPU 0 in BW */
-       /* bw_set_ctrl(0, bw_get_ctrl(0) | BW_CTRL_USER_TIMER); */
 
-       cpu = 0;
-       while (!cpu_find_by_instance(cpu, NULL, &mid)) {
-               sun4d_load_profile_irq(mid >> 3, 0);
-               cpu++;
+       res.start = reg[1];
+       res.end = reg[2] - 1;
+       res.flags = reg[0] & 0xff;
+       sun4d_timers = of_ioremap(&res, BW_TIMER_LIMIT,
+                                 sizeof(struct sun4d_timer_regs), "user timer");
+       if (!sun4d_timers) {
+               prom_printf("sun4d_init_timers: Can't map timer regs\n");
+               prom_halt();
        }
-               
-#ifdef CONFIG_SMP
-       {
-               unsigned long flags;
-               extern unsigned long lvl14_save[4];
-               struct tt_entry *trap_table = &sparc_ttable[SP_TRAP_IRQ1 + (14 - 1)];
-               extern unsigned int real_irq_entry[], smp4d_ticker[];
-               extern unsigned int patchme_maybe_smp_msg[];
-
-               /* Adjust so that we jump directly to smp4d_ticker */
-               lvl14_save[2] += smp4d_ticker - real_irq_entry;
-
-               /* For SMP we use the level 14 ticker, however the bootup code
-                * has copied the firmware's level 14 vector into the boot cpu's
-                * trap table, we must fix this now or we get squashed.
-                */
-               local_irq_save(flags);
-               patchme_maybe_smp_msg[0] = 0x01000000; /* NOP out the branch */
-               trap_table->inst_one = lvl14_save[0];
-               trap_table->inst_two = lvl14_save[1];
-               trap_table->inst_three = lvl14_save[2];
-               trap_table->inst_four = lvl14_save[3];
-               local_flush_cache_all();
-               local_irq_restore(flags);
+
+       sbus_writel((((1000000/HZ) + 1) << 10), &sun4d_timers->l10_timer_limit);
+
+       master_l10_counter = &sun4d_timers->l10_cur_count;
+
+       err = request_irq(TIMER_IRQ, counter_fn,
+                         (IRQF_DISABLED | SA_STATIC_ALLOC),
+                         "timer", NULL);
+       if (err) {
+               prom_printf("sun4d_init_timers: request_irq() failed with %d\n", err);
+               prom_halt();
        }
-#endif
+       sun4d_load_profile_irqs();
+       sun4d_fixup_trap_table();
 }
 
 void __init sun4d_init_sbi_irq(void)
 {
-       struct sbus_bus *sbus;
-       unsigned mask;
+       struct device_node *dp;
+       int target_cpu = 0;
+
+#ifdef CONFIG_SMP
+       target_cpu = boot_cpu_id;
+#endif
 
        nsbi = 0;
-       for_each_sbus(sbus)
+       for_each_node_by_name(dp, "sbi")
                nsbi++;
        sbus_actions = kzalloc (nsbi * 8 * 4 * sizeof(struct sbus_action), GFP_ATOMIC);
        if (!sbus_actions) {
                prom_printf("SUN4D: Cannot allocate sbus_actions, halting.\n");
                prom_halt();
        }
-       for_each_sbus(sbus) {
-#ifdef CONFIG_SMP      
-               extern unsigned char boot_cpu_id;
-               
-               set_sbi_tid(sbus->devid, boot_cpu_id << 3);
-               sbus_tid[sbus->board] = boot_cpu_id;
-#endif
+       for_each_node_by_name(dp, "sbi") {
+               int devid = of_getintprop_default(dp, "device-id", 0);
+               int board = of_getintprop_default(dp, "board#", 0);
+               unsigned int mask;
+
+               set_sbi_tid(devid, target_cpu << 3);
+               sbus_tid[board] = target_cpu;
+
                /* Get rid of pending irqs from PROM */
-               mask = acquire_sbi(sbus->devid, 0xffffffff);
+               mask = acquire_sbi(devid, 0xffffffff);
                if (mask) {
-                       printk ("Clearing pending IRQs %08x on SBI %d\n", mask, sbus->board);
-                       release_sbi(sbus->devid, mask);
+                       printk ("Clearing pending IRQs %08x on SBI %d\n", mask, board);
+                       release_sbi(devid, mask);
                }
        }
 }
@@ -572,11 +576,9 @@ void __init sun4d_init_IRQ(void)
 {
        local_irq_disable();
 
-       BTFIXUPSET_CALL(sbint_to_irq, sun4d_sbint_to_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(enable_irq, sun4d_enable_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(disable_irq, sun4d_disable_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(clear_clock_irq, sun4d_clear_clock_irq, BTFIXUPCALL_NORM);
-       BTFIXUPSET_CALL(clear_profile_irq, sun4d_clear_profile_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(load_profile_irq, sun4d_load_profile_irq, BTFIXUPCALL_NORM);
        sparc_init_timers = sun4d_init_timers;
 #ifdef CONFIG_SMP