[ARM] 3620/2: ixp23xx: add uengine loader support

Patch from Lennert Buytenhek

This patch allows the ixp2000 uengine loader that is already in the
tree to also be used on the ixp23xx.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 847e3e6356c67b10bb7c89b53dce4d471c6be142..e1289a256ce5792f75823d6cfe63116c74c444e3 100644 (file)
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -16,3 +16,4 @@ obj-$(CONFIG_SHARP_PARAM)     += sharpsl_param.o
 obj-$(CONFIG_SHARPSL_PM)       += sharpsl_pm.o
 obj-$(CONFIG_SHARP_SCOOP)      += scoop.o
 obj-$(CONFIG_ARCH_IXP2000)     += uengine.o
+obj-$(CONFIG_ARCH_IXP23XX)     += uengine.o

diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c
index a1310b71004ea691862458f4ae9d0fb00f346cda..dfca596a9a276b90a76b6e02a6528c80fd8acdb5 100644 (file)
--- a/arch/arm/common/uengine.c
+++ b/arch/arm/common/uengine.c
@@ -18,10 +18,26 @@
 #include <linux/module.h>
 #include <linux/string.h>
 #include <asm/hardware.h>
-#include <asm/arch/ixp2000-regs.h>
+#include <asm/arch/hardware.h>
 #include <asm/hardware/uengine.h>
 #include <asm/io.h>
 
+#if defined(CONFIG_ARCH_IXP2000)
+#define IXP_UENGINE_CSR_VIRT_BASE      IXP2000_UENGINE_CSR_VIRT_BASE
+#define IXP_PRODUCT_ID                 IXP2000_PRODUCT_ID
+#define IXP_MISC_CONTROL               IXP2000_MISC_CONTROL
+#define IXP_RESET1                     IXP2000_RESET1
+#else
+#if defined(CONFIG_ARCH_IXP23XX)
+#define IXP_UENGINE_CSR_VIRT_BASE      IXP23XX_UENGINE_CSR_VIRT_BASE
+#define IXP_PRODUCT_ID                 IXP23XX_PRODUCT_ID
+#define IXP_MISC_CONTROL               IXP23XX_MISC_CONTROL
+#define IXP_RESET1                     IXP23XX_RESET1
+#else
+#error unknown platform
+#endif
+#endif
+
 #define USTORE_ADDRESS                 0x000
 #define USTORE_DATA_LOWER              0x004
 #define USTORE_DATA_UPPER              0x008
@@ -43,7 +59,7 @@ u32 ixp2000_uengine_mask;
 
 static void *ixp2000_uengine_csr_area(int uengine)
 {
-       return ((void *)IXP2000_UENGINE_CSR_VIRT_BASE) + (uengine << 10);
+       return ((void *)IXP_UENGINE_CSR_VIRT_BASE) + (uengine << 10);
 }
 
 /*
@@ -91,8 +107,13 @@ EXPORT_SYMBOL(ixp2000_uengine_csr_write);
 
 void ixp2000_uengine_reset(u32 uengine_mask)
 {
-       ixp2000_reg_wrb(IXP2000_RESET1, uengine_mask & ixp2000_uengine_mask);
-       ixp2000_reg_wrb(IXP2000_RESET1, 0);
+       u32 value;
+
+       value = ixp2000_reg_read(IXP_RESET1) & ~ixp2000_uengine_mask;
+
+       uengine_mask &= ixp2000_uengine_mask;
+       ixp2000_reg_wrb(IXP_RESET1, value | uengine_mask);
+       ixp2000_reg_wrb(IXP_RESET1, value);
 }
 EXPORT_SYMBOL(ixp2000_uengine_reset);
 
@@ -235,11 +256,12 @@ static int check_ixp_type(struct ixp2000_uengine_code *c)
        u32 product_id;
        u32 rev;
 
-       product_id = ixp2000_reg_read(IXP2000_PRODUCT_ID);
+       product_id = ixp2000_reg_read(IXP_PRODUCT_ID);
        if (((product_id >> 16) & 0x1f) != 0)
                return 0;
 
        switch ((product_id >> 8) & 0xff) {
+#ifdef CONFIG_ARCH_IXP2000
        case 0:         /* IXP2800 */
                if (!(c->cpu_model_bitmask & 4))
                        return 0;
@@ -254,6 +276,14 @@ static int check_ixp_type(struct ixp2000_uengine_code *c)
                if (!(c->cpu_model_bitmask & 2))
                        return 0;
                break;
+#endif
+
+#ifdef CONFIG_ARCH_IXP23XX
+       case 4:         /* IXP23xx */
+               if (!(c->cpu_model_bitmask & 0x3f0))
+                       return 0;
+               break;
+#endif
 
        default:
                return 0;
@@ -432,7 +462,8 @@ static int __init ixp2000_uengine_init(void)
        /*
         * Determine number of microengines present.
         */
-       switch ((ixp2000_reg_read(IXP2000_PRODUCT_ID) >> 8) & 0x1fff) {
+       switch ((ixp2000_reg_read(IXP_PRODUCT_ID) >> 8) & 0x1fff) {
+#ifdef CONFIG_ARCH_IXP2000
        case 0:         /* IXP2800 */
        case 1:         /* IXP2850 */
                ixp2000_uengine_mask = 0x00ff00ff;
@@ -441,10 +472,17 @@ static int __init ixp2000_uengine_init(void)
        case 2:         /* IXP2400 */
                ixp2000_uengine_mask = 0x000f000f;
                break;
+#endif
+
+#ifdef CONFIG_ARCH_IXP23XX
+       case 4:         /* IXP23xx */
+               ixp2000_uengine_mask = (*IXP23XX_EXP_CFG_FUSE >> 8) & 0xf;
+               break;
+#endif
 
        default:
                printk(KERN_INFO "Detected unknown IXP2000 model (%.8x)\n",
-                       (unsigned int)ixp2000_reg_read(IXP2000_PRODUCT_ID));
+                       (unsigned int)ixp2000_reg_read(IXP_PRODUCT_ID));
                ixp2000_uengine_mask = 0x00000000;
                break;
        }
@@ -457,15 +495,15 @@ static int __init ixp2000_uengine_init(void)
        /*
         * Synchronise timestamp counters across all microengines.
         */
-       value = ixp2000_reg_read(IXP2000_MISC_CONTROL);
-       ixp2000_reg_wrb(IXP2000_MISC_CONTROL, value & ~0x80);
+       value = ixp2000_reg_read(IXP_MISC_CONTROL);
+       ixp2000_reg_wrb(IXP_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_wrb(IXP2000_MISC_CONTROL, value | 0x80);
+       ixp2000_reg_wrb(IXP_MISC_CONTROL, value | 0x80);
 
        return 0;
 }

diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c
index e2aad734080e2c1a93e9cf6d5b8253dc361fcf3c..051e3d70026e7b1eb96763c9e3704e2cf19e84f0 100644 (file)
--- a/arch/arm/mach-ixp23xx/core.c
+++ b/arch/arm/mach-ixp23xx/core.c
@@ -439,5 +439,6 @@ static struct platform_device *ixp23xx_devices[] __initdata = {
 
 void __init ixp23xx_sys_init(void)
 {
+       *IXP23XX_EXP_UNIT_FUSE |= 0xf;
        platform_add_devices(ixp23xx_devices, ARRAY_SIZE(ixp23xx_devices));
 }

diff --git a/include/asm-arm/arch-ixp23xx/ixp23xx.h b/include/asm-arm/arch-ixp23xx/ixp23xx.h
index 01efdbd1180ff0cfa1c45a357bda12d52da3521e..d0a72201ee96a344163a849a9998f41f8274c9e9 100644 (file)
--- a/include/asm-arm/arch-ixp23xx/ixp23xx.h
+++ b/include/asm-arm/arch-ixp23xx/ixp23xx.h
@@ -124,6 +124,7 @@
 
 #define IXP23XX_EXP_UNIT_FUSE          IXP23XX_EXP_CFG_REG(0x28)
 #define IXP23XX_EXP_MSF_MUX            IXP23XX_EXP_CFG_REG(0x30)
+#define IXP23XX_EXP_CFG_FUSE           IXP23XX_EXP_CFG_REG(0x34)
 
 #define IXP23XX_EXP_BUS_PHYS           0x90000000
 #define IXP23XX_EXP_BUS_WINDOW_SIZE    0x01000000
@@ -265,6 +266,8 @@
 #define IXP23XX_PCI_UNIT_RESET         (1 << 1)
 #define IXP23XX_XSCALE_RESET           (1 << 0)
 
+#define IXP23XX_UENGINE_CSR_VIRT_BASE  (IXP23XX_CAP_CSR_VIRT + 0x18000)
+
 
 /****************************************************************************
  * PCI CSRs.

diff --git a/include/asm-arm/arch-ixp23xx/platform.h b/include/asm-arm/arch-ixp23xx/platform.h
index e4d99060a049d7792a994cda7bc3320c1de95143..19a73b39c8640491dc034bdbf5629edad8cd69c1 100644 (file)
--- a/include/asm-arm/arch-ixp23xx/platform.h
+++ b/include/asm-arm/arch-ixp23xx/platform.h
@@ -14,6 +14,21 @@
 
 #ifndef __ASSEMBLY__
 
+extern inline unsigned long ixp2000_reg_read(volatile void *reg)
+{
+       return *((volatile unsigned long *)reg);
+}
+
+extern inline void ixp2000_reg_write(volatile void *reg, unsigned long val)
+{
+       *((volatile unsigned long *)reg) = val;
+}
+
+extern inline void ixp2000_reg_wrb(volatile void *reg, unsigned long val)
+{
+       *((volatile unsigned long *)reg) = val;
+}
+
 struct pci_sys_data;
 
 void ixp23xx_map_io(void);