Merge branch 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6

* 'for-2.6.23' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6: (37 commits)
  [CELL] spufs: rework list management and associated locking
  [CELL] oprofile: add support to OProfile for profiling CELL BE SPUs
  [CELL] oprofile: enable SPU switch notification to detect currently active SPU tasks
  [CELL] spu_base: locking cleanup
  [CELL] cell: indexing of SPUs based on firmware vicinity properties
  [CELL] spufs: integration of SPE affinity with the scheduller
  [CELL] cell: add placement computation for scheduling of affinity contexts
  [CELL] spufs: extension of spu_create to support affinity definition
  [CELL] cell: add hardcoded spu vicinity information for QS20
  [CELL] cell: add vicinity information on spus
  [CELL] cell: add per BE structure with info about its SPUs
  [CELL] spufs: use find_first_bit() instead of sched_find_first_bit()
  [CELL] spufs: remove unused file argument from spufs_run_spu()
  [CELL] spufs: change decrementer restore timing
  [CELL] spufs: dont halt decrementer at restore step 47
  [CELL] spufs: limit saving MFC_CNTL bits
  [CELL] spufs: fix read and write for decr_status file
  [CELL] spufs: fix decr_status meanings
  [CELL] spufs: remove needless context save/restore code
  [CELL] spufs: fix array size of channel index
  ...

3 files changed, 404 insertions, 29 deletions

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index f65078c3d3b3..484eb4e0e9db 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_QUICC_ENGINE)	+= qe_lib/
 mv64x60-$(CONFIG_PCI)           += mv64x60_pci.o
 obj-$(CONFIG_MV64X60)           += $(mv64x60-y) mv64x60_pic.o mv64x60_dev.o
 obj-$(CONFIG_RTC_DRV_CMOS)      += rtc_cmos_setup.o
+obj-$(CONFIG_AXON_RAM)          += axonram.o
 
 # contains only the suspend handler for time
 ifeq ($(CONFIG_RTC_CLASS),)
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
new file mode 100644
index 000000000000..2326d5dc5752
--- /dev/null
+++ b/arch/powerpc/sysdev/axonram.c
@@ -0,0 +1,381 @@
+/*
+ * (C) Copyright IBM Deutschland Entwicklung GmbH 2006
+ *
+ * Author: Maxim Shchetynin <maxim@de.ibm.com>
+ *
+ * Axon DDR2 device driver.
+ * It registers one block device per Axon's DDR2 memory bank found on a system.
+ * Block devices are called axonram?, their major and minor numbers are
+ * available in /proc/devices, /proc/partitions or in /sys/block/axonram?/dev.
+ *
+ * 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, 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/bio.h>
+#include <linux/blkdev.h>
+#include <linux/buffer_head.h>
+#include <linux/device.h>
+#include <linux/errno.h>
+#include <linux/fs.h>
+#include <linux/genhd.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/irq.h>
+#include <linux/irqreturn.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#include <asm/page.h>
+#include <asm/prom.h>
+
+#define AXON_RAM_MODULE_NAME            "axonram"
+#define AXON_RAM_DEVICE_NAME            "axonram"
+#define AXON_RAM_MINORS_PER_DISK        16
+#define AXON_RAM_BLOCK_SHIFT            PAGE_SHIFT
+#define AXON_RAM_BLOCK_SIZE             1 << AXON_RAM_BLOCK_SHIFT
+#define AXON_RAM_SECTOR_SHIFT           9
+#define AXON_RAM_SECTOR_SIZE            1 << AXON_RAM_SECTOR_SHIFT
+#define AXON_RAM_IRQ_FLAGS              IRQF_SHARED | IRQF_TRIGGER_RISING
+
+struct axon_ram_bank {
+        struct of_device        *device;
+        struct gendisk          *disk;
+        unsigned int            irq_correctable;
+        unsigned int            irq_uncorrectable;
+        unsigned long           ph_addr;
+        unsigned long           io_addr;
+        unsigned long           size;
+        unsigned long           ecc_counter;
+};
+
+static ssize_t
+axon_ram_sysfs_ecc(struct device *dev, struct device_attribute *attr, char *buf)
+{
+        struct of_device *device = to_of_device(dev);
+        struct axon_ram_bank *bank = device->dev.platform_data;
+
+        BUG_ON(!bank);
+
+        return sprintf(buf, "%ld\n", bank->ecc_counter);
+}
+
+static DEVICE_ATTR(ecc, S_IRUGO, axon_ram_sysfs_ecc, NULL);
+
+/**
+ * axon_ram_irq_handler - interrupt handler for Axon RAM ECC
+ * @irq: interrupt ID
+ * @dev: pointer to of_device
+ */
+static irqreturn_t
+axon_ram_irq_handler(int irq, void *dev)
+{
+        struct of_device *device = dev;
+        struct axon_ram_bank *bank = device->dev.platform_data;
+
+        BUG_ON(!bank);
+
+        if (irq == bank->irq_correctable) {
+                dev_err(&device->dev, "Correctable memory error occured\n");
+                bank->ecc_counter++;
+                return IRQ_HANDLED;
+        } else if (irq == bank->irq_uncorrectable) {
+                dev_err(&device->dev, "Uncorrectable memory error occured\n");
+                panic("Critical ECC error on %s", device->node->full_name);
+        }
+
+        return IRQ_NONE;
+}
+
+/**
+ * axon_ram_make_request - make_request() method for block device
+ * @queue, @bio: see blk_queue_make_request()
+ */
+static int
+axon_ram_make_request(struct request_queue *queue, struct bio *bio)
+{
+        struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data;
+        unsigned long phys_mem, phys_end;
+        void *user_mem;
+        struct bio_vec *vec;
+        unsigned int transfered;
+        unsigned short idx;
+        int rc = 0;
+
+        phys_mem = bank->io_addr + (bio->bi_sector << AXON_RAM_SECTOR_SHIFT);
+        phys_end = bank->io_addr + bank->size;
+        transfered = 0;
+        bio_for_each_segment(vec, bio, idx) {
+                if (unlikely(phys_mem + vec->bv_len > phys_end)) {
+                        bio_io_error(bio, bio->bi_size);
+                        rc = -ERANGE;
+                        break;
+                }
+
+                user_mem = page_address(vec->bv_page) + vec->bv_offset;
+                if (bio_data_dir(bio) == READ)
+                        memcpy(user_mem, (void *) phys_mem, vec->bv_len);
+                else
+                        memcpy((void *) phys_mem, user_mem, vec->bv_len);
+
+                phys_mem += vec->bv_len;
+                transfered += vec->bv_len;
+        }
+        bio_endio(bio, transfered, 0);
+
+        return rc;
+}
+
+/**
+ * axon_ram_direct_access - direct_access() method for block device
+ * @device, @sector, @data: see block_device_operations method
+ */
+static int
+axon_ram_direct_access(struct block_device *device, sector_t sector,
+                       unsigned long *data)
+{
+        struct axon_ram_bank *bank = device->bd_disk->private_data;
+        loff_t offset;
+
+        offset = sector << AXON_RAM_SECTOR_SHIFT;
+        if (offset >= bank->size) {
+                dev_err(&bank->device->dev, "Access outside of address space\n");
+                return -ERANGE;
+        }
+
+        *data = bank->ph_addr + offset;
+
+        return 0;
+}
+
+static struct block_device_operations axon_ram_devops = {
+        .owner          = THIS_MODULE,
+        .direct_access  = axon_ram_direct_access
+};
+
+/**
+ * axon_ram_probe - probe() method for platform driver
+ * @device, @device_id: see of_platform_driver method
+ */
+static int
+axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
+{
+        static int axon_ram_bank_id = -1;
+        struct axon_ram_bank *bank;
+        struct resource resource;
+        int rc = 0;
+
+        axon_ram_bank_id++;
+
+        dev_info(&device->dev, "Found memory controller on %s\n",
+                        device->node->full_name);
+
+        bank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);
+        if (bank == NULL) {
+                dev_err(&device->dev, "Out of memory\n");
+                rc = -ENOMEM;
+                goto failed;
+        }
+
+        device->dev.platform_data = bank;
+
+        bank->device = device;
+
+        if (of_address_to_resource(device->node, 0, &resource) != 0) {
+                dev_err(&device->dev, "Cannot access device tree\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        bank->size = resource.end - resource.start + 1;
+
+        if (bank->size == 0) {
+                dev_err(&device->dev, "No DDR2 memory found for %s%d\n",
+                                AXON_RAM_DEVICE_NAME, axon_ram_bank_id);
+                rc = -ENODEV;
+                goto failed;
+        }
+
+        dev_info(&device->dev, "Register DDR2 memory device %s%d with %luMB\n",
+                        AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20);
+
+        bank->ph_addr = resource.start;
+        bank->io_addr = (unsigned long) ioremap_flags(
+                        bank->ph_addr, bank->size, _PAGE_NO_CACHE);
+        if (bank->io_addr == 0) {
+                dev_err(&device->dev, "ioremap() failed\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        bank->disk = alloc_disk(AXON_RAM_MINORS_PER_DISK);
+        if (bank->disk == NULL) {
+                dev_err(&device->dev, "Cannot register disk\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        bank->disk->first_minor = 0;
+        bank->disk->fops = &axon_ram_devops;
+        bank->disk->private_data = bank;
+        bank->disk->driverfs_dev = &device->dev;
+
+        sprintf(bank->disk->disk_name, "%s%d",
+                        AXON_RAM_DEVICE_NAME, axon_ram_bank_id);
+        bank->disk->major = register_blkdev(0, bank->disk->disk_name);
+        if (bank->disk->major < 0) {
+                dev_err(&device->dev, "Cannot register block device\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        bank->disk->queue = blk_alloc_queue(GFP_KERNEL);
+        if (bank->disk->queue == NULL) {
+                dev_err(&device->dev, "Cannot register disk queue\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        set_capacity(bank->disk, bank->size >> AXON_RAM_SECTOR_SHIFT);
+        blk_queue_make_request(bank->disk->queue, axon_ram_make_request);
+        blk_queue_hardsect_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
+        add_disk(bank->disk);
+
+        bank->irq_correctable = irq_of_parse_and_map(device->node, 0);
+        bank->irq_uncorrectable = irq_of_parse_and_map(device->node, 1);
+        if ((bank->irq_correctable <= 0) || (bank->irq_uncorrectable <= 0)) {
+                dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        rc = request_irq(bank->irq_correctable, axon_ram_irq_handler,
+                        AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
+        if (rc != 0) {
+                dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
+                bank->irq_correctable = bank->irq_uncorrectable = 0;
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        rc = request_irq(bank->irq_uncorrectable, axon_ram_irq_handler,
+                        AXON_RAM_IRQ_FLAGS, bank->disk->disk_name, device);
+        if (rc != 0) {
+                dev_err(&device->dev, "Cannot register ECC interrupt handler\n");
+                bank->irq_uncorrectable = 0;
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        rc = device_create_file(&device->dev, &dev_attr_ecc);
+        if (rc != 0) {
+                dev_err(&device->dev, "Cannot create sysfs file\n");
+                rc = -EFAULT;
+                goto failed;
+        }
+
+        return 0;
+
+failed:
+        if (bank != NULL) {
+                if (bank->irq_uncorrectable > 0)
+                        free_irq(bank->irq_uncorrectable, device);
+                if (bank->irq_correctable > 0)
+                        free_irq(bank->irq_correctable, device);
+                if (bank->disk != NULL) {
+                        if (bank->disk->queue != NULL)
+                                blk_cleanup_queue(bank->disk->queue);
+                        if (bank->disk->major > 0)
+                                unregister_blkdev(bank->disk->major,
+                                                bank->disk->disk_name);
+                        del_gendisk(bank->disk);
+                }
+                device->dev.platform_data = NULL;
+                if (bank->io_addr != 0)
+                        iounmap((void __iomem *) bank->io_addr);
+                kfree(bank);
+        }
+
+        return rc;
+}
+
+/**
+ * axon_ram_remove - remove() method for platform driver
+ * @device: see of_platform_driver method
+ */
+static int
+axon_ram_remove(struct of_device *device)
+{
+        struct axon_ram_bank *bank = device->dev.platform_data;
+
+        BUG_ON(!bank || !bank->disk);
+
+        device_remove_file(&device->dev, &dev_attr_ecc);
+        free_irq(bank->irq_uncorrectable, device);
+        free_irq(bank->irq_correctable, device);
+        blk_cleanup_queue(bank->disk->queue);
+        unregister_blkdev(bank->disk->major, bank->disk->disk_name);
+        del_gendisk(bank->disk);
+        iounmap((void __iomem *) bank->io_addr);
+        kfree(bank);
+
+        return 0;
+}
+
+static struct of_device_id axon_ram_device_id[] = {
+        {
+                .type   = "dma-memory"
+        },
+        {}
+};
+
+static struct of_platform_driver axon_ram_driver = {
+        .owner          = THIS_MODULE,
+        .name           = AXON_RAM_MODULE_NAME,
+        .match_table    = axon_ram_device_id,
+        .probe          = axon_ram_probe,
+        .remove         = axon_ram_remove
+};
+
+/**
+ * axon_ram_init
+ */
+static int __init
+axon_ram_init(void)
+{
+        return of_register_platform_driver(&axon_ram_driver);
+}
+
+/**
+ * axon_ram_exit
+ */
+static void __exit
+axon_ram_exit(void)
+{
+        of_unregister_platform_driver(&axon_ram_driver);
+}
+
+module_init(axon_ram_init);
+module_exit(axon_ram_exit);
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Maxim Shchetynin <maxim@de.ibm.com>");
+MODULE_DESCRIPTION("Axon DDR2 RAM device driver for IBM Cell BE");
diff --git a/arch/powerpc/sysdev/pmi.c b/arch/powerpc/sysdev/pmi.c
index 85a7c99c1003..2f91b55b7754 100644
--- a/arch/powerpc/sysdev/pmi.c
+++ b/arch/powerpc/sysdev/pmi.c
@@ -48,15 +48,13 @@ struct pmi_data {
         struct work_struct      work;
 };
 
+static struct pmi_data *data;
 
 static int pmi_irq_handler(int irq, void *dev_id)
 {
-        struct pmi_data *data;
         u8 type;
         int rc;
 
-        data = dev_id;
-
         spin_lock(&data->pmi_spinlock);
 
         type = ioread8(data->pmi_reg + PMI_READ_TYPE);
@@ -111,16 +109,13 @@ MODULE_DEVICE_TABLE(of, pmi_match);
 
 static void pmi_notify_handlers(struct work_struct *work)
 {
-        struct pmi_data *data;
         struct pmi_handler *handler;
 
-        data = container_of(work, struct pmi_data, work);
-
         spin_lock(&data->handler_spinlock);
         list_for_each_entry(handler, &data->handler, node) {
                 pr_debug(KERN_INFO "pmi: notifying handler %p\n", handler);
                 if (handler->type == data->msg.type)
-                        handler->handle_pmi_message(data->dev, data->msg);
+                        handler->handle_pmi_message(data->msg);
         }
         spin_unlock(&data->handler_spinlock);
 }
@@ -129,9 +124,14 @@ static int pmi_of_probe(struct of_device *dev,
                         const struct of_device_id *match)
 {
         struct device_node *np = dev->node;
-        struct pmi_data *data;
         int rc;
 
+        if (data) {
+                printk(KERN_ERR "pmi: driver has already been initialized.\n");
+                rc = -EBUSY;
+                goto out;
+        }
+
         data = kzalloc(sizeof(struct pmi_data), GFP_KERNEL);
         if (!data) {
                 printk(KERN_ERR "pmi: could not allocate memory.\n");
@@ -154,7 +154,6 @@ static int pmi_of_probe(struct of_device *dev,
 
         INIT_WORK(&data->work, pmi_notify_handlers);
 
-        dev->dev.driver_data = data;
         data->dev = dev;
 
         data->irq = irq_of_parse_and_map(np, 0);
@@ -164,7 +163,7 @@ static int pmi_of_probe(struct of_device *dev,
                 goto error_cleanup_iomap;
         }
 
-        rc = request_irq(data->irq, pmi_irq_handler, 0, "pmi", data);
+        rc = request_irq(data->irq, pmi_irq_handler, 0, "pmi", NULL);
         if (rc) {
                 printk(KERN_ERR "pmi: can't request IRQ %d: returned %d\n",
                                 data->irq, rc);
@@ -187,12 +186,9 @@ out:
 
 static int pmi_of_remove(struct of_device *dev)
 {
-        struct pmi_data *data;
         struct pmi_handler *handler, *tmp;
 
-        data = dev->dev.driver_data;
-
-        free_irq(data->irq, data);
+        free_irq(data->irq, NULL);
         iounmap(data->pmi_reg);
 
         spin_lock(&data->handler_spinlock);
@@ -202,7 +198,8 @@ static int pmi_of_remove(struct of_device *dev)
 
         spin_unlock(&data->handler_spinlock);
 
-        kfree(dev->dev.driver_data);
+        kfree(data);
+        data = NULL;
 
         return 0;
 }
@@ -226,13 +223,13 @@ static void __exit pmi_module_exit(void)
 }
 module_exit(pmi_module_exit);
 
-void pmi_send_message(struct of_device *device, pmi_message_t msg)
+int pmi_send_message(pmi_message_t msg)
 {
-        struct pmi_data *data;
         unsigned long flags;
         DECLARE_COMPLETION_ONSTACK(completion);
 
-        data = device->dev.driver_data;
+        if (!data)
+                return -ENODEV;
 
         mutex_lock(&data->msg_mutex);
 
@@ -256,30 +253,26 @@ void pmi_send_message(struct of_device *device, pmi_message_t msg)
         data->completion = NULL;
 
         mutex_unlock(&data->msg_mutex);
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(pmi_send_message);
 
-void pmi_register_handler(struct of_device *device,
-                          struct pmi_handler *handler)
+int pmi_register_handler(struct pmi_handler *handler)
 {
-        struct pmi_data *data;
-        data = device->dev.driver_data;
-
         if (!data)
-                return;
+                return -ENODEV;
 
         spin_lock(&data->handler_spinlock);
         list_add_tail(&handler->node, &data->handler);
         spin_unlock(&data->handler_spinlock);
+
+        return 0;
 }
 EXPORT_SYMBOL_GPL(pmi_register_handler);
 
-void pmi_unregister_handler(struct of_device *device,
-                            struct pmi_handler *handler)
+void pmi_unregister_handler(struct pmi_handler *handler)
 {
-        struct pmi_data *data;
-        data = device->dev.driver_data;
-
         if (!data)
                 return;