3 files changed, 70 insertions, 56 deletions

diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 847e3e6356c6..e1289a256ce5 100644
--- 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/dmabounce.c b/arch/arm/common/dmabounce.c
index 7971d0dc6892..5b7c26395b44 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -77,6 +77,8 @@ struct dmabounce_device_info {
 #endif
         struct dmabounce_pool   small;
         struct dmabounce_pool   large;
+
+        rwlock_t lock;
 };
 
 static LIST_HEAD(dmabounce_devs);
@@ -116,6 +118,7 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
         struct safe_buffer *buf;
         struct dmabounce_pool *pool;
         struct device *dev = device_info->dev;
+        unsigned long flags;
 
         dev_dbg(dev, "%s(ptr=%p, size=%d, dir=%d)\n",
                 __func__, ptr, size, dir);
@@ -163,8 +166,12 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
                 print_alloc_stats(device_info);
 #endif
 
+        write_lock_irqsave(&device_info->lock, flags);
+
         list_add(&buf->node, &device_info->safe_buffers);
 
+        write_unlock_irqrestore(&device_info->lock, flags);
+
         return buf;
 }
 
@@ -172,22 +179,32 @@ alloc_safe_buffer(struct dmabounce_device_info *device_info, void *ptr,
 static inline struct safe_buffer *
 find_safe_buffer(struct dmabounce_device_info *device_info, dma_addr_t safe_dma_addr)
 {
-        struct safe_buffer *b;
+        struct safe_buffer *b = NULL;
+        unsigned long flags;
+
+        read_lock_irqsave(&device_info->lock, flags);
 
         list_for_each_entry(b, &device_info->safe_buffers, node)
                 if (b->safe_dma_addr == safe_dma_addr)
-                        return b;
+                        break;
 
-        return NULL;
+        read_unlock_irqrestore(&device_info->lock, flags);
+        return b;
 }
 
 static inline void
 free_safe_buffer(struct dmabounce_device_info *device_info, struct safe_buffer *buf)
 {
+        unsigned long flags;
+
         dev_dbg(device_info->dev, "%s(buf=%p)\n", __func__, buf);
 
+        write_lock_irqsave(&device_info->lock, flags);
+
         list_del(&buf->node);
 
+        write_unlock_irqrestore(&device_info->lock, flags);
+
         if (buf->pool)
                 dma_pool_free(buf->pool->pool, buf->safe, buf->safe_dma_addr);
         else
@@ -396,7 +413,6 @@ dma_addr_t
 dma_map_single(struct device *dev, void *ptr, size_t size,
                 enum dma_data_direction dir)
 {
-        unsigned long flags;
         dma_addr_t dma_addr;
 
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
@@ -404,12 +420,8 @@ dma_map_single(struct device *dev, void *ptr, size_t size,
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         dma_addr = map_single(dev, ptr, size, dir);
 
-        local_irq_restore(flags);
-
         return dma_addr;
 }
 
@@ -424,25 +436,18 @@ void
 dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
                         enum dma_data_direction dir)
 {
-        unsigned long flags;
-
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
                 __func__, (void *) dma_addr, size, dir);
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         unmap_single(dev, dma_addr, size, dir);
-
-        local_irq_restore(flags);
 }
 
 int
 dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
                 enum dma_data_direction dir)
 {
-        unsigned long flags;
         int i;
 
         dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
@@ -450,8 +455,6 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         for (i = 0; i < nents; i++, sg++) {
                 struct page *page = sg->page;
                 unsigned int offset = sg->offset;
@@ -462,8 +465,6 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
                         map_single(dev, ptr, length, dir);
         }
 
-        local_irq_restore(flags);
-
         return nents;
 }
 
@@ -471,7 +472,6 @@ void
 dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
                 enum dma_data_direction dir)
 {
-        unsigned long flags;
         int i;
 
         dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
@@ -479,55 +479,38 @@ dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         for (i = 0; i < nents; i++, sg++) {
                 dma_addr_t dma_addr = sg->dma_address;
                 unsigned int length = sg->length;
 
                 unmap_single(dev, dma_addr, length, dir);
         }
-
-        local_irq_restore(flags);
 }
 
 void
 dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_addr, size_t size,
                                 enum dma_data_direction dir)
 {
-        unsigned long flags;
-
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
                 __func__, (void *) dma_addr, size, dir);
 
-        local_irq_save(flags);
-
         sync_single(dev, dma_addr, size, dir);
-
-        local_irq_restore(flags);
 }
 
 void
 dma_sync_single_for_device(struct device *dev, dma_addr_t dma_addr, size_t size,
                                 enum dma_data_direction dir)
 {
-        unsigned long flags;
-
         dev_dbg(dev, "%s(ptr=%p,size=%d,dir=%x)\n",
                 __func__, (void *) dma_addr, size, dir);
 
-        local_irq_save(flags);
-
         sync_single(dev, dma_addr, size, dir);
-
-        local_irq_restore(flags);
 }
 
 void
 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
                         enum dma_data_direction dir)
 {
-        unsigned long flags;
         int i;
 
         dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
@@ -535,23 +518,18 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nents,
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         for (i = 0; i < nents; i++, sg++) {
                 dma_addr_t dma_addr = sg->dma_address;
                 unsigned int length = sg->length;
 
                 sync_single(dev, dma_addr, length, dir);
         }
-
-        local_irq_restore(flags);
 }
 
 void
 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
                         enum dma_data_direction dir)
 {
-        unsigned long flags;
         int i;
 
         dev_dbg(dev, "%s(sg=%p,nents=%d,dir=%x)\n",
@@ -559,16 +537,12 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents,
 
         BUG_ON(dir == DMA_NONE);
 
-        local_irq_save(flags);
-
         for (i = 0; i < nents; i++, sg++) {
                 dma_addr_t dma_addr = sg->dma_address;
                 unsigned int length = sg->length;
 
                 sync_single(dev, dma_addr, length, dir);
         }
-
-        local_irq_restore(flags);
 }
 
 static int
@@ -622,6 +596,7 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
 
         device_info->dev = dev;
         INIT_LIST_HEAD(&device_info->safe_buffers);
+        rwlock_init(&device_info->lock);
 
 #ifdef STATS
         device_info->total_allocs = 0;
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c
index a1310b71004e..dfca596a9a27 100644
--- 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;
 }