8 files changed, 76 insertions, 60 deletions

diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
index e7c6386782ed..5add22fc9899 100644
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -177,7 +177,6 @@ static irqreturn_t fsg_reset_handler(int irq, void *dev_id)
 
 static void __init fsg_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
 
         ixp4xx_sys_init();
@@ -256,10 +255,10 @@ static void __init fsg_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "FSG: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, fsg_plat_eth[0].hwaddr));
-        printk(KERN_INFO "FSG: Using MAC address %s for port 1\n",
-               print_mac(mac_buf, fsg_plat_eth[1].hwaddr));
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n",
+               fsg_plat_eth[0].hwaddr);
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n",
+               fsg_plat_eth[1].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/include/mach/dma.h b/arch/arm/mach-ixp4xx/include/mach/dma.h
deleted file mode 100644
index 00c5070c0201..000000000000
--- a/arch/arm/mach-ixp4xx/include/mach/dma.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-ixp4xx/include/mach/dma.h
- *
- * Copyright (C) 2001-2004 MontaVista Software, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#include <linux/device.h>
-#include <asm/page.h>
-#include <asm/sizes.h>
-#include <mach/hardware.h>
-
-#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_64M)
-
-#endif /* _ASM_ARCH_DMA_H */
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h
index 319948e31bec..ce63048d45eb 100644
--- a/arch/arm/mach-ixp4xx/include/mach/io.h
+++ b/arch/arm/mach-ixp4xx/include/mach/io.h
@@ -49,8 +49,6 @@ extern int ixp4xx_pci_write(u32 addr, u32 cmd, u32 data);
 
 #else
 
-#include <linux/mm.h>
-
 /*
  * In the case of using indirect PCI, we simply return the actual PCI
  * address and our read/write implementation use that to drive the 
@@ -241,7 +239,7 @@ __ixp4xx_readsl(const volatile void __iomem *bus_addr, u32 *vaddr, u32 count)
 
 #ifndef CONFIG_PCI
 
-#define __io(v)         v
+#define __io(v)         __typesafe_io(v)
 
 #else
 
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h
index c4d2830ac987..98f5e5e20980 100644
--- a/arch/arm/mach-ixp4xx/include/mach/memory.h
+++ b/arch/arm/mach-ixp4xx/include/mach/memory.h
@@ -22,19 +22,8 @@ void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes);
         ixp4xx_adjust_zones(node, size, holes)
 
 #define ISA_DMA_THRESHOLD (SZ_64M - 1)
+#define MAX_DMA_ADDRESS         (PAGE_OFFSET + SZ_64M)
 
 #endif
 
-/*
- * Virtual view <-> DMA view memory address translations
- * virt_to_bus: Used to translate the virtual address to an
- *              address suitable to be passed to set_dma_addr
- * bus_to_virt: Used to convert an address for DMA operations
- *              to an address that the kernel can use.
- *
- * These are dummies for now.
- */
-#define __virt_to_bus(x)         __virt_to_phys(x)
-#define __bus_to_virt(x)         __phys_to_virt(x)
-
 #endif
diff --git a/arch/arm/mach-ixp4xx/include/mach/qmgr.h b/arch/arm/mach-ixp4xx/include/mach/qmgr.h
index 1e52b95cede5..0cbe6ceb67c5 100644
--- a/arch/arm/mach-ixp4xx/include/mach/qmgr.h
+++ b/arch/arm/mach-ixp4xx/include/mach/qmgr.h
@@ -12,6 +12,8 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 
+#define DEBUG_QMGR      0
+
 #define HALF_QUEUES     32
 #define QUEUES          64      /* only 32 lower queues currently supported */
 #define MAX_QUEUE_LENGTH 4      /* in dwords */
@@ -61,22 +63,51 @@ void qmgr_enable_irq(unsigned int queue);
 void qmgr_disable_irq(unsigned int queue);
 
 /* request_ and release_queue() must be called from non-IRQ context */
+
+#if DEBUG_QMGR
+extern char qmgr_queue_descs[QUEUES][32];
+
 int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
                        unsigned int nearly_empty_watermark,
-                       unsigned int nearly_full_watermark);
+                       unsigned int nearly_full_watermark,
+                       const char *desc_format, const char* name);
+#else
+int __qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
+                         unsigned int nearly_empty_watermark,
+                         unsigned int nearly_full_watermark);
+#define qmgr_request_queue(queue, len, nearly_empty_watermark,          \
+                           nearly_full_watermark, desc_format, name)    \
+        __qmgr_request_queue(queue, len, nearly_empty_watermark,        \
+                             nearly_full_watermark)
+#endif
+
 void qmgr_release_queue(unsigned int queue);
 
 
 static inline void qmgr_put_entry(unsigned int queue, u32 val)
 {
         extern struct qmgr_regs __iomem *qmgr_regs;
+#if DEBUG_QMGR
+        BUG_ON(!qmgr_queue_descs[queue]); /* not yet requested */
+
+        printk(KERN_DEBUG "Queue %s(%i) put %X\n",
+               qmgr_queue_descs[queue], queue, val);
+#endif
         __raw_writel(val, &qmgr_regs->acc[queue][0]);
 }
 
 static inline u32 qmgr_get_entry(unsigned int queue)
 {
+        u32 val;
         extern struct qmgr_regs __iomem *qmgr_regs;
-        return __raw_readl(&qmgr_regs->acc[queue][0]);
+        val = __raw_readl(&qmgr_regs->acc[queue][0]);
+#if DEBUG_QMGR
+        BUG_ON(!qmgr_queue_descs[queue]); /* not yet requested */
+
+        printk(KERN_DEBUG "Queue %s(%i) get %X\n",
+               qmgr_queue_descs[queue], queue, val);
+#endif
+        return val;
 }
 
 static inline int qmgr_get_stat1(unsigned int queue)
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
index c6cb069a5a83..bfddc73d0a20 100644
--- a/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
+++ b/arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
@@ -14,8 +14,6 @@
 #include <linux/module.h>
 #include <mach/qmgr.h>
 
-#define DEBUG           0
-
 struct qmgr_regs __iomem *qmgr_regs;
 static struct resource *mem_res;
 static spinlock_t qmgr_lock;
@@ -23,6 +21,10 @@ static u32 used_sram_bitmap[4]; /* 128 16-dword pages */
 static void (*irq_handlers[HALF_QUEUES])(void *pdev);
 static void *irq_pdevs[HALF_QUEUES];
 
+#if DEBUG_QMGR
+char qmgr_queue_descs[QUEUES][32];
+#endif
+
 void qmgr_set_irq(unsigned int queue, int src,
                   void (*handler)(void *pdev), void *pdev)
 {
@@ -70,6 +72,7 @@ void qmgr_disable_irq(unsigned int queue)
         spin_lock_irqsave(&qmgr_lock, flags);
         __raw_writel(__raw_readl(&qmgr_regs->irqen[0]) & ~(1 << queue),
                      &qmgr_regs->irqen[0]);
+        __raw_writel(1 << queue, &qmgr_regs->irqstat[0]); /* clear */
         spin_unlock_irqrestore(&qmgr_lock, flags);
 }
 
@@ -81,9 +84,16 @@ static inline void shift_mask(u32 *mask)
         mask[0] <<= 1;
 }
 
+#if DEBUG_QMGR
 int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
                        unsigned int nearly_empty_watermark,
-                       unsigned int nearly_full_watermark)
+                       unsigned int nearly_full_watermark,
+                       const char *desc_format, const char* name)
+#else
+int __qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
+                         unsigned int nearly_empty_watermark,
+                         unsigned int nearly_full_watermark)
+#endif
 {
         u32 cfg, addr = 0, mask[4]; /* in 16-dwords */
         int err;
@@ -151,12 +161,13 @@ int qmgr_request_queue(unsigned int queue, unsigned int len /* dwords */,
         used_sram_bitmap[2] |= mask[2];
         used_sram_bitmap[3] |= mask[3];
         __raw_writel(cfg | (addr << 14), &qmgr_regs->sram[queue]);
-        spin_unlock_irq(&qmgr_lock);
-
-#if DEBUG
-        printk(KERN_DEBUG "qmgr: requested queue %i, addr = 0x%02X\n",
-               queue, addr);
+#if DEBUG_QMGR
+        snprintf(qmgr_queue_descs[queue], sizeof(qmgr_queue_descs[0]),
+                 desc_format, name);
+        printk(KERN_DEBUG "qmgr: requested queue %s(%i) addr = 0x%02X\n",
+               qmgr_queue_descs[queue], queue, addr);
 #endif
+        spin_unlock_irq(&qmgr_lock);
         return 0;
 
 err:
@@ -189,6 +200,11 @@ void qmgr_release_queue(unsigned int queue)
         while (addr--)
                 shift_mask(mask);
 
+#if DEBUG_QMGR
+        printk(KERN_DEBUG "qmgr: releasing queue %s(%i)\n",
+               qmgr_queue_descs[queue], queue);
+        qmgr_queue_descs[queue][0] = '\x0';
+#endif
         __raw_writel(0, &qmgr_regs->sram[queue]);
 
         used_sram_bitmap[0] &= ~mask[0];
@@ -199,9 +215,10 @@ void qmgr_release_queue(unsigned int queue)
         spin_unlock_irq(&qmgr_lock);
 
         module_put(THIS_MODULE);
-#if DEBUG
-        printk(KERN_DEBUG "qmgr: released queue %i\n", queue);
-#endif
+
+        while ((addr = qmgr_get_entry(queue)))
+                printk(KERN_ERR "qmgr: released queue %i not empty: 0x%08X\n",
+                       queue, addr);
 }
 
 static int qmgr_init(void)
@@ -272,5 +289,10 @@ EXPORT_SYMBOL(qmgr_regs);
 EXPORT_SYMBOL(qmgr_set_irq);
 EXPORT_SYMBOL(qmgr_enable_irq);
 EXPORT_SYMBOL(qmgr_disable_irq);
+#if DEBUG_QMGR
+EXPORT_SYMBOL(qmgr_queue_descs);
 EXPORT_SYMBOL(qmgr_request_queue);
+#else
+EXPORT_SYMBOL(__qmgr_request_queue);
+#endif
 EXPORT_SYMBOL(qmgr_release_queue);
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 0acd95ecf27e..921c947b5b6b 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -231,7 +231,6 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
 
 static void __init nas100d_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -294,8 +293,8 @@ static void __init nas100d_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NAS100D: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nas100d_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n",
+               nas100d_plat_eth[0].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index bc9d920ae54f..ff6a08d02cc4 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -220,7 +220,6 @@ static struct sys_timer nslu2_timer = {
 
 static void __init nslu2_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -275,8 +274,8 @@ static void __init nslu2_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NSLU2: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nslu2_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n",
+               nslu2_plat_eth[0].hwaddr);
 
 }