Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (171 commits)
  Blackfin arch: fix bug - BF527 0.2 silicon has different CPUID (DSPID) value
  Blackfin arch: Enlarge flash partition for kenel for bf533/bf537 boards
  Blackfin arch: fix bug: kernel crash when enable SDIO host driver
  Blackfin arch: Print FP at level KERN_NOTICE
  Blackfin arch: drop ad73311 test code
  Blackfin arch: update board default configs
  Blackfin arch: Set PB4 as the default irq for bf548 board v1.4+.
  Blackfin arch: fix typo in early printk bit size processing
  Blackfin arch: enable reprogram cclk and sclk for bf518f-ezbrd
  Blackfin arch: add SDIO host driver platform data
  Blackfin arch: fix bug - kernel stops at initial console
  Blackfin arch: fix bug - kernel crash after config IP for ethernet port
  Blackfin arch: add sdh support for bf518f-ezbrd
  Blackfin arch: fix bug - kernel detects BF532 incorrectly
  Blackfin arch: add () to avoid warnings from gcc
  Blackfin arch: change HWTRACE Kconfig and set it on default
  Blackfin arch: Clean oprofile build path for blackfin
  Blackfin arch: remove hardware PM code, oprofile not use it
  Blackfin arch: rewrite get_sclk()/get_vco()
  Blackfin arch: cleanup and unify the ins functions
  ...

1 files changed, 278 insertions, 0 deletions

diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h
new file mode 100644
index 000000000000..76f53d8b9a0d
--- /dev/null
+++ b/arch/blackfin/include/asm/ipipe.h
@@ -0,0 +1,278 @@
+/*   -*- linux-c -*-
+ *   include/asm-blackfin/ipipe.h
+ *
+ *   Copyright (C) 2002-2007 Philippe Gerum.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139,
+ *   USA; either version 2 of the License, or (at your option) any later
+ *   version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __ASM_BLACKFIN_IPIPE_H
+#define __ASM_BLACKFIN_IPIPE_H
+
+#ifdef CONFIG_IPIPE
+
+#include <linux/cpumask.h>
+#include <linux/list.h>
+#include <linux/threads.h>
+#include <linux/irq.h>
+#include <linux/ipipe_percpu.h>
+#include <asm/ptrace.h>
+#include <asm/irq.h>
+#include <asm/bitops.h>
+#include <asm/atomic.h>
+#include <asm/traps.h>
+
+#define IPIPE_ARCH_STRING     "1.8-00"
+#define IPIPE_MAJOR_NUMBER    1
+#define IPIPE_MINOR_NUMBER    8
+#define IPIPE_PATCH_NUMBER    0
+
+#ifdef CONFIG_SMP
+#error "I-pipe/blackfin: SMP not implemented"
+#else /* !CONFIG_SMP */
+#define ipipe_processor_id()    0
+#endif  /* CONFIG_SMP */
+
+#define prepare_arch_switch(next)               \
+do {                                            \
+        ipipe_schedule_notify(current, next);   \
+        local_irq_disable_hw();                 \
+} while (0)
+
+#define task_hijacked(p)                                                \
+        ({                                                              \
+                int __x__ = ipipe_current_domain != ipipe_root_domain;  \
+                /* We would need to clear the SYNC flag for the root domain */ \
+                /* over the current processor in SMP mode. */           \
+                local_irq_enable_hw(); __x__;                           \
+        })
+
+struct ipipe_domain;
+
+struct ipipe_sysinfo {
+
+        int ncpus;              /* Number of CPUs on board */
+        u64 cpufreq;            /* CPU frequency (in Hz) */
+
+        /* Arch-dependent block */
+
+        struct {
+                unsigned tmirq; /* Timer tick IRQ */
+                u64 tmfreq;     /* Timer frequency */
+        } archdep;
+};
+
+#define ipipe_read_tsc(t)                                       \
+        ({                                                      \
+        unsigned long __cy2;                                    \
+        __asm__ __volatile__ ("1: %0 = CYCLES2\n"               \
+                                "%1 = CYCLES\n"                 \
+                                "%2 = CYCLES2\n"                \
+                                "CC = %2 == %0\n"               \
+                                "if ! CC jump 1b\n"             \
+                                : "=r" (((unsigned long *)&t)[1]),      \
+                                  "=r" (((unsigned long *)&t)[0]),      \
+                                  "=r" (__cy2)                          \
+                                : /*no input*/ : "CC");                 \
+        t;                                                              \
+        })
+
+#define ipipe_cpu_freq()        __ipipe_core_clock
+#define ipipe_tsc2ns(_t)        (((unsigned long)(_t)) * __ipipe_freq_scale)
+#define ipipe_tsc2us(_t)        (ipipe_tsc2ns(_t) / 1000 + 1)
+
+/* Private interface -- Internal use only */
+
+#define __ipipe_check_platform()        do { } while (0)
+
+#define __ipipe_init_platform()         do { } while (0)
+
+extern atomic_t __ipipe_irq_lvdepth[IVG15 + 1];
+
+extern unsigned long __ipipe_irq_lvmask;
+
+extern struct ipipe_domain ipipe_root;
+
+/* enable/disable_irqdesc _must_ be used in pairs. */
+
+void __ipipe_enable_irqdesc(struct ipipe_domain *ipd,
+                            unsigned irq);
+
+void __ipipe_disable_irqdesc(struct ipipe_domain *ipd,
+                             unsigned irq);
+
+#define __ipipe_enable_irq(irq)         (irq_desc[irq].chip->unmask(irq))
+
+#define __ipipe_disable_irq(irq)        (irq_desc[irq].chip->mask(irq))
+
+#define __ipipe_lock_root()                                     \
+        set_bit(IPIPE_ROOTLOCK_FLAG, &ipipe_root_domain->flags)
+
+#define __ipipe_unlock_root()                                   \
+        clear_bit(IPIPE_ROOTLOCK_FLAG, &ipipe_root_domain->flags)
+
+void __ipipe_enable_pipeline(void);
+
+#define __ipipe_hook_critical_ipi(ipd) do { } while (0)
+
+#define __ipipe_sync_pipeline(syncmask)                                 \
+        do {                                                            \
+                struct ipipe_domain *ipd = ipipe_current_domain;        \
+                if (likely(ipd != ipipe_root_domain || !test_bit(IPIPE_ROOTLOCK_FLAG, &ipd->flags))) \
+                        __ipipe_sync_stage(syncmask);                   \
+        } while (0)
+
+void __ipipe_handle_irq(unsigned irq, struct pt_regs *regs);
+
+int __ipipe_get_irq_priority(unsigned irq);
+
+int __ipipe_get_irqthread_priority(unsigned irq);
+
+void __ipipe_stall_root_raw(void);
+
+void __ipipe_unstall_root_raw(void);
+
+void __ipipe_serial_debug(const char *fmt, ...);
+
+DECLARE_PER_CPU(struct pt_regs, __ipipe_tick_regs);
+
+extern unsigned long __ipipe_core_clock;
+
+extern unsigned long __ipipe_freq_scale;
+
+extern unsigned long __ipipe_irq_tail_hook;
+
+static inline unsigned long __ipipe_ffnz(unsigned long ul)
+{
+        return ffs(ul) - 1;
+}
+
+#define __ipipe_run_irqtail()  /* Must be a macro */                    \
+        do {                                                            \
+                asmlinkage void __ipipe_call_irqtail(void);             \
+                unsigned long __pending;                                \
+                CSYNC();                                        \
+                __pending = bfin_read_IPEND();                          \
+                if (__pending & 0x8000) {                               \
+                        __pending &= ~0x8010;                           \
+                        if (__pending && (__pending & (__pending - 1)) == 0) \
+                                __ipipe_call_irqtail();                 \
+                }                                                       \
+        } while (0)
+
+#define __ipipe_run_isr(ipd, irq)                                       \
+        do {                                                            \
+                if (ipd == ipipe_root_domain) {                         \
+                        /*                                              \
+                         * Note: the I-pipe implements a threaded interrupt model on \
+                         * this arch for Linux external IRQs. The interrupt handler we \
+                         * call here only wakes up the associated IRQ thread. \
+                         */                                             \
+                        if (ipipe_virtual_irq_p(irq)) {                 \
+                                /* No irqtail here; virtual interrupts have no effect \
+                                   on IPEND so there is no need for processing \
+                                   deferral. */                         \
+                                local_irq_enable_nohead(ipd);           \
+                                ipd->irqs[irq].handler(irq, ipd->irqs[irq].cookie); \
+                                local_irq_disable_nohead(ipd);          \
+                        } else                                          \
+                                /*                                      \
+                                 * No need to run the irqtail here either; \
+                                 * we can't be preempted by hw IRQs, so \
+                                 * non-Linux IRQs cannot stack over the short \
+                                 * thread wakeup code. Which in turn means \
+                                 * that no irqtail condition could be pending \
+                                 * for domains above Linux in the pipeline. \
+                                 */                                     \
+                                ipd->irqs[irq].handler(irq, &__raw_get_cpu_var(__ipipe_tick_regs)); \
+                } else {                                                \
+                        __clear_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
+                        local_irq_enable_nohead(ipd);                   \
+                        ipd->irqs[irq].handler(irq, ipd->irqs[irq].cookie); \
+                        /* Attempt to exit the outer interrupt level before \
+                         * starting the deferred IRQ processing. */     \
+                        local_irq_disable_nohead(ipd);                  \
+                        __ipipe_run_irqtail();                          \
+                        __set_bit(IPIPE_SYNC_FLAG, &ipipe_cpudom_var(ipd, status)); \
+                }                                                       \
+        } while (0)
+
+#define __ipipe_syscall_watched_p(p, sc)        \
+        (((p)->flags & PF_EVNOTIFY) || (unsigned long)sc >= NR_syscalls)
+
+void ipipe_init_irq_threads(void);
+
+int ipipe_start_irq_thread(unsigned irq, struct irq_desc *desc);
+
+#define IS_SYSIRQ(irq)          ((irq) > IRQ_CORETMR && (irq) <= SYS_IRQS)
+#define IS_GPIOIRQ(irq)         ((irq) >= GPIO_IRQ_BASE && (irq) < NR_IRQS)
+
+#define IRQ_SYSTMR              IRQ_TIMER0
+#define IRQ_PRIOTMR             CONFIG_IRQ_TIMER0
+
+#if defined(CONFIG_BF531) || defined(CONFIG_BF532) || defined(CONFIG_BF533)
+#define PRIO_GPIODEMUX(irq)     CONFIG_PFA
+#elif defined(CONFIG_BF534) || defined(CONFIG_BF536) || defined(CONFIG_BF537)
+#define PRIO_GPIODEMUX(irq)     CONFIG_IRQ_PROG_INTA
+#elif defined(CONFIG_BF52x)
+#define PRIO_GPIODEMUX(irq)     ((irq) == IRQ_PORTF_INTA ? CONFIG_IRQ_PORTF_INTA : \
+                                 (irq) == IRQ_PORTG_INTA ? CONFIG_IRQ_PORTG_INTA : \
+                                 (irq) == IRQ_PORTH_INTA ? CONFIG_IRQ_PORTH_INTA : \
+                                 -1)
+#elif defined(CONFIG_BF561)
+#define PRIO_GPIODEMUX(irq)     ((irq) == IRQ_PROG0_INTA ? CONFIG_IRQ_PROG0_INTA : \
+                                 (irq) == IRQ_PROG1_INTA ? CONFIG_IRQ_PROG1_INTA : \
+                                 (irq) == IRQ_PROG2_INTA ? CONFIG_IRQ_PROG2_INTA : \
+                                 -1)
+#define bfin_write_TIMER_DISABLE(val)   bfin_write_TMRS8_DISABLE(val)
+#define bfin_write_TIMER_ENABLE(val)    bfin_write_TMRS8_ENABLE(val)
+#define bfin_write_TIMER_STATUS(val)    bfin_write_TMRS8_STATUS(val)
+#define bfin_read_TIMER_STATUS()        bfin_read_TMRS8_STATUS()
+#elif defined(CONFIG_BF54x)
+#define PRIO_GPIODEMUX(irq)     ((irq) == IRQ_PINT0 ? CONFIG_IRQ_PINT0 : \
+                                 (irq) == IRQ_PINT1 ? CONFIG_IRQ_PINT1 : \
+                                 (irq) == IRQ_PINT2 ? CONFIG_IRQ_PINT2 : \
+                                 (irq) == IRQ_PINT3 ? CONFIG_IRQ_PINT3 : \
+                                 -1)
+#define bfin_write_TIMER_DISABLE(val)   bfin_write_TIMER_DISABLE0(val)
+#define bfin_write_TIMER_ENABLE(val)    bfin_write_TIMER_ENABLE0(val)
+#define bfin_write_TIMER_STATUS(val)    bfin_write_TIMER_STATUS0(val)
+#define bfin_read_TIMER_STATUS(val)     bfin_read_TIMER_STATUS0(val)
+#else
+# error "no PRIO_GPIODEMUX() for this part"
+#endif
+
+#define __ipipe_root_tick_p(regs)       ((regs->ipend & 0x10) != 0)
+
+#else /* !CONFIG_IPIPE */
+
+#define task_hijacked(p)                0
+#define ipipe_trap_notify(t, r)         0
+
+#define __ipipe_stall_root_raw()        do { } while (0)
+#define __ipipe_unstall_root_raw()      do { } while (0)
+
+#define ipipe_init_irq_threads()                do { } while (0)
+#define ipipe_start_irq_thread(irq, desc)       0
+
+#define IRQ_SYSTMR              IRQ_CORETMR
+#define IRQ_PRIOTMR             IRQ_CORETMR
+
+#define __ipipe_root_tick_p(regs)       1
+
+#endif /* !CONFIG_IPIPE */
+
+#endif  /* !__ASM_BLACKFIN_IPIPE_H */