Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc

* master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: (116 commits)
  [POWERPC] Add export of vgacon_remap_base
  [POWERPC] Remove bogus comment about page_is_ram
  [POWERPC] windfarm: don't die on suspend thread signal
  [POWERPC] Fix comment in kernel/irq.c
  [POWERPC] ppc: Fix booke watchdog initialization
  [POWERPC] PPC: Use ARRAY_SIZE macro when appropriate
  [POWERPC] Use ARRAY_SIZE macro when appropriate
  [POWERPC] Fix ppc64's writing to struct file_operations
  [POWERPC] ppc: use syslog macro for the printk log level
  [POWERPC] ppc: cs4218_tdm remove extra brace
  [POWERPC] Add mpc52xx/lite5200 PCI support
  [POWERPC] Only use H_BULK_REMOVE if the firmware supports it
  [POWERPC] Fixup error handling when emulating a floating point instruction
  [POWERPC] Enable interrupts if we are doing fp math emulation
  [POWERPC] Added kprobes support to ppc32
  [POWERPC] Make pSeries use the H_BULK_REMOVE hypervisor call
  [POWERPC] Clear RI bit in MSR before restoring r13 when returning to userspace
  [POWERPC] Fix performance monitor exception
  [POWERPC] Compile fixes for arch/powerpc dcr code
  [POWERPC] Maple: use mmio nvram
  ...

14 files changed, 167 insertions, 430 deletions

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9e43e39dc35c..d08bb4ee1307 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -610,6 +610,13 @@ config HVC_RTAS
         help
           IBM Console device driver which makes use of RTAS
 
+config HVC_BEAT
+        bool "Toshiba's Beat Hypervisor Console support"
+        depends on PPC_CELLEB
+        select HVC_DRIVER
+        help
+          Toshiba's Cell Reference Set Beat Console device driver
+
 config HVCS
         tristate "IBM Hypervisor Virtual Console Server support"
         depends on PPC_PSERIES
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index fc110637ced6..0326ca1a848a 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_RIO)		+= rio/ generic_serial.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvc_vio.o hvsi.o
 obj-$(CONFIG_HVC_ISERIES)       += hvc_iseries.o
 obj-$(CONFIG_HVC_RTAS)          += hvc_rtas.o
+obj-$(CONFIG_HVC_BEAT)          += hvc_beat.o
 obj-$(CONFIG_HVC_DRIVER)        += hvc_console.o
 obj-$(CONFIG_RAW_DRIVER)        += raw.o
 obj-$(CONFIG_SGI_SNSC)          += snsc.o snsc_event.o
diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
new file mode 100644
index 000000000000..6f019f19be71
--- /dev/null
+++ b/drivers/char/hvc_beat.c
@@ -0,0 +1,134 @@
+/*
+ * Beat hypervisor console driver
+ *
+ * (C) Copyright 2006 TOSHIBA CORPORATION
+ *
+ * This code is based on drivers/char/hvc_rtas.c:
+ * (C) Copyright IBM Corporation 2001-2005
+ * (C) Copyright Red Hat, Inc. 2005
+ *
+ * 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; 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/string.h>
+#include <linux/console.h>
+#include <asm/prom.h>
+#include <asm/hvconsole.h>
+#include <asm/firmware.h>
+
+#include "hvc_console.h"
+
+extern int64_t beat_get_term_char(uint64_t, uint64_t *, uint64_t *, uint64_t *);
+extern int64_t beat_put_term_char(uint64_t, uint64_t, uint64_t, uint64_t);
+
+struct hvc_struct *hvc_beat_dev = NULL;
+
+/* bug: only one queue is available regardless of vtermno */
+static int hvc_beat_get_chars(uint32_t vtermno, char *buf, int cnt)
+{
+        static unsigned char q[sizeof(unsigned long) * 2]
+                __attribute__((aligned(sizeof(unsigned long))));
+        static int qlen = 0;
+        unsigned long got;
+
+again:
+        if (qlen) {
+                if (qlen > cnt) {
+                        memcpy(buf, q, cnt);
+                        qlen -= cnt;
+                        memmove(q + cnt, q, qlen);
+                        return cnt;
+                } else {        /* qlen <= cnt */
+                        int     r;
+
+                        memcpy(buf, q, qlen);
+                        r = qlen;
+                        qlen = 0;
+                        return r;
+                }
+        }
+        if (beat_get_term_char(vtermno, &got,
+                ((unsigned long *)q), ((unsigned long *)q) + 1) == 0) {
+                qlen = got;
+                goto again;
+        }
+        return 0;
+}
+
+static int hvc_beat_put_chars(uint32_t vtermno, const char *buf, int cnt)
+{
+        unsigned long kb[2];
+        int rest, nlen;
+
+        for (rest = cnt; rest > 0; rest -= nlen) {
+                nlen = (rest > 16) ? 16 : rest;
+                memcpy(kb, buf, nlen);
+                beat_put_term_char(vtermno, rest, kb[0], kb[1]);
+                rest -= nlen;
+        }
+        return cnt;
+}
+
+static struct hv_ops hvc_beat_get_put_ops = {
+        .get_chars = hvc_beat_get_chars,
+        .put_chars = hvc_beat_put_chars,
+};
+
+static int hvc_beat_useit = 1;
+
+static int hvc_beat_config(char *p)
+{
+        hvc_beat_useit = simple_strtoul(p, NULL, 0);
+        return 0;
+}
+
+static int hvc_beat_console_init(void)
+{
+        if (hvc_beat_useit && machine_is_compatible("Beat")) {
+                hvc_instantiate(0, 0, &hvc_beat_get_put_ops);
+        }
+        return 0;
+}
+
+/* temp */
+static int hvc_beat_init(void)
+{
+        struct hvc_struct *hp;
+
+        if (!firmware_has_feature(FW_FEATURE_BEAT))
+                return -ENODEV;
+
+        hp = hvc_alloc(0, NO_IRQ, &hvc_beat_get_put_ops, 16);
+        if (IS_ERR(hp))
+                return PTR_ERR(hp);
+        hvc_beat_dev = hp;
+        return 0;
+}
+
+static void __exit hvc_beat_exit(void)
+{
+        if (hvc_beat_dev)
+                hvc_remove(hvc_beat_dev);
+}
+
+module_init(hvc_beat_init);
+module_exit(hvc_beat_exit);
+
+__setup("hvc_beat=", hvc_beat_config);
+
+console_initcall(hvc_beat_console_init);
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index 488902231cc2..0e23f29f71ab 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -35,7 +35,7 @@
 #ifdef  CONFIG_FSL_BOOKE
 #define WDT_PERIOD_DEFAULT 63   /* Ex. wdt_period=28 bus=333Mhz , reset=~40sec */
 #else
-#define WDT_PERIOD_DEFAULT 4    /* Refer to the PPC40x and PPC4xx manuals */
+#define WDT_PERIOD_DEFAULT 3    /* Refer to the PPC40x and PPC4xx manuals */
 #endif                          /* for timing information */
 
 u32 booke_wdt_enabled = 0;
@@ -48,12 +48,22 @@ u32 booke_wdt_period = WDT_PERIOD_DEFAULT;
 #endif
 
 /*
+ * booke_wdt_ping:
+ */
+static __inline__ void booke_wdt_ping(void)
+{
+        mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
+}
+
+/*
  * booke_wdt_enable:
  */
 static __inline__ void booke_wdt_enable(void)
 {
         u32 val;
 
+        /* clear status before enabling watchdog */
+        booke_wdt_ping();
         val = mfspr(SPRN_TCR);
         val |= (TCR_WIE|TCR_WRC(WRC_CHIP)|WDTP(booke_wdt_period));
 
@@ -61,14 +71,6 @@ static __inline__ void booke_wdt_enable(void)
 }
 
 /*
- * booke_wdt_ping:
- */
-static __inline__ void booke_wdt_ping(void)
-{
-        mtspr(SPRN_TSR, TSR_ENW|TSR_WIS);
-}
-
-/*
  * booke_wdt_write:
  */
 static ssize_t booke_wdt_write (struct file *file, const char __user *buf,
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index e947af982f93..94c117ef20c1 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -94,8 +94,6 @@ static int wf_thread_func(void *data)
         DBG("wf: thread started\n");
 
         while(!kthread_should_stop()) {
-                try_to_freeze();
-
                 if (time_after_eq(jiffies, next)) {
                         wf_notify(WF_EVENT_TICK, NULL);
                         if (wf_overtemp) {
@@ -118,8 +116,8 @@ static int wf_thread_func(void *data)
                 if (delay <= HZ)
                         schedule_timeout_interruptible(delay);
 
-                /* there should be no signal, but oh well */
-                if (signal_pending(current)) {
+                /* there should be no non-suspend signal, but oh well */
+                if (signal_pending(current) && !try_to_freeze()) {
                         printk(KERN_WARNING "windfarm: thread got sigl !\n");
                         break;
                 }
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index 92590d8fc24b..569be225cd05 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -9,6 +9,7 @@
 #include <linux/dma-mapping.h>
 
 #include <linux/fs_enet_pd.h>
+#include <asm/fs_pd.h>
 
 #ifdef CONFIG_CPM1
 #include <asm/commproc.h>
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 6d71bea5e900..0d6943d67096 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -42,8 +42,6 @@
 
 #include "gianfar.h"
 
-#define is_power_of_2(x)        ((x) != 0 && (((x) & ((x) - 1)) == 0))
-
 extern void gfar_start(struct net_device *dev);
 extern int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit);
 
diff --git a/drivers/ps3/Makefile b/drivers/ps3/Makefile
index 8433eb7562cb..d547cf50ca9d 100644
--- a/drivers/ps3/Makefile
+++ b/drivers/ps3/Makefile
@@ -1,2 +1 @@
-obj-y += system-bus.o
 obj-$(CONFIG_PS3_VUART) += vuart.o
diff --git a/drivers/ps3/system-bus.c b/drivers/ps3/system-bus.c
deleted file mode 100644
index d79f949bcb2a..000000000000
--- a/drivers/ps3/system-bus.c
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- *  PS3 system bus driver.
- *
- *  Copyright (C) 2006 Sony Computer Entertainment Inc.
- *  Copyright 2006 Sony Corp.
- *
- *  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; version 2 of the License.
- *
- *  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
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/dma-mapping.h>
-#include <linux/err.h>
-
-#include <asm/udbg.h>
-#include <asm/ps3.h>
-#include <asm/lv1call.h>
-#include <asm/firmware.h>
-
-#define dump_mmio_region(_a) _dump_mmio_region(_a, __func__, __LINE__)
-static void _dump_mmio_region(const struct ps3_mmio_region* r,
-        const char* func, int line)
-{
-        pr_debug("%s:%d: dev       %u:%u\n", func, line, r->did.bus_id,
-                r->did.dev_id);
-        pr_debug("%s:%d: bus_addr  %lxh\n", func, line, r->bus_addr);
-        pr_debug("%s:%d: len       %lxh\n", func, line, r->len);
-        pr_debug("%s:%d: lpar_addr %lxh\n", func, line, r->lpar_addr);
-}
-
-int ps3_mmio_region_create(struct ps3_mmio_region *r)
-{
-        int result;
-
-        result = lv1_map_device_mmio_region(r->did.bus_id, r->did.dev_id,
-                r->bus_addr, r->len, r->page_size, &r->lpar_addr);
-
-        if (result) {
-                pr_debug("%s:%d: lv1_map_device_mmio_region failed: %s\n",
-                        __func__, __LINE__, ps3_result(result));
-                r->lpar_addr = r->len = r->bus_addr = 0;
-        }
-
-        dump_mmio_region(r);
-        return result;
-}
-
-int ps3_free_mmio_region(struct ps3_mmio_region *r)
-{
-        int result;
-
-        result = lv1_unmap_device_mmio_region(r->did.bus_id, r->did.dev_id,
-                r->bus_addr);
-
-        if (result)
-                pr_debug("%s:%d: lv1_unmap_device_mmio_region failed: %s\n",
-                        __func__, __LINE__, ps3_result(result));
-
-        r->lpar_addr = r->len = r->bus_addr = 0;
-        return result;
-}
-
-static int ps3_system_bus_match(struct device *_dev,
-        struct device_driver *_drv)
-{
-        int result;
-        struct ps3_system_bus_driver *drv = to_ps3_system_bus_driver(_drv);
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-
-        result = dev->match_id == drv->match_id;
-
-        pr_info("%s:%d: dev=%u(%s), drv=%u(%s): %s\n", __func__, __LINE__,
-                dev->match_id, dev->core.bus_id, drv->match_id, drv->core.name,
-                (result ? "match" : "miss"));
-        return result;
-}
-
-static int ps3_system_bus_probe(struct device *_dev)
-{
-        int result;
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        struct ps3_system_bus_driver *drv =
-                to_ps3_system_bus_driver(_dev->driver);
-
-        result = lv1_open_device(dev->did.bus_id, dev->did.dev_id, 0);
-
-        if (result) {
-                pr_debug("%s:%d: lv1_open_device failed (%d)\n",
-                        __func__, __LINE__, result);
-                result = -EACCES;
-                goto clean_none;
-        }
-
-        if (dev->d_region->did.bus_id) {
-                result = ps3_dma_region_create(dev->d_region);
-
-                if (result) {
-                        pr_debug("%s:%d: ps3_dma_region_create failed (%d)\n",
-                                __func__, __LINE__, result);
-                        BUG_ON("check region type");
-                        result = -EINVAL;
-                        goto clean_device;
-                }
-        }
-
-        BUG_ON(!drv);
-
-        if (drv->probe)
-                result = drv->probe(dev);
-        else
-                pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,
-                        dev->core.bus_id);
-
-        if (result) {
-                pr_debug("%s:%d: drv->probe failed\n", __func__, __LINE__);
-                goto clean_dma;
-        }
-
-        return result;
-
-clean_dma:
-        ps3_dma_region_free(dev->d_region);
-clean_device:
-        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
-clean_none:
-        return result;
-}
-
-static int ps3_system_bus_remove(struct device *_dev)
-{
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        struct ps3_system_bus_driver *drv =
-                to_ps3_system_bus_driver(_dev->driver);
-
-        if (drv->remove)
-                drv->remove(dev);
-        else
-                pr_info("%s:%d: %s no remove method\n", __func__, __LINE__,
-                        dev->core.bus_id);
-
-        ps3_dma_region_free(dev->d_region);
-        ps3_free_mmio_region(dev->m_region);
-        lv1_close_device(dev->did.bus_id, dev->did.dev_id);
-
-        return 0;
-}
-
-struct bus_type ps3_system_bus_type = {
-        .name = "ps3_system_bus",
-        .match = ps3_system_bus_match,
-        .probe = ps3_system_bus_probe,
-        .remove = ps3_system_bus_remove,
-};
-
-int __init ps3_system_bus_init(void)
-{
-        int result;
-
-        if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
-                return 0;
-
-        result = bus_register(&ps3_system_bus_type);
-        BUG_ON(result);
-        return result;
-}
-
-core_initcall(ps3_system_bus_init);
-
-/* Allocates a contiguous real buffer and creates mappings over it.
- * Returns the virtual address of the buffer and sets dma_handle
- * to the dma address (mapping) of the first page.
- */
-
-static void * ps3_alloc_coherent(struct device *_dev, size_t size,
-        dma_addr_t *dma_handle, gfp_t flag)
-{
-        int result;
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        unsigned long virt_addr;
-
-        BUG_ON(!dev->d_region->bus_addr);
-
-        flag &= ~(__GFP_DMA | __GFP_HIGHMEM);
-        flag |= __GFP_ZERO;
-
-        virt_addr = __get_free_pages(flag, get_order(size));
-
-        if (!virt_addr) {
-                pr_debug("%s:%d: get_free_pages failed\n", __func__, __LINE__);
-                goto clean_none;
-        }
-
-        result = ps3_dma_map(dev->d_region, virt_addr, size, dma_handle);
-
-        if (result) {
-                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
-                        __func__, __LINE__, result);
-                BUG_ON("check region type");
-                goto clean_alloc;
-        }
-
-        return (void*)virt_addr;
-
-clean_alloc:
-        free_pages(virt_addr, get_order(size));
-clean_none:
-        dma_handle = NULL;
-        return NULL;
-}
-
-static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
-        dma_addr_t dma_handle)
-{
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-
-        ps3_dma_unmap(dev->d_region, dma_handle, size);
-        free_pages((unsigned long)vaddr, get_order(size));
-}
-
-/* Creates TCEs for a user provided buffer.  The user buffer must be
- * contiguous real kernel storage (not vmalloc).  The address of the buffer
- * passed here is the kernel (virtual) address of the buffer.  The buffer
- * need not be page aligned, the dma_addr_t returned will point to the same
- * byte within the page as vaddr.
- */
-
-static dma_addr_t ps3_map_single(struct device *_dev, void *ptr, size_t size,
-        enum dma_data_direction direction)
-{
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        int result;
-        unsigned long bus_addr;
-
-        result = ps3_dma_map(dev->d_region, (unsigned long)ptr, size,
-                &bus_addr);
-
-        if (result) {
-                pr_debug("%s:%d: ps3_dma_map failed (%d)\n",
-                        __func__, __LINE__, result);
-        }
-
-        return bus_addr;
-}
-
-static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
-        size_t size, enum dma_data_direction direction)
-{
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        int result;
-
-        result = ps3_dma_unmap(dev->d_region, dma_addr, size);
-
-        if (result) {
-                pr_debug("%s:%d: ps3_dma_unmap failed (%d)\n",
-                        __func__, __LINE__, result);
-        }
-}
-
-static int ps3_map_sg(struct device *_dev, struct scatterlist *sg, int nents,
-        enum dma_data_direction direction)
-{
-#if defined(CONFIG_PS3_DYNAMIC_DMA)
-        BUG_ON("do");
-#endif
-        return 0;
-}
-
-static void ps3_unmap_sg(struct device *_dev, struct scatterlist *sg,
-        int nents, enum dma_data_direction direction)
-{
-#if defined(CONFIG_PS3_DYNAMIC_DMA)
-        BUG_ON("do");
-#endif
-}
-
-static int ps3_dma_supported(struct device *_dev, u64 mask)
-{
-        return 1;
-}
-
-static struct dma_mapping_ops ps3_dma_ops = {
-        .alloc_coherent = ps3_alloc_coherent,
-        .free_coherent = ps3_free_coherent,
-        .map_single = ps3_map_single,
-        .unmap_single = ps3_unmap_single,
-        .map_sg = ps3_map_sg,
-        .unmap_sg = ps3_unmap_sg,
-        .dma_supported = ps3_dma_supported
-};
-
-/**
- * ps3_system_bus_release_device - remove a device from the system bus
- */
-
-static void ps3_system_bus_release_device(struct device *_dev)
-{
-        struct ps3_system_bus_device *dev = to_ps3_system_bus_device(_dev);
-        kfree(dev);
-}
-
-/**
- * ps3_system_bus_device_register - add a device to the system bus
- *
- * ps3_system_bus_device_register() expects the dev object to be allocated
- * dynamically by the caller.  The system bus takes ownership of the dev
- * object and frees the object in ps3_system_bus_release_device().
- */
-
-int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
-{
-        int result;
-        static unsigned int dev_count = 1;
-
-        dev->core.parent = NULL;
-        dev->core.bus = &ps3_system_bus_type;
-        dev->core.release = ps3_system_bus_release_device;
-
-        dev->core.archdata.of_node = NULL;
-        dev->core.archdata.dma_ops = &ps3_dma_ops;
-        dev->core.archdata.numa_node = 0;
-
-        snprintf(dev->core.bus_id, sizeof(dev->core.bus_id), "sb_%02x",
-                dev_count++);
-
-        pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);
-
-        result = device_register(&dev->core);
-        return result;
-}
-
-EXPORT_SYMBOL_GPL(ps3_system_bus_device_register);
-
-int ps3_system_bus_driver_register(struct ps3_system_bus_driver *drv)
-{
-        int result;
-
-        drv->core.bus = &ps3_system_bus_type;
-
-        result = driver_register(&drv->core);
-        return result;
-}
-
-EXPORT_SYMBOL_GPL(ps3_system_bus_driver_register);
-
-void ps3_system_bus_driver_unregister(struct ps3_system_bus_driver *drv)
-{
-        driver_unregister(&drv->core);
-}
-
-EXPORT_SYMBOL_GPL(ps3_system_bus_driver_unregister);
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c
index 6974f65bcda5..a72da8f651f8 100644
--- a/drivers/ps3/vuart.c
+++ b/drivers/ps3/vuart.c
@@ -783,8 +783,8 @@ static int ps3_vuart_probe(struct device *_dev)
 
         vuart_private.in_use++;
         if (vuart_private.in_use == 1) {
-                result = ps3_alloc_vuart_irq((void*)&vuart_private.bmp.status,
-                        &vuart_private.virq);
+                result = ps3_alloc_vuart_irq(PS3_BINDING_CPU_ANY,
+                        (void*)&vuart_private.bmp.status, &vuart_private.virq);
 
                 if (result) {
                         dev_dbg(&dev->core,
diff --git a/drivers/ps3/vuart.h b/drivers/ps3/vuart.h
index 28fd89f0c8aa..11c421cf7a03 100644
--- a/drivers/ps3/vuart.h
+++ b/drivers/ps3/vuart.h
@@ -21,37 +21,6 @@
 #if !defined(_PS3_VUART_H)
 #define _PS3_VUART_H
 
-struct ps3_vuart_stats {
-        unsigned long bytes_written;
-        unsigned long bytes_read;
-        unsigned long tx_interrupts;
-        unsigned long rx_interrupts;
-        unsigned long disconnect_interrupts;
-};
-
-/**
- * struct ps3_vuart_port_device - a device on a vuart port
- */
-
-struct ps3_vuart_port_device {
-        enum ps3_match_id match_id;
-        struct device core;
-
-        /* private driver variables */
-        unsigned int port_number;
-        unsigned long interrupt_mask;
-        struct {
-                spinlock_t lock;
-                struct list_head head;
-        } tx_list;
-        struct {
-                unsigned long bytes_held;
-                spinlock_t lock;
-                struct list_head head;
-        } rx_list;
-        struct ps3_vuart_stats stats;
-};
-
 /**
  * struct ps3_vuart_port_driver - a driver for a device on a vuart port
  */
@@ -68,9 +37,9 @@ struct ps3_vuart_port_driver {
         /* int (*resume)(struct ps3_vuart_port_device *); */
 };
 
-int ps3_vuart_port_device_register(struct ps3_vuart_port_device *dev);
 int ps3_vuart_port_driver_register(struct ps3_vuart_port_driver *drv);
 void ps3_vuart_port_driver_unregister(struct ps3_vuart_port_driver *drv);
+
 int ps3_vuart_write(struct ps3_vuart_port_device *dev,
         const void* buf, unsigned int bytes);
 int ps3_vuart_read(struct ps3_vuart_port_device *dev, void* buf,
@@ -86,9 +55,4 @@ static inline struct ps3_vuart_port_device *to_ps3_vuart_port_device(
         return container_of(_dev, struct ps3_vuart_port_device, core);
 }
 
-int ps3_vuart_write(struct ps3_vuart_port_device *dev, const void* buf,
-        unsigned int bytes);
-int ps3_vuart_read(struct ps3_vuart_port_device *dev, void* buf,
-        unsigned int bytes);
-
 #endif
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
index 08e55fdc882a..925fb607d8c4 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c
@@ -40,6 +40,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/fs_pd.h>
 
 #include <linux/serial_core.h>
 #include <linux/kernel.h>
@@ -145,7 +146,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
                 /* was hostalloc but changed cause it blows away the */
                 /* large tlb mapping when pinning the kernel area    */
                 mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
-                dma_addr = (u32)mem_addr;
+                dma_addr = (u32)cpm_dpram_phys(mem_addr);
         } else
                 mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
                                               GFP_KERNEL);
@@ -205,7 +206,7 @@ int __init cpm_uart_init_portdesc(void)
             (unsigned long)&cpmp->cp_smc[0];
         cpm_uart_ports[UART_SMC1].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC1].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC1;
 #endif
 
@@ -217,7 +218,7 @@ int __init cpm_uart_init_portdesc(void)
             (unsigned long)&cpmp->cp_smc[1];
         cpm_uart_ports[UART_SMC2].smcp->smc_smcm |= (SMCM_RX | SMCM_TX);
         cpm_uart_ports[UART_SMC2].smcp->smc_smcmr &= ~(SMCMR_REN | SMCMR_TEN);
-        cpm_uart_ports[UART_SMC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SMC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SMC2;
 #endif
 
@@ -231,7 +232,7 @@ int __init cpm_uart_init_portdesc(void)
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC1].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC1].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC1].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC1;
 #endif
 
@@ -245,7 +246,7 @@ int __init cpm_uart_init_portdesc(void)
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC2].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC2].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC2].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC2;
 #endif
 
@@ -259,7 +260,7 @@ int __init cpm_uart_init_portdesc(void)
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC3].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC3].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC3].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC3;
 #endif
 
@@ -273,7 +274,7 @@ int __init cpm_uart_init_portdesc(void)
             ~(UART_SCCM_TX | UART_SCCM_RX);
         cpm_uart_ports[UART_SCC4].sccp->scc_gsmrl &=
             ~(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-        cpm_uart_ports[UART_SCC4].port.uartclk = (((bd_t *) __res)->bi_intfreq);
+        cpm_uart_ports[UART_SCC4].port.uartclk = uart_clock();
         cpm_uart_port_map[cpm_uart_nr++] = UART_SCC4;
 #endif
         return 0;
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
index 5eb49ea63bfe..a99e45e2b6d8 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h
@@ -20,9 +20,6 @@
 #define SCC3_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC3)
 #define SCC4_IRQ        (CPM_IRQ_OFFSET + CPMVEC_SCC4)
 
-/* the CPM address */
-#define CPM_ADDR        IMAP_ADDR
-
 static inline void cpm_set_brg(int brg, int baud)
 {
         cpm_setbrg(brg, baud);
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
index 4b779111eaf9..1b3219f56c81 100644
--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h
+++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h
@@ -20,9 +20,6 @@
 #define SCC3_IRQ        SIU_INT_SCC3
 #define SCC4_IRQ        SIU_INT_SCC4
 
-/* the CPM address */
-#define CPM_ADDR        CPM_MAP_ADDR
-
 static inline void cpm_set_brg(int brg, int baud)
 {
         cpm_setbrg(brg, baud);