Merge master.kernel.org:/home/rmk/linux-2.6-arm

7 files changed, 530 insertions, 29 deletions

diff --git a/arch/arm/mach-ixp2000/Makefile b/arch/arm/mach-ixp2000/Makefile
index 1e6139d42a92..9621aeb61f46 100644
--- a/arch/arm/mach-ixp2000/Makefile
+++ b/arch/arm/mach-ixp2000/Makefile
@@ -1,7 +1,7 @@
 #
 # Makefile for the linux kernel.
 #
-obj-y                   := core.o pci.o
+obj-y                   := core.o pci.o uengine.o
 obj-m                   :=
 obj-n                   :=
 obj-                    :=
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 01c393c504d0..c93a98b2a32c 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -1,5 +1,5 @@
 /*
- * arch/arm/mach-ixp2000/common.c
+ * arch/arm/mach-ixp2000/core.c
  *
  * Common routines used by all IXP2400/2800 based platforms.
  *
@@ -49,7 +49,6 @@ static unsigned long ixp2000_slowport_irq_flags;
  *************************************************************************/
 void ixp2000_acquire_slowport(struct slowport_cfg *new_cfg, struct slowport_cfg *old_cfg)
 {
-
         spin_lock_irqsave(&ixp2000_slowport_lock, ixp2000_slowport_irq_flags);
 
         old_cfg->CCR = *IXP2000_SLOWPORT_CCR;
@@ -62,7 +61,7 @@ void ixp2000_acquire_slowport(struct slowport_cfg *new_cfg, struct slowport_cfg
         ixp2000_reg_write(IXP2000_SLOWPORT_WTC2, new_cfg->WTC);
         ixp2000_reg_write(IXP2000_SLOWPORT_RTC2, new_cfg->RTC);
         ixp2000_reg_write(IXP2000_SLOWPORT_PCR, new_cfg->PCR);
-        ixp2000_reg_write(IXP2000_SLOWPORT_ADC, new_cfg->ADC);
+        ixp2000_reg_wrb(IXP2000_SLOWPORT_ADC, new_cfg->ADC);
 }
 
 void ixp2000_release_slowport(struct slowport_cfg *old_cfg)
@@ -71,7 +70,7 @@ void ixp2000_release_slowport(struct slowport_cfg *old_cfg)
         ixp2000_reg_write(IXP2000_SLOWPORT_WTC2, old_cfg->WTC);
         ixp2000_reg_write(IXP2000_SLOWPORT_RTC2, old_cfg->RTC);
         ixp2000_reg_write(IXP2000_SLOWPORT_PCR, old_cfg->PCR);
-        ixp2000_reg_write(IXP2000_SLOWPORT_ADC, old_cfg->ADC);
+        ixp2000_reg_wrb(IXP2000_SLOWPORT_ADC, old_cfg->ADC);
 
         spin_unlock_irqrestore(&ixp2000_slowport_lock, 
                                         ixp2000_slowport_irq_flags);
@@ -145,7 +144,7 @@ void __init ixp2000_map_io(void)
         iotable_init(ixp2000_io_desc, ARRAY_SIZE(ixp2000_io_desc));
 
         /* Set slowport to 8-bit mode.  */
-        ixp2000_reg_write(IXP2000_SLOWPORT_FRM, 1);
+        ixp2000_reg_wrb(IXP2000_SLOWPORT_FRM, 1);
 }
 
 
@@ -209,7 +208,7 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         write_seqlock(&xtime_lock);
 
         /* clear timer 1 */
-        ixp2000_reg_write(IXP2000_T1_CLR, 1);
+        ixp2000_reg_wrb(IXP2000_T1_CLR, 1);
 
         while ((next_jiffy_time - *missing_jiffy_timer_csr) > ticks_per_jiffy) {
                 timer_tick(regs);
@@ -252,12 +251,12 @@ void __init ixp2000_init_time(unsigned long tick_rate)
 
                 ixp2000_reg_write(IXP2000_T4_CLR, 0);
                 ixp2000_reg_write(IXP2000_T4_CLD, -1);
-                ixp2000_reg_write(IXP2000_T4_CTL, (1 << 7));
+                ixp2000_reg_wrb(IXP2000_T4_CTL, (1 << 7));
                 missing_jiffy_timer_csr = IXP2000_T4_CSR;
         } else {
                 ixp2000_reg_write(IXP2000_T2_CLR, 0);
                 ixp2000_reg_write(IXP2000_T2_CLD, -1);
-                ixp2000_reg_write(IXP2000_T2_CTL, (1 << 7));
+                ixp2000_reg_wrb(IXP2000_T2_CTL, (1 << 7));
                 missing_jiffy_timer_csr = IXP2000_T2_CSR;
         }
         next_jiffy_time = 0xffffffff;
@@ -279,7 +278,7 @@ static void update_gpio_int_csrs(void)
         ixp2000_reg_write(IXP2000_GPIO_FEDR, GPIO_IRQ_falling_edge);
         ixp2000_reg_write(IXP2000_GPIO_REDR, GPIO_IRQ_rising_edge);
         ixp2000_reg_write(IXP2000_GPIO_LSLR, GPIO_IRQ_level_low);
-        ixp2000_reg_write(IXP2000_GPIO_LSHR, GPIO_IRQ_level_high);
+        ixp2000_reg_wrb(IXP2000_GPIO_LSHR, GPIO_IRQ_level_high);
 }
 
 void gpio_line_config(int line, int direction)
@@ -297,9 +296,9 @@ void gpio_line_config(int line, int direction)
                 GPIO_IRQ_level_high &= ~(1 << line);
                 update_gpio_int_csrs();
 
-                ixp2000_reg_write(IXP2000_GPIO_PDSR, 1 << line);
+                ixp2000_reg_wrb(IXP2000_GPIO_PDSR, 1 << line);
         } else if (direction == GPIO_IN) {
-                ixp2000_reg_write(IXP2000_GPIO_PDCR, 1 << line);
+                ixp2000_reg_wrb(IXP2000_GPIO_PDCR, 1 << line);
         }
         local_irq_restore(flags);
 }
@@ -365,12 +364,12 @@ static void ixp2000_GPIO_irq_mask_ack(unsigned int irq)
 
         ixp2000_reg_write(IXP2000_GPIO_EDSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
         ixp2000_reg_write(IXP2000_GPIO_LDSR, (1 << (irq - IRQ_IXP2000_GPIO0)));
-        ixp2000_reg_write(IXP2000_GPIO_INST, (1 << (irq - IRQ_IXP2000_GPIO0)));
+        ixp2000_reg_wrb(IXP2000_GPIO_INST, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
 
 static void ixp2000_GPIO_irq_mask(unsigned int irq)
 {
-        ixp2000_reg_write(IXP2000_GPIO_INCR, (1 << (irq - IRQ_IXP2000_GPIO0)));
+        ixp2000_reg_wrb(IXP2000_GPIO_INCR, (1 << (irq - IRQ_IXP2000_GPIO0)));
 }
 
 static void ixp2000_GPIO_irq_unmask(unsigned int irq)
@@ -389,9 +388,9 @@ static void ixp2000_pci_irq_mask(unsigned int irq)
 {
         unsigned long temp = *IXP2000_PCI_XSCALE_INT_ENABLE;
         if (irq == IRQ_IXP2000_PCIA)
-                ixp2000_reg_write(IXP2000_PCI_XSCALE_INT_ENABLE, (temp & ~(1 << 26)));
+                ixp2000_reg_wrb(IXP2000_PCI_XSCALE_INT_ENABLE, (temp & ~(1 << 26)));
         else if (irq == IRQ_IXP2000_PCIB)
-                ixp2000_reg_write(IXP2000_PCI_XSCALE_INT_ENABLE, (temp & ~(1 << 27)));
+                ixp2000_reg_wrb(IXP2000_PCI_XSCALE_INT_ENABLE, (temp & ~(1 << 27)));
 }
 
 static void ixp2000_pci_irq_unmask(unsigned int irq)
@@ -411,7 +410,7 @@ static struct irqchip ixp2000_pci_irq_chip = {
 
 static void ixp2000_irq_mask(unsigned int irq)
 {
-        ixp2000_reg_write(IXP2000_IRQ_ENABLE_CLR, (1 << irq));
+        ixp2000_reg_wrb(IXP2000_IRQ_ENABLE_CLR, (1 << irq));
 }
 
 static void ixp2000_irq_unmask(unsigned int irq)
@@ -443,7 +442,7 @@ void __init ixp2000_init_irq(void)
         ixp2000_reg_write(IXP2000_GPIO_INCR, -1);
 
         /* clear PCI interrupt sources */
-        ixp2000_reg_write(IXP2000_PCI_XSCALE_INT_ENABLE, 0);
+        ixp2000_reg_wrb(IXP2000_PCI_XSCALE_INT_ENABLE, 0);
 
         /*
          * Certain bits in the IRQ status register of the 
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index 643f5e1c3d93..7719c478aa84 100644
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -64,6 +64,35 @@ static struct sys_timer enp2611_timer = {
 
 
 /*************************************************************************
+ * ENP-2611 I/O
+ *************************************************************************/
+static struct map_desc enp2611_io_desc[] __initdata = {
+        {
+                .virtual        = ENP2611_CALEB_VIRT_BASE,
+                .physical       = ENP2611_CALEB_PHYS_BASE,
+                .length         = ENP2611_CALEB_SIZE,
+                .type           = MT_IXP2000_DEVICE
+        }, {
+                .virtual        = ENP2611_PM3386_0_VIRT_BASE,
+                .physical       = ENP2611_PM3386_0_PHYS_BASE,
+                .length         = ENP2611_PM3386_0_SIZE,
+                .type           = MT_IXP2000_DEVICE
+        }, {
+                .virtual        = ENP2611_PM3386_1_VIRT_BASE,
+                .physical       = ENP2611_PM3386_1_PHYS_BASE,
+                .length         = ENP2611_PM3386_1_SIZE,
+                .type           = MT_IXP2000_DEVICE
+        }
+};
+
+void __init enp2611_map_io(void)
+{
+        ixp2000_map_io();
+        iotable_init(enp2611_io_desc, ARRAY_SIZE(enp2611_io_desc));
+}
+
+
+/*************************************************************************
  * ENP-2611 PCI
  *************************************************************************/
 static int enp2611_pci_setup(int nr, struct pci_sys_data *sys)
@@ -229,7 +258,7 @@ MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
         .phys_io        = IXP2000_UART_PHYS_BASE,
         .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
         .boot_params    = 0x00000100,
-        .map_io         = ixp2000_map_io,
+        .map_io         = enp2611_map_io,
         .init_irq       = ixp2000_init_irq,
         .timer          = &enp2611_timer,
         .init_machine   = enp2611_init_machine,
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index 05dfcb48c2b6..d628da56b4bc 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -81,7 +81,7 @@ static void ixdp2x00_irq_mask(unsigned int irq)
 
         dummy = *board_irq_mask;
         dummy |=  IXP2000_BOARD_IRQ_MASK(irq);
-        ixp2000_reg_write(board_irq_mask, dummy);
+        ixp2000_reg_wrb(board_irq_mask, dummy);
 
 #ifdef CONFIG_ARCH_IXDP2400
         if (machine_is_ixdp2400())
@@ -101,7 +101,7 @@ static void ixdp2x00_irq_unmask(unsigned int irq)
 
         dummy = *board_irq_mask;
         dummy &=  ~IXP2000_BOARD_IRQ_MASK(irq);
-        ixp2000_reg_write(board_irq_mask, dummy);
+        ixp2000_reg_wrb(board_irq_mask, dummy);
 
         if (machine_is_ixdp2400()) 
                 ixp2000_release_slowport(&old_cfg);
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index b21249908ae4..e6a882f35da2 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -51,7 +51,7 @@
  *************************************************************************/
 static void ixdp2x01_irq_mask(unsigned int irq)
 {
-        ixp2000_reg_write(IXDP2X01_INT_MASK_SET_REG,
+        ixp2000_reg_wrb(IXDP2X01_INT_MASK_SET_REG,
                                 IXP2000_BOARD_IRQ_MASK(irq));
 }
 
@@ -114,7 +114,7 @@ void __init ixdp2x01_init_irq(void)
 
         /* Mask all interrupts from CPLD, disable simulation */
         ixp2000_reg_write(IXDP2X01_INT_MASK_SET_REG, 0xffffffff);
-        ixp2000_reg_write(IXDP2X01_INT_SIM_REG, 0);
+        ixp2000_reg_wrb(IXDP2X01_INT_SIM_REG, 0);
 
         for (irq = NR_IXP2000_IRQS; irq < NR_IXDP2X01_IRQS; irq++) {
                 if (irq & valid_irq_mask) {
@@ -299,7 +299,6 @@ struct hw_pci ixdp2x01_pci __initdata = {
 
 int __init ixdp2x01_pci_init(void)
 {
-
         pci_common_init(&ixdp2x01_pci);
         return 0;
 }
@@ -316,7 +315,7 @@ static struct flash_platform_data ixdp2x01_flash_platform_data = {
 
 static unsigned long ixdp2x01_flash_bank_setup(unsigned long ofs)
 {
-        ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,
+        ixp2000_reg_wrb(IXDP2X01_CPLD_FLASH_REG,
                 ((ofs >> IXDP2X01_FLASH_WINDOW_BITS) | IXDP2X01_CPLD_FLASH_INTERN));
         return (ofs & IXDP2X01_FLASH_WINDOW_MASK);
 }
@@ -363,7 +362,7 @@ static struct platform_device *ixdp2x01_devices[] __initdata = {
 
 static void __init ixdp2x01_init_machine(void)
 {
-        ixp2000_reg_write(IXDP2X01_CPLD_FLASH_REG,
+        ixp2000_reg_wrb(IXDP2X01_CPLD_FLASH_REG,
                 (IXDP2X01_CPLD_FLASH_BANK_MASK | IXDP2X01_CPLD_FLASH_INTERN));
         
         ixdp2x01_flash_data.nr_banks =
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c
index 522205acb316..d4bf1e1c0031 100644
--- a/arch/arm/mach-ixp2000/pci.c
+++ b/arch/arm/mach-ixp2000/pci.c
@@ -148,7 +148,7 @@ int ixp2000_pci_abort_handler(unsigned long addr, unsigned int fsr, struct pt_re
         local_irq_save(flags);
         temp = *(IXP2000_PCI_CONTROL);
         if (temp & ((1 << 8) | (1 << 5))) {
-                ixp2000_reg_write(IXP2000_PCI_CONTROL, temp);
+                ixp2000_reg_wrb(IXP2000_PCI_CONTROL, temp);
         }
 
         temp = *(IXP2000_PCI_CMDSTAT);
@@ -178,8 +178,8 @@ clear_master_aborts(void)
 
         local_irq_save(flags);
         temp = *(IXP2000_PCI_CONTROL);
-        if (temp & ((1 << 8) | (1 << 5))) {     
-                ixp2000_reg_write(IXP2000_PCI_CONTROL, temp);
+        if (temp & ((1 << 8) | (1 << 5))) {
+                ixp2000_reg_wrb(IXP2000_PCI_CONTROL, temp);
         }
 
         temp = *(IXP2000_PCI_CMDSTAT);
diff --git a/arch/arm/mach-ixp2000/uengine.c b/arch/arm/mach-ixp2000/uengine.c
new file mode 100644
index 000000000000..43e234349d4a
--- /dev/null
+++ b/arch/arm/mach-ixp2000/uengine.c
@@ -0,0 +1,474 @@
+/*
+ * Generic library functions for the microengines found on the Intel
+ * IXP2000 series of network processors.
+ *
+ * Copyright (C) 2004, 2005 Lennert Buytenhek <buytenh@wantstofly.org>
+ * Dedicated to Marija Kulikova.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of the
+ * License, or (at your option) any later version.
+ */
+
+#include <linux/config.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/string.h>
+#include <asm/hardware.h>
+#include <asm/arch/ixp2000-regs.h>
+#include <asm/arch/uengine.h>
+#include <asm/io.h>
+
+#define USTORE_ADDRESS                  0x000
+#define USTORE_DATA_LOWER               0x004
+#define USTORE_DATA_UPPER               0x008
+#define CTX_ENABLES                     0x018
+#define CC_ENABLE                       0x01c
+#define CSR_CTX_POINTER                 0x020
+#define INDIRECT_CTX_STS                0x040
+#define ACTIVE_CTX_STS                  0x044
+#define INDIRECT_CTX_SIG_EVENTS         0x048
+#define INDIRECT_CTX_WAKEUP_EVENTS      0x050
+#define NN_PUT                          0x080
+#define NN_GET                          0x084
+#define TIMESTAMP_LOW                   0x0c0
+#define TIMESTAMP_HIGH                  0x0c4
+#define T_INDEX_BYTE_INDEX              0x0f4
+#define LOCAL_CSR_STATUS                0x180
+
+u32 ixp2000_uengine_mask;
+
+static void *ixp2000_uengine_csr_area(int uengine)
+{
+        return ((void *)IXP2000_UENGINE_CSR_VIRT_BASE) + (uengine << 10);
+}
+
+/*
+ * LOCAL_CSR_STATUS=1 after a read or write to a microengine's CSR
+ * space means that the microengine we tried to access was also trying
+ * to access its own CSR space on the same clock cycle as we did.  When
+ * this happens, we lose the arbitration process by default, and the
+ * read or write we tried to do was not actually performed, so we try
+ * again until it succeeds.
+ */
+u32 ixp2000_uengine_csr_read(int uengine, int offset)
+{
+        void *uebase;
+        u32 *local_csr_status;
+        u32 *reg;
+        u32 value;
+
+        uebase = ixp2000_uengine_csr_area(uengine);
+
+        local_csr_status = (u32 *)(uebase + LOCAL_CSR_STATUS);
+        reg = (u32 *)(uebase + offset);
+        do {
+                value = ixp2000_reg_read(reg);
+        } while (ixp2000_reg_read(local_csr_status) & 1);
+
+        return value;
+}
+EXPORT_SYMBOL(ixp2000_uengine_csr_read);
+
+void ixp2000_uengine_csr_write(int uengine, int offset, u32 value)
+{
+        void *uebase;
+        u32 *local_csr_status;
+        u32 *reg;
+
+        uebase = ixp2000_uengine_csr_area(uengine);
+
+        local_csr_status = (u32 *)(uebase + LOCAL_CSR_STATUS);
+        reg = (u32 *)(uebase + offset);
+        do {
+                ixp2000_reg_write(reg, value);
+        } while (ixp2000_reg_read(local_csr_status) & 1);
+}
+EXPORT_SYMBOL(ixp2000_uengine_csr_write);
+
+void ixp2000_uengine_reset(u32 uengine_mask)
+{
+        ixp2000_reg_write(IXP2000_RESET1, uengine_mask & ixp2000_uengine_mask);
+        ixp2000_reg_write(IXP2000_RESET1, 0);
+}
+EXPORT_SYMBOL(ixp2000_uengine_reset);
+
+void ixp2000_uengine_set_mode(int uengine, u32 mode)
+{
+        /*
+         * CTL_STR_PAR_EN: unconditionally enable parity checking on
+         * control store.
+         */
+        mode |= 0x10000000;
+        ixp2000_uengine_csr_write(uengine, CTX_ENABLES, mode);
+
+        /*
+         * Enable updating of condition codes.
+         */
+        ixp2000_uengine_csr_write(uengine, CC_ENABLE, 0x00002000);
+
+        /*
+         * Initialise other per-microengine registers.
+         */
+        ixp2000_uengine_csr_write(uengine, NN_PUT, 0x00);
+        ixp2000_uengine_csr_write(uengine, NN_GET, 0x00);
+        ixp2000_uengine_csr_write(uengine, T_INDEX_BYTE_INDEX, 0);
+}
+EXPORT_SYMBOL(ixp2000_uengine_set_mode);
+
+static int make_even_parity(u32 x)
+{
+        return hweight32(x) & 1;
+}
+
+static void ustore_write(int uengine, u64 insn)
+{
+        /*
+         * Generate even parity for top and bottom 20 bits.
+         */
+        insn |= (u64)make_even_parity((insn >> 20) & 0x000fffff) << 41;
+        insn |= (u64)make_even_parity(insn & 0x000fffff) << 40;
+
+        /*
+         * Write to microstore.  The second write auto-increments
+         * the USTORE_ADDRESS index register.
+         */
+        ixp2000_uengine_csr_write(uengine, USTORE_DATA_LOWER, (u32)insn);
+        ixp2000_uengine_csr_write(uengine, USTORE_DATA_UPPER, (u32)(insn >> 32));
+}
+
+void ixp2000_uengine_load_microcode(int uengine, u8 *ucode, int insns)
+{
+        int i;
+
+        /*
+         * Start writing to microstore at address 0.
+         */
+        ixp2000_uengine_csr_write(uengine, USTORE_ADDRESS, 0x80000000);
+        for (i = 0; i < insns; i++) {
+                u64 insn;
+
+                insn = (((u64)ucode[0]) << 32) |
+                        (((u64)ucode[1]) << 24) |
+                        (((u64)ucode[2]) << 16) |
+                        (((u64)ucode[3]) << 8) |
+                        ((u64)ucode[4]);
+                ucode += 5;
+
+                ustore_write(uengine, insn);
+        }
+
+        /*
+         * Pad with a few NOPs at the end (to avoid the microengine
+         * aborting as it prefetches beyond the last instruction), unless
+         * we run off the end of the instruction store first, at which
+         * point the address register will wrap back to zero.
+         */
+        for (i = 0; i < 4; i++) {
+                u32 addr;
+
+                addr = ixp2000_uengine_csr_read(uengine, USTORE_ADDRESS);
+                if (addr == 0x80000000)
+                        break;
+                ustore_write(uengine, 0xf0000c0300ULL);
+        }
+
+        /*
+         * End programming.
+         */
+        ixp2000_uengine_csr_write(uengine, USTORE_ADDRESS, 0x00000000);
+}
+EXPORT_SYMBOL(ixp2000_uengine_load_microcode);
+
+void ixp2000_uengine_init_context(int uengine, int context, int pc)
+{
+        /*
+         * Select the right context for indirect access.
+         */
+        ixp2000_uengine_csr_write(uengine, CSR_CTX_POINTER, context);
+
+        /*
+         * Initialise signal masks to immediately go to Ready state.
+         */
+        ixp2000_uengine_csr_write(uengine, INDIRECT_CTX_SIG_EVENTS, 1);
+        ixp2000_uengine_csr_write(uengine, INDIRECT_CTX_WAKEUP_EVENTS, 1);
+
+        /*
+         * Set program counter.
+         */
+        ixp2000_uengine_csr_write(uengine, INDIRECT_CTX_STS, pc);
+}
+EXPORT_SYMBOL(ixp2000_uengine_init_context);
+
+void ixp2000_uengine_start_contexts(int uengine, u8 ctx_mask)
+{
+        u32 mask;
+
+        /*
+         * Enable the specified context to go to Executing state.
+         */
+        mask = ixp2000_uengine_csr_read(uengine, CTX_ENABLES);
+        mask |= ctx_mask << 8;
+        ixp2000_uengine_csr_write(uengine, CTX_ENABLES, mask);
+}
+EXPORT_SYMBOL(ixp2000_uengine_start_contexts);
+
+void ixp2000_uengine_stop_contexts(int uengine, u8 ctx_mask)
+{
+        u32 mask;
+
+        /*
+         * Disable the Ready->Executing transition.  Note that this
+         * does not stop the context until it voluntarily yields.
+         */
+        mask = ixp2000_uengine_csr_read(uengine, CTX_ENABLES);
+        mask &= ~(ctx_mask << 8);
+        ixp2000_uengine_csr_write(uengine, CTX_ENABLES, mask);
+}
+EXPORT_SYMBOL(ixp2000_uengine_stop_contexts);
+
+static int check_ixp_type(struct ixp2000_uengine_code *c)
+{
+        u32 product_id;
+        u32 rev;
+
+        product_id = ixp2000_reg_read(IXP2000_PRODUCT_ID);
+        if (((product_id >> 16) & 0x1f) != 0)
+                return 0;
+
+        switch ((product_id >> 8) & 0xff) {
+        case 0:         /* IXP2800 */
+                if (!(c->cpu_model_bitmask & 4))
+                        return 0;
+                break;
+
+        case 1:         /* IXP2850 */
+                if (!(c->cpu_model_bitmask & 8))
+                        return 0;
+                break;
+
+        case 2:         /* IXP2400 */
+                if (!(c->cpu_model_bitmask & 2))
+                        return 0;
+                break;
+
+        default:
+                return 0;
+        }
+
+        rev = product_id & 0xff;
+        if (rev < c->cpu_min_revision || rev > c->cpu_max_revision)
+                return 0;
+
+        return 1;
+}
+
+static void generate_ucode(u8 *ucode, u32 *gpr_a, u32 *gpr_b)
+{
+        int offset;
+        int i;
+
+        offset = 0;
+
+        for (i = 0; i < 128; i++) {
+                u8 b3;
+                u8 b2;
+                u8 b1;
+                u8 b0;
+
+                b3 = (gpr_a[i] >> 24) & 0xff;
+                b2 = (gpr_a[i] >> 16) & 0xff;
+                b1 = (gpr_a[i] >> 8) & 0xff;
+                b0 = gpr_a[i] & 0xff;
+
+                // immed[@ai, (b1 << 8) | b0]
+                // 11110000 0000VVVV VVVV11VV VVVVVV00 1IIIIIII
+                ucode[offset++] = 0xf0;
+                ucode[offset++] = (b1 >> 4);
+                ucode[offset++] = (b1 << 4) | 0x0c | (b0 >> 6);
+                ucode[offset++] = (b0 << 2);
+                ucode[offset++] = 0x80 | i;
+
+                // immed_w1[@ai, (b3 << 8) | b2]
+                // 11110100 0100VVVV VVVV11VV VVVVVV00 1IIIIIII
+                ucode[offset++] = 0xf4;
+                ucode[offset++] = 0x40 | (b3 >> 4);
+                ucode[offset++] = (b3 << 4) | 0x0c | (b2 >> 6);
+                ucode[offset++] = (b2 << 2);
+                ucode[offset++] = 0x80 | i;
+        }
+
+        for (i = 0; i < 128; i++) {
+                u8 b3;
+                u8 b2;
+                u8 b1;
+                u8 b0;
+
+                b3 = (gpr_b[i] >> 24) & 0xff;
+                b2 = (gpr_b[i] >> 16) & 0xff;
+                b1 = (gpr_b[i] >> 8) & 0xff;
+                b0 = gpr_b[i] & 0xff;
+
+                // immed[@bi, (b1 << 8) | b0]
+                // 11110000 0000VVVV VVVV001I IIIIII11 VVVVVVVV
+                ucode[offset++] = 0xf0;
+                ucode[offset++] = (b1 >> 4);
+                ucode[offset++] = (b1 << 4) | 0x02 | (i >> 6);
+                ucode[offset++] = (i << 2) | 0x03;
+                ucode[offset++] = b0;
+
+                // immed_w1[@bi, (b3 << 8) | b2]
+                // 11110100 0100VVVV VVVV001I IIIIII11 VVVVVVVV
+                ucode[offset++] = 0xf4;
+                ucode[offset++] = 0x40 | (b3 >> 4);
+                ucode[offset++] = (b3 << 4) | 0x02 | (i >> 6);
+                ucode[offset++] = (i << 2) | 0x03;
+                ucode[offset++] = b2;
+        }
+
+        // ctx_arb[kill]
+        ucode[offset++] = 0xe0;
+        ucode[offset++] = 0x00;
+        ucode[offset++] = 0x01;
+        ucode[offset++] = 0x00;
+        ucode[offset++] = 0x00;
+}
+
+static int set_initial_registers(int uengine, struct ixp2000_uengine_code *c)
+{
+        int per_ctx_regs;
+        u32 *gpr_a;
+        u32 *gpr_b;
+        u8 *ucode;
+        int i;
+
+        gpr_a = kmalloc(128 * sizeof(u32), GFP_KERNEL);
+        gpr_b = kmalloc(128 * sizeof(u32), GFP_KERNEL);
+        ucode = kmalloc(513 * 5, GFP_KERNEL);
+        if (gpr_a == NULL || gpr_b == NULL || ucode == NULL) {
+                kfree(ucode);
+                kfree(gpr_b);
+                kfree(gpr_a);
+                return 1;
+        }
+
+        per_ctx_regs = 16;
+        if (c->uengine_parameters & IXP2000_UENGINE_4_CONTEXTS)
+                per_ctx_regs = 32;
+
+        memset(gpr_a, 0, sizeof(gpr_a));
+        memset(gpr_b, 0, sizeof(gpr_b));
+        for (i = 0; i < 256; i++) {
+                struct ixp2000_reg_value *r = c->initial_reg_values + i;
+                u32 *bank;
+                int inc;
+                int j;
+
+                if (r->reg == -1)
+                        break;
+
+                bank = (r->reg & 0x400) ? gpr_b : gpr_a;
+                inc = (r->reg & 0x80) ? 128 : per_ctx_regs;
+
+                j = r->reg & 0x7f;
+                while (j < 128) {
+                        bank[j] = r->value;
+                        j += inc;
+                }
+        }
+
+        generate_ucode(ucode, gpr_a, gpr_b);
+        ixp2000_uengine_load_microcode(uengine, ucode, 513);
+        ixp2000_uengine_init_context(uengine, 0, 0);
+        ixp2000_uengine_start_contexts(uengine, 0x01);
+        for (i = 0; i < 100; i++) {
+                u32 status;
+
+                status = ixp2000_uengine_csr_read(uengine, ACTIVE_CTX_STS);
+                if (!(status & 0x80000000))
+                        break;
+        }
+        ixp2000_uengine_stop_contexts(uengine, 0x01);
+
+        kfree(ucode);
+        kfree(gpr_b);
+        kfree(gpr_a);
+
+        return !!(i == 100);
+}
+
+int ixp2000_uengine_load(int uengine, struct ixp2000_uengine_code *c)
+{
+        int ctx;
+
+        if (!check_ixp_type(c))
+                return 1;
+
+        if (!(ixp2000_uengine_mask & (1 << uengine)))
+                return 1;
+
+        ixp2000_uengine_reset(1 << uengine);
+        ixp2000_uengine_set_mode(uengine, c->uengine_parameters);
+        if (set_initial_registers(uengine, c))
+                return 1;
+        ixp2000_uengine_load_microcode(uengine, c->insns, c->num_insns);
+
+        for (ctx = 0; ctx < 8; ctx++)
+                ixp2000_uengine_init_context(uengine, ctx, 0);
+
+        return 0;
+}
+EXPORT_SYMBOL(ixp2000_uengine_load);
+
+
+static int __init ixp2000_uengine_init(void)
+{
+        int uengine;
+        u32 value;
+
+        /*
+         * Determine number of microengines present.
+         */
+        switch ((ixp2000_reg_read(IXP2000_PRODUCT_ID) >> 8) & 0x1fff) {
+        case 0:         /* IXP2800 */
+        case 1:         /* IXP2850 */
+                ixp2000_uengine_mask = 0x00ff00ff;
+                break;
+
+        case 2:         /* IXP2400 */
+                ixp2000_uengine_mask = 0x000f000f;
+                break;
+
+        default:
+                printk(KERN_INFO "Detected unknown IXP2000 model (%.8x)\n",
+                        (unsigned int)ixp2000_reg_read(IXP2000_PRODUCT_ID));
+                ixp2000_uengine_mask = 0x00000000;
+                break;
+        }
+
+        /*
+         * Reset microengines.
+         */
+        ixp2000_reg_write(IXP2000_RESET1, ixp2000_uengine_mask);
+        ixp2000_reg_write(IXP2000_RESET1, 0);
+
+        /*
+         * Synchronise timestamp counters across all microengines.
+         */
+        value = ixp2000_reg_read(IXP2000_MISC_CONTROL);
+        ixp2000_reg_write(IXP2000_MISC_CONTROL, value & ~0x80);
+        for (uengine = 0; uengine < 32; uengine++) {
+                if (ixp2000_uengine_mask & (1 << uengine)) {
+                        ixp2000_uengine_csr_write(uengine, TIMESTAMP_LOW, 0);
+                        ixp2000_uengine_csr_write(uengine, TIMESTAMP_HIGH, 0);
+                }
+        }
+        ixp2000_reg_write(IXP2000_MISC_CONTROL, value | 0x80);
+
+        return 0;
+}
+
+subsys_initcall(ixp2000_uengine_init);