174 files changed, 5296 insertions, 1500 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
index 36b37d755dbc..3d54680d0333 100644
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@ -1677,8 +1677,6 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data)
        struct acpi_video_device *video_device = data;
        struct acpi_device *device = NULL;
-        printk("video device notify\n");
        if (!video_device)
                return;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 08ad44b3e48f..56cf59b60ec4 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1979,6 +1979,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
                ehc->tries[dev->devno] = ATA_EH_DEV_TRIES;
+                /* collect port action mask recorded in dev actions */
+                ehc->i.action |= ehc->i.dev_action[i] & ~ATA_EH_PERDEV_MASK;
+                ehc->i.dev_action[i] &= ATA_EH_PERDEV_MASK;
                /* process hotplug request */
                if (dev->flags & ATA_DFLAG_DETACH)
                        ata_eh_detach_dev(dev);
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 1b8e0eb9e032..aae0b5201c1e 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -523,8 +523,7 @@ static const struct ata_port_info mv_port_info[] = {
        },
        {  /* chip_7042 */
                .sht            = &mv_sht,
-                .flags          = (MV_COMMON_FLAGS | MV_6XXX_FLAGS |
+                .flags          = (MV_COMMON_FLAGS | MV_6XXX_FLAGS),
-                                   MV_FLAG_DUAL_HC),
                .pio_mask       = 0x1f, /* pio0-4 */
                .udma_mask      = 0x7f, /* udma0-6 */
                .port_ops       = &mv_iie_ops,
@@ -545,6 +544,8 @@ static const struct pci_device_id mv_pci_tbl[] = {
        { PCI_VDEVICE(ADAPTEC2, 0x0241), chip_604x },
+        { PCI_VDEVICE(TTI, 0x2310), chip_7042 },
        { }                     /* terminate list */
 };
diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
index 1c7f19aecc25..88f0565c8883 100644
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
@@ -77,6 +77,7 @@ static void svia_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
 static void vt6420_error_handler(struct ata_port *ap);
 static const struct pci_device_id svia_pci_tbl[] = {
+        { PCI_VDEVICE(VIA, 0x5337), vt6420 },
        { PCI_VDEVICE(VIA, 0x0591), vt6420 },
        { PCI_VDEVICE(VIA, 0x3149), vt6420 },
        { PCI_VDEVICE(VIA, 0x3249), vt6421 },
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 4dc10105d610..f96446c358ba 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -1845,7 +1845,7 @@ static u16 __devinit read_bia (const hrz_dev * dev, u16 addr)
 /********** initialise a card **********/
-static int __init hrz_init (hrz_dev * dev) {
+static int __devinit hrz_init (hrz_dev * dev) {
  int onefivefive;
  
  u16 chan;
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 4f1813e04754..f5c160caf9f4 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -293,8 +293,8 @@ static int mmap_kmem(struct file * file, struct vm_area_struct * vma)
 {
        unsigned long pfn;
-        /* Turn a pfn offset into an absolute pfn */
+        /* Turn a kernel-virtual address into a physical page frame */
-        pfn = PFN_DOWN(virt_to_phys((void *)PAGE_OFFSET)) + vma->vm_pgoff;
+        pfn = __pa((u64)vma->vm_pgoff << PAGE_SHIFT) >> PAGE_SHIFT;
        /*
         * RED-PEN: on some architectures there is more mapped memory
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c
index 448d5083c381..4fac2bdf6215 100644
--- a/drivers/char/tlclk.c
+++ b/drivers/char/tlclk.c
@@ -186,6 +186,7 @@ static int got_event;		/* if events processing have been done */
 static void switchover_timeout(unsigned long data);
 static struct timer_list switchover_timer =
        TIMER_INITIALIZER(switchover_timeout , 0, 0);
+static unsigned long tlclk_timer_data;
 static struct tlclk_alarms *alarm_events;
@@ -197,10 +198,19 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id);
 static DECLARE_WAIT_QUEUE_HEAD(wq);
+static unsigned long useflags;
+static DEFINE_MUTEX(tlclk_mutex);
 static int tlclk_open(struct inode *inode, struct file *filp)
 {
        int result;
+        if (test_and_set_bit(0, &useflags))
+                return -EBUSY;
+                /* this legacy device is always one per system and it doesn't
+                 * know how to handle multiple concurrent clients.
+                 */
        /* Make sure there is no interrupt pending while
         * initialising interrupt handler */
        inb(TLCLK_REG6);
@@ -221,6 +231,7 @@ static int tlclk_open(struct inode *inode, struct file *filp)
 static int tlclk_release(struct inode *inode, struct file *filp)
 {
        free_irq(telclk_interrupt, tlclk_interrupt);
+        clear_bit(0, &useflags);
        return 0;
 }
@@ -230,26 +241,25 @@ static ssize_t tlclk_read(struct file *filp, char __user *buf, size_t count,
 {
        if (count < sizeof(struct tlclk_alarms))
                return -EIO;
+        if (mutex_lock_interruptible(&tlclk_mutex))
+                return -EINTR;
        wait_event_interruptible(wq, got_event);
-        if (copy_to_user(buf, alarm_events, sizeof(struct tlclk_alarms)))
+        if (copy_to_user(buf, alarm_events, sizeof(struct tlclk_alarms))) {
+                mutex_unlock(&tlclk_mutex);
                return -EFAULT;
+        }
        memset(alarm_events, 0, sizeof(struct tlclk_alarms));
        got_event = 0;
+        mutex_unlock(&tlclk_mutex);
        return  sizeof(struct tlclk_alarms);
 }
-static ssize_t tlclk_write(struct file *filp, const char __user *buf, size_t count,
-            loff_t *f_pos)
-{
-        return 0;
-}
 static const struct file_operations tlclk_fops = {
        .read = tlclk_read,
-        .write = tlclk_write,
        .open = tlclk_open,
        .release = tlclk_release,
@@ -540,7 +550,7 @@ static ssize_t store_select_amcb1_transmit_clock(struct device *d,
                        SET_PORT_BITS(TLCLK_REG3, 0xf8, 0x7);
                        switch (val) {
                        case CLK_8_592MHz:
-                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 1);
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 2);
                                break;
                        case CLK_11_184MHz:
                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 0);
@@ -549,7 +559,7 @@ static ssize_t store_select_amcb1_transmit_clock(struct device *d,
                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 3);
                                break;
                        case CLK_44_736MHz:
-                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 2);
+                                SET_PORT_BITS(TLCLK_REG0, 0xfc, 1);
                                break;
                        }
                } else
@@ -839,11 +849,13 @@ static void __exit tlclk_cleanup(void)
 static void switchover_timeout(unsigned long data)
 {
-        if ((data & 1)) {
+        unsigned long flags = *(unsigned long *) data;
-                if ((inb(TLCLK_REG1) & 0x08) != (data & 0x08))
+        if ((flags & 1)) {
+                if ((inb(TLCLK_REG1) & 0x08) != (flags & 0x08))
                        alarm_events->switchover_primary++;
        } else {
-                if ((inb(TLCLK_REG1) & 0x08) != (data & 0x08))
+                if ((inb(TLCLK_REG1) & 0x08) != (flags & 0x08))
                        alarm_events->switchover_secondary++;
        }
@@ -901,8 +913,9 @@ static irqreturn_t tlclk_interrupt(int irq, void *dev_id)
                /* TIMEOUT in ~10ms */
                switchover_timer.expires = jiffies + msecs_to_jiffies(10);
-                switchover_timer.data = inb(TLCLK_REG1);
+                tlclk_timer_data = inb(TLCLK_REG1);
-                add_timer(&switchover_timer);
+                switchover_timer.data = (unsigned long) &tlclk_timer_data;
+                mod_timer(&switchover_timer, switchover_timer.expires);
        } else {
                got_event = 1;
                wake_up(&wq);
diff --git a/drivers/char/vr41xx_giu.c b/drivers/char/vr41xx_giu.c
index a744dad9cf45..0cea8d4907df 100644
--- a/drivers/char/vr41xx_giu.c
+++ b/drivers/char/vr41xx_giu.c
@@ -3,7 +3,7 @@
 *
 *  Copyright (C) 2002 MontaVista Software Inc.
 *      Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
- *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2003-2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
 *
 *  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
@@ -125,30 +125,17 @@ static inline uint16_t giu_clear(uint16_t offset, uint16_t clear)
        return data;
 }
-static unsigned int startup_giuint_low_irq(unsigned int irq)
+static void ack_giuint_low(unsigned int irq)
 {
-        unsigned int pin;
+        giu_write(GIUINTSTATL, 1 << GPIO_PIN_OF_IRQ(irq));
-        pin = GPIO_PIN_OF_IRQ(irq);
-        giu_write(GIUINTSTATL, 1 << pin);
-        giu_set(GIUINTENL, 1 << pin);
-        return 0;
 }
-static void shutdown_giuint_low_irq(unsigned int irq)
+static void mask_giuint_low(unsigned int irq)
 {
        giu_clear(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
 }
-static void enable_giuint_low_irq(unsigned int irq)
+static void mask_ack_giuint_low(unsigned int irq)
-{
-        giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
-}
-#define disable_giuint_low_irq  shutdown_giuint_low_irq
-static void ack_giuint_low_irq(unsigned int irq)
 {
        unsigned int pin;
@@ -157,46 +144,30 @@ static void ack_giuint_low_irq(unsigned int irq)
        giu_write(GIUINTSTATL, 1 << pin);
 }
-static void end_giuint_low_irq(unsigned int irq)
+static void unmask_giuint_low(unsigned int irq)
 {
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+        giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
-                giu_set(GIUINTENL, 1 << GPIO_PIN_OF_IRQ(irq));
 }
-static struct hw_interrupt_type giuint_low_irq_type = {
+static struct irq_chip giuint_low_irq_chip = {
-        .typename       = "GIUINTL",
+        .name           = "GIUINTL",
-        .startup        = startup_giuint_low_irq,
+        .ack            = ack_giuint_low,
-        .shutdown       = shutdown_giuint_low_irq,
+        .mask           = mask_giuint_low,
-        .enable         = enable_giuint_low_irq,
+        .mask_ack       = mask_ack_giuint_low,
-        .disable        = disable_giuint_low_irq,
+        .unmask         = unmask_giuint_low,
-        .ack            = ack_giuint_low_irq,
-        .end            = end_giuint_low_irq,
 };
-static unsigned int startup_giuint_high_irq(unsigned int irq)
+static void ack_giuint_high(unsigned int irq)
 {
-        unsigned int pin;
+        giu_write(GIUINTSTATH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
-        pin = GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET;
-        giu_write(GIUINTSTATH, 1 << pin);
-        giu_set(GIUINTENH, 1 << pin);
-        return 0;
 }
-static void shutdown_giuint_high_irq(unsigned int irq)
+static void mask_giuint_high(unsigned int irq)
 {
        giu_clear(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
 }
-static void enable_giuint_high_irq(unsigned int irq)
+static void mask_ack_giuint_high(unsigned int irq)
-{
-        giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
-}
-#define disable_giuint_high_irq shutdown_giuint_high_irq
-static void ack_giuint_high_irq(unsigned int irq)
 {
        unsigned int pin;
@@ -205,20 +176,17 @@ static void ack_giuint_high_irq(unsigned int irq)
        giu_write(GIUINTSTATH, 1 << pin);
 }
-static void end_giuint_high_irq(unsigned int irq)
+static void unmask_giuint_high(unsigned int irq)
 {
-        if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS)))
+        giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
-                giu_set(GIUINTENH, 1 << (GPIO_PIN_OF_IRQ(irq) - GIUINT_HIGH_OFFSET));
 }
-static struct hw_interrupt_type giuint_high_irq_type = {
+static struct irq_chip giuint_high_irq_chip = {
-        .typename       = "GIUINTH",
+        .name           = "GIUINTH",
-        .startup        = startup_giuint_high_irq,
+        .ack            = ack_giuint_high,
-        .shutdown       = shutdown_giuint_high_irq,
+        .mask           = mask_giuint_high,
-        .enable         = enable_giuint_high_irq,
+        .mask_ack       = mask_ack_giuint_high,
-        .disable        = disable_giuint_high_irq,
+        .unmask         = unmask_giuint_high,
-        .ack            = ack_giuint_high_irq,
-        .end            = end_giuint_high_irq,
 };
 static int giu_get_irq(unsigned int irq)
@@ -282,9 +250,15 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_
                                        break;
                                }
                        }
+                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                                                 &giuint_low_irq_chip,
+                                                 handle_edge_irq);
                } else {
                        giu_clear(GIUINTTYPL, mask);
                        giu_clear(GIUINTHTSELL, mask);
+                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                                                 &giuint_low_irq_chip,
+                                                 handle_level_irq);
                }
                giu_write(GIUINTSTATL, mask);
        } else if (pin < GIUINT_HIGH_MAX) {
@@ -311,9 +285,15 @@ void vr41xx_set_irq_trigger(unsigned int pin, irq_trigger_t trigger, irq_signal_
                                        break;
                                }
                        }
+                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                                                 &giuint_high_irq_chip,
+                                                 handle_edge_irq);
                } else {
                        giu_clear(GIUINTTYPH, mask);
                        giu_clear(GIUINTHTSELH, mask);
+                        set_irq_chip_and_handler(GIU_IRQ(pin),
+                                                 &giuint_high_irq_chip,
+                                                 handle_level_irq);
                }
                giu_write(GIUINTSTATH, mask);
        }
@@ -617,10 +597,11 @@ static const struct file_operations gpio_fops = {
 static int __devinit giu_probe(struct platform_device *dev)
 {
        unsigned long start, size, flags = 0;
-        unsigned int nr_pins = 0;
+        unsigned int nr_pins = 0, trigger, i, pin;
        struct resource *res1, *res2 = NULL;
        void *base;
-        int retval, i;
+        struct irq_chip *chip;
+        int retval;
        switch (current_cpu_data.cputype) {
        case CPU_VR4111:
@@ -688,11 +669,20 @@ static int __devinit giu_probe(struct platform_device *dev)
        giu_write(GIUINTENL, 0);
        giu_write(GIUINTENH, 0);
+        trigger = giu_read(GIUINTTYPH) << 16;
+        trigger |= giu_read(GIUINTTYPL);
        for (i = GIU_IRQ_BASE; i <= GIU_IRQ_LAST; i++) {
-                if (i < GIU_IRQ(GIUINT_HIGH_OFFSET))
+                pin = GPIO_PIN_OF_IRQ(i);
-                        irq_desc[i].chip = &giuint_low_irq_type;
+                if (pin < GIUINT_HIGH_OFFSET)
+                        chip = &giuint_low_irq_chip;
                else
-                        irq_desc[i].chip = &giuint_high_irq_type;
+                        chip = &giuint_high_irq_chip;
+                if (trigger & (1 << pin))
+                        set_irq_chip_and_handler(i, chip, handle_edge_irq);
+                else
+                        set_irq_chip_and_handler(i, chip, handle_level_irq);
        }
        return cascade_irq(GIUINT_IRQ, giu_get_irq);
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 1e1a7770a6b9..b8cf50fcd64d 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -880,6 +880,10 @@ static void hid_output_field(struct hid_field *field, __u8 *data)
        unsigned size = field->report_size;
        unsigned n;
+        /* make sure the unused bits in the last byte are zeros */
+        if (count > 0 && size > 0)
+                data[(count*size-1)/8] = 0;
        for (n = 0; n < count; n++) {
                if (field->logical_minimum < 0) /* signed values */
                        implement(data, offset + n * size, size, s32ton(field->value[n], size));
@@ -947,7 +951,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
        }
 #ifdef DEBUG_DATA
-        printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", len, report_enum->numbered ? "" : "un");
+        printk(KERN_DEBUG __FILE__ ": report (size %u) (%snumbered)\n", size, report_enum->numbered ? "" : "un");
 #endif
        n = 0;                          /* Normally report number is 0 */
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c
index 28689e3eb552..9cf591a1bda3 100644
--- a/drivers/hid/hid-input.c
+++ b/drivers/hid/hid-input.c
@@ -30,7 +30,6 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/kernel.h>
-#include <linux/usb/input.h>
 #undef DEBUG
@@ -364,9 +363,22 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                        break;
                case HID_UP_LED:
-                        if (((usage->hid - 1) & 0xffff) >= LED_MAX)
-                                goto ignore;
+                        switch (usage->hid & 0xffff) {                        /* HID-Value:                   */
-                        map_led((usage->hid - 1) & 0xffff);
+                                case 0x01:  map_led (LED_NUML);     break;    /*   "Num Lock"                 */
+                                case 0x02:  map_led (LED_CAPSL);    break;    /*   "Caps Lock"                */
+                                case 0x03:  map_led (LED_SCROLLL);  break;    /*   "Scroll Lock"              */
+                                case 0x04:  map_led (LED_COMPOSE);  break;    /*   "Compose"                  */
+                                case 0x05:  map_led (LED_KANA);     break;    /*   "Kana"                     */
+                                case 0x27:  map_led (LED_SLEEP);    break;    /*   "Stand-By"                 */
+                                case 0x4c:  map_led (LED_SUSPEND);  break;    /*   "System Suspend"           */
+                                case 0x09:  map_led (LED_MUTE);     break;    /*   "Mute"                     */
+                                case 0x4b:  map_led (LED_MISC);     break;    /*   "Generic Indicator"        */
+                                case 0x19:  map_led (LED_MAIL);     break;    /*   "Message Waiting"          */
+                                case 0x4d:  map_led (LED_CHARGING); break;    /*   "External Power Connected" */
+                                default: goto ignore;
+                        }
                        break;
                case HID_UP_DIGITIZER:
diff --git a/drivers/hwmon/hwmon-vid.c b/drivers/hwmon/hwmon-vid.c
index 31c42002708f..b80f6ed5acfc 100644
--- a/drivers/hwmon/hwmon-vid.c
+++ b/drivers/hwmon/hwmon-vid.c
@@ -93,7 +93,7 @@ int vid_from_reg(int val, u8 vrm)
        case 110:               /* Intel Conroe */
                                /* compute in uV, round to mV */
                val &= 0xff;
-                if(((val & 0x7e) == 0xfe) || (!(val & 0x7e)))
+                if (val < 0x02 || val > 0xb2)
                        return 0;
                return((1600000 - (val - 2) * 6250 + 500) / 1000);
        case 24:                /* Opteron processor */
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c
index c12ac5abc2bb..253ffaf1568a 100644
--- a/drivers/hwmon/w83793.c
+++ b/drivers/hwmon/w83793.c
@@ -117,6 +117,7 @@ static const u16 W83793_REG_IN[][3] = {
 /* Low Bits of Vcore A/B Vtt Read/High/Low */
 static const u16 W83793_REG_IN_LOW_BITS[] = { 0x1b, 0x68, 0x69 };
 static u8 scale_in[] = { 2, 2, 2, 16, 16, 16, 8, 24, 24, 16 };
+static u8 scale_in_add[] = { 0, 0, 0, 0, 0, 0, 0, 150, 150, 0 };
 #define W83793_REG_FAN(index)           (0x23 + 2 * (index))    /* High byte */
 #define W83793_REG_FAN_MIN(index)       (0x90 + 2 * (index))    /* High byte */
@@ -203,6 +204,8 @@ struct w83793_data {
        u8 temp_fan_map[6];     /* Temp controls which pwm fan, bit field */
        u8 has_pwm;
+        u8 has_temp;
+        u8 has_vid;
        u8 pwm_enable;          /* Register value, each Temp has 1 bit */
        u8 pwm_uptime;          /* Register value */
        u8 pwm_downtime;        /* Register value */
@@ -500,7 +503,7 @@ store_temp(struct device *dev, struct device_attribute *attr,
        each has 4 mode:(2 bits)
        0:      Stop monitor
        1:      Use internal temp sensor(default)
-        2:      Use sensor in AMD CPU and get result by AMDSI
+        2:      Reserved
        3:      Use sensor in Intel CPU and get result by PECI
        TR1-TR2
@@ -509,8 +512,8 @@ store_temp(struct device *dev, struct device_attribute *attr,
        1:      To enable temp sensors monitor
 */
-/* 0 disable, 5 AMDSI, 6 PECI */
+/* 0 disable, 6 PECI */
-static u8 TO_TEMP_MODE[] = { 0, 0, 5, 6 };
+static u8 TO_TEMP_MODE[] = { 0, 0, 0, 6 };
 static ssize_t
 show_temp_mode(struct device *dev, struct device_attribute *attr, char *buf)
@@ -550,11 +553,10 @@ store_temp_mode(struct device *dev, struct device_attribute *attr,
        u8 val = simple_strtoul(buf, NULL, 10);
        /* transform the sysfs interface values into table above */
-        if ((val == 5 || val == 6) && (index < 4)) {
+        if ((val == 6) && (index < 4)) {
                val -= 3;
        } else if ((val == 3 && index < 4)
-                || (val == 4 && index >= 4)
+                || (val == 4 && index >= 4)) {
-                || val == 0) {
                /* transform diode or thermistor into internal enable */
                val = !!val;
        } else {
@@ -839,7 +841,9 @@ show_in(struct device *dev, struct device_attribute *attr, char *buf)
                val <<= 2;
                val += (data->in_low_bits[nr] >> (index * 2)) & 0x3;
        }
-        return sprintf(buf, "%d\n", val * scale_in[index]);
+        /* voltage inputs 5VDD and 5VSB needs 150mV offset */
+        val = val * scale_in[index] + scale_in_add[index];
+        return sprintf(buf, "%d\n", val);
 }
 static ssize_t
@@ -859,6 +863,10 @@ store_in(struct device *dev, struct device_attribute *attr,
             scale_in[index] / 2) / scale_in[index];
        mutex_lock(&data->update_lock);
        if (index > 2) {
+                /* fix the limit values of 5VDD and 5VSB to ALARM mechanism */
+                if (1 == nr || 2 == nr) {
+                        val -= scale_in_add[index] / scale_in[index];
+                }
                val = SENSORS_LIMIT(val, 0, 255);
        } else {
                val = SENSORS_LIMIT(val, 0, 0x3FF);
@@ -979,12 +987,6 @@ static struct sensor_device_attribute_2 w83793_sensor_attr_2[] = {
        SENSOR_ATTR_IN(7),
        SENSOR_ATTR_IN(8),
        SENSOR_ATTR_IN(9),
-        SENSOR_ATTR_TEMP(1),
-        SENSOR_ATTR_TEMP(2),
-        SENSOR_ATTR_TEMP(3),
-        SENSOR_ATTR_TEMP(4),
-        SENSOR_ATTR_TEMP(5),
-        SENSOR_ATTR_TEMP(6),
        SENSOR_ATTR_FAN(1),
        SENSOR_ATTR_FAN(2),
        SENSOR_ATTR_FAN(3),
@@ -995,6 +997,15 @@ static struct sensor_device_attribute_2 w83793_sensor_attr_2[] = {
        SENSOR_ATTR_PWM(3),
 };
+static struct sensor_device_attribute_2 w83793_temp[] = {
+        SENSOR_ATTR_TEMP(1),
+        SENSOR_ATTR_TEMP(2),
+        SENSOR_ATTR_TEMP(3),
+        SENSOR_ATTR_TEMP(4),
+        SENSOR_ATTR_TEMP(5),
+        SENSOR_ATTR_TEMP(6),
+};
 /* Fan6-Fan12 */
 static struct sensor_device_attribute_2 w83793_left_fan[] = {
        SENSOR_ATTR_FAN(6),
@@ -1015,9 +1026,12 @@ static struct sensor_device_attribute_2 w83793_left_pwm[] = {
        SENSOR_ATTR_PWM(8),
 };
-static struct sensor_device_attribute_2 sda_single_files[] = {
+static struct sensor_device_attribute_2 w83793_vid[] = {
        SENSOR_ATTR_2(cpu0_vid, S_IRUGO, show_vid, NULL, NOT_USED, 0),
        SENSOR_ATTR_2(cpu1_vid, S_IRUGO, show_vid, NULL, NOT_USED, 1),
+};
+static struct sensor_device_attribute_2 sda_single_files[] = {
        SENSOR_ATTR_2(vrm, S_IWUSR | S_IRUGO, show_vrm, store_vrm,
                      NOT_USED, NOT_USED),
        SENSOR_ATTR_2(chassis, S_IWUSR | S_IRUGO, show_alarm_beep,
@@ -1070,11 +1084,17 @@ static int w83793_detach_client(struct i2c_client *client)
                for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
                        device_remove_file(dev, &sda_single_files[i].dev_attr);
+                for (i = 0; i < ARRAY_SIZE(w83793_vid); i++)
+                        device_remove_file(dev, &w83793_vid[i].dev_attr);
                for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++)
                        device_remove_file(dev, &w83793_left_fan[i].dev_attr);
                for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++)
                        device_remove_file(dev, &w83793_left_pwm[i].dev_attr);
+                for (i = 0; i < ARRAY_SIZE(w83793_temp); i++)
+                        device_remove_file(dev, &w83793_temp[i].dev_attr);
        }
        if ((err = i2c_detach_client(client)))
@@ -1187,6 +1207,7 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind)
        struct w83793_data *data;
        int files_fan = ARRAY_SIZE(w83793_left_fan) / 7;
        int files_pwm = ARRAY_SIZE(w83793_left_pwm) / 5;
+        int files_temp = ARRAY_SIZE(w83793_temp) / 6;
        int err = 0;
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
@@ -1313,6 +1334,44 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind)
                data->has_pwm |= 0x80;
        }
+        tmp = w83793_read_value(client, W83793_REG_FANIN_SEL);
+        if ((tmp & 0x01) && (val & 0x08)) {     /* fan 9, second location */
+                data->has_fan |= 0x100;
+        }
+        if ((tmp & 0x02) && (val & 0x10)) {     /* fan 10, second location */
+                data->has_fan |= 0x200;
+        }
+        if ((tmp & 0x04) && (val & 0x20)) {     /* fan 11, second location */
+                data->has_fan |= 0x400;
+        }
+        if ((tmp & 0x08) && (val & 0x40)) {     /* fan 12, second location */
+                data->has_fan |= 0x800;
+        }
+        /* check the temp1-6 mode, ignore former AMDSI selected inputs */
+        tmp = w83793_read_value(client,W83793_REG_TEMP_MODE[0]);
+        if (tmp & 0x01)
+                data->has_temp |= 0x01;
+        if (tmp & 0x04)
+                data->has_temp |= 0x02;
+        if (tmp & 0x10)
+                data->has_temp |= 0x04;
+        if (tmp & 0x40)
+                data->has_temp |= 0x08;
+        tmp = w83793_read_value(client,W83793_REG_TEMP_MODE[1]);
+        if (tmp & 0x01)
+                data->has_temp |= 0x10;
+        if (tmp & 0x02)
+                data->has_temp |= 0x20;
+        /* Detect the VID usage and ignore unused input */
+        tmp = w83793_read_value(client, W83793_REG_MFC);
+        if (!(tmp & 0x29))
+                data->has_vid |= 0x1;   /* has VIDA */
+        if (tmp & 0x80)
+                data->has_vid |= 0x2;   /* has VIDB */
        /* Register sysfs hooks */
        for (i = 0; i < ARRAY_SIZE(w83793_sensor_attr_2); i++) {
                err = device_create_file(dev,
@@ -1321,6 +1380,14 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind)
                        goto exit_remove;
        }
+        for (i = 0; i < ARRAY_SIZE(w83793_vid); i++) {
+                if (!(data->has_vid & (1 << i)))
+                        continue;
+                err = device_create_file(dev, &w83793_vid[i].dev_attr);
+                if (err)
+                        goto exit_remove;
+        }
        for (i = 0; i < ARRAY_SIZE(sda_single_files); i++) {
                err = device_create_file(dev, &sda_single_files[i].dev_attr);
                if (err)
@@ -1328,6 +1395,19 @@ static int w83793_detect(struct i2c_adapter *adapter, int address, int kind)
        }
+        for (i = 0; i < 6; i++) {
+                int j;
+                if (!(data->has_temp & (1 << i)))
+                        continue;
+                for (j = 0; j < files_temp; j++) {
+                        err = device_create_file(dev,
+                                                &w83793_temp[(i) * files_temp
+                                                                + j].dev_attr);
+                        if (err)
+                                goto exit_remove;
+                }
+        }
        for (i = 5; i < 12; i++) {
                int j;
                if (!(data->has_fan & (1 << i)))
@@ -1371,12 +1451,18 @@ exit_remove:
        for (i = 0; i < ARRAY_SIZE(sda_single_files); i++)
                device_remove_file(dev, &sda_single_files[i].dev_attr);
+        for (i = 0; i < ARRAY_SIZE(w83793_vid); i++)
+                device_remove_file(dev, &w83793_vid[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(w83793_left_fan); i++)
                device_remove_file(dev, &w83793_left_fan[i].dev_attr);
        for (i = 0; i < ARRAY_SIZE(w83793_left_pwm); i++)
                device_remove_file(dev, &w83793_left_pwm[i].dev_attr);
+        for (i = 0; i < ARRAY_SIZE(w83793_temp); i++)
+                device_remove_file(dev, &w83793_temp[i].dev_attr);
        if (data->lm75[0] != NULL) {
                i2c_detach_client(data->lm75[0]);
                kfree(data->lm75[0]);
@@ -1428,6 +1514,8 @@ static void w83793_update_nonvolatile(struct device *dev)
        }
        for (i = 0; i < ARRAY_SIZE(data->temp_fan_map); i++) {
+                if (!(data->has_temp & (1 << i)))
+                        continue;
                data->temp_fan_map[i] =
                    w83793_read_value(client, W83793_REG_TEMP_FAN_MAP(i));
                for (j = 1; j < 5; j++) {
@@ -1510,9 +1598,12 @@ static struct w83793_data *w83793_update_device(struct device *dev)
                    w83793_read_value(client, W83793_REG_FAN(i) + 1);
        }
-        for (i = 0; i < ARRAY_SIZE(data->temp); i++)
+        for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
+                if (!(data->has_temp & (1 << i)))
+                        continue;
                data->temp[i][TEMP_READ] =
                    w83793_read_value(client, W83793_REG_TEMP[i][TEMP_READ]);
+        }
        data->temp_low_bits =
            w83793_read_value(client, W83793_REG_TEMP_LOW_BITS);
@@ -1527,8 +1618,10 @@ static struct w83793_data *w83793_update_device(struct device *dev)
        for (i = 0; i < ARRAY_SIZE(data->alarms); i++)
                data->alarms[i] =
                    w83793_read_value(client, W83793_REG_ALARM(i));
-        data->vid[0] = w83793_read_value(client, W83793_REG_VID_INA);
+        if (data->has_vid & 0x01)
-        data->vid[1] = w83793_read_value(client, W83793_REG_VID_INB);
+                data->vid[0] = w83793_read_value(client, W83793_REG_VID_INA);
+        if (data->has_vid & 0x02)
+                data->vid[1] = w83793_read_value(client, W83793_REG_VID_INB);
        w83793_update_nonvolatile(dev);
        data->last_updated = jiffies;
        data->valid = 1;
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c
index 93995b658d94..6074c897f51c 100644
--- a/drivers/infiniband/hw/ehca/ehca_cq.c
+++ b/drivers/infiniband/hw/ehca/ehca_cq.c
@@ -344,8 +344,11 @@ int ehca_destroy_cq(struct ib_cq *cq)
        unsigned long flags;
        spin_lock_irqsave(&ehca_cq_idr_lock, flags);
-        while (my_cq->nr_callbacks)
+        while (my_cq->nr_callbacks) {
+                spin_unlock_irqrestore(&ehca_cq_idr_lock, flags);
                yield();
+                spin_lock_irqsave(&ehca_cq_idr_lock, flags);
+        }
        idr_remove(&ehca_cq_idr, my_cq->token);
        spin_unlock_irqrestore(&ehca_cq_idr_lock, flags);
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index e7209afb4250..c069be8cbcb2 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -440,7 +440,8 @@ void ehca_tasklet_eq(unsigned long data)
                                        cq = idr_find(&ehca_cq_idr, token);
                                        if (cq == NULL) {
-                                                spin_unlock(&ehca_cq_idr_lock);
+                                                spin_unlock_irqrestore(&ehca_cq_idr_lock,
+                                                                       flags);
                                                break;
                                        }
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index cdecbf5911c8..72611fd15103 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1621,18 +1621,30 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                switch (token) {
                case SRP_OPT_ID_EXT:
                        p = match_strdup(args);
+                        if (!p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                        target->id_ext = cpu_to_be64(simple_strtoull(p, NULL, 16));
                        kfree(p);
                        break;
                case SRP_OPT_IOC_GUID:
                        p = match_strdup(args);
+                        if (!p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                        target->ioc_guid = cpu_to_be64(simple_strtoull(p, NULL, 16));
                        kfree(p);
                        break;
                case SRP_OPT_DGID:
                        p = match_strdup(args);
+                        if (!p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                        if (strlen(p) != 32) {
                                printk(KERN_WARNING PFX "bad dest GID parameter '%s'\n", p);
                                kfree(p);
@@ -1656,6 +1668,10 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                case SRP_OPT_SERVICE_ID:
                        p = match_strdup(args);
+                        if (!p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                        target->service_id = cpu_to_be64(simple_strtoull(p, NULL, 16));
                        kfree(p);
                        break;
@@ -1693,6 +1709,10 @@ static int srp_parse_options(const char *buf, struct srp_target_port *target)
                case SRP_OPT_INITIATOR_EXT:
                        p = match_strdup(args);
+                        if (!p) {
+                                ret = -ENOMEM;
+                                goto out;
+                        }
                        target->initiator_ext = cpu_to_be64(simple_strtoull(p, NULL, 16));
                        kfree(p);
                        break;
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 67c1154960f0..be4651abe72c 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -272,7 +272,9 @@ static void kvm_free_physmem(struct kvm *kvm)
 static void kvm_free_vcpu(struct kvm_vcpu *vcpu)
 {
+        vcpu_load(vcpu->kvm, vcpu_slot(vcpu));
        kvm_mmu_destroy(vcpu);
+        vcpu_put(vcpu);
        kvm_arch_ops->vcpu_free(vcpu);
 }
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
index 2dbf4307ed9e..6bc41950fbb3 100644
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
@@ -274,7 +274,7 @@ static int FNAME(fix_write_pf)(struct kvm_vcpu *vcpu,
        struct kvm_mmu_page *page;
        if (is_writeble_pte(*shadow_ent))
-                return 0;
+                return !user || (*shadow_ent & PT_USER_MASK);
        writable_shadow = *shadow_ent & PT_SHADOW_WRITABLE_MASK;
        if (user) {
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 714f6a7841cd..7397bfbbcb1c 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -1407,7 +1407,8 @@ static int svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
        int r;
 again:
-        do_interrupt_requests(vcpu, kvm_run);
+        if (!vcpu->mmio_read_completed)
+                do_interrupt_requests(vcpu, kvm_run);
        clgi();
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index ce219e3f557f..27f2751c3baa 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1717,7 +1717,8 @@ again:
        vmcs_writel(HOST_GS_BASE, segment_base(gs_sel));
 #endif
-        do_interrupt_requests(vcpu, kvm_run);
+        if (!vcpu->mmio_read_completed)
+                do_interrupt_requests(vcpu, kvm_run);
        if (vcpu->guest_debug.enabled)
                kvm_guest_debug_pre(vcpu);
@@ -1824,7 +1825,7 @@ again:
 #endif
                "setbe %0 \n\t"
                "popf \n\t"
-              : "=g" (fail)
+              : "=q" (fail)
              : "r"(vcpu->launched), "d"((unsigned long)HOST_RSP),
                "c"(vcpu),
                [rax]"i"(offsetof(struct kvm_vcpu, regs[VCPU_REGS_RAX])),
diff --git a/drivers/kvm/x86_emulate.c b/drivers/kvm/x86_emulate.c
index be70795b4822..7513cddb929f 100644
--- a/drivers/kvm/x86_emulate.c
+++ b/drivers/kvm/x86_emulate.c
@@ -61,6 +61,7 @@
 #define ModRM       (1<<6)
 /* Destination is only written; never read. */
 #define Mov         (1<<7)
+#define BitOp       (1<<8)
 static u8 opcode_table[256] = {
        /* 0x00 - 0x07 */
@@ -148,7 +149,7 @@ static u8 opcode_table[256] = {
        0, 0, ByteOp | DstMem | SrcNone | ModRM, DstMem | SrcNone | ModRM
 };
-static u8 twobyte_table[256] = {
+static u16 twobyte_table[256] = {
        /* 0x00 - 0x0F */
        0, SrcMem | ModRM | DstReg, 0, 0, 0, 0, ImplicitOps, 0,
        0, 0, 0, 0, 0, ImplicitOps | ModRM, 0, 0,
@@ -180,16 +181,16 @@ static u8 twobyte_table[256] = {
        /* 0x90 - 0x9F */
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        /* 0xA0 - 0xA7 */
-        0, 0, 0, DstMem | SrcReg | ModRM, 0, 0, 0, 0,
+        0, 0, 0, DstMem | SrcReg | ModRM | BitOp, 0, 0, 0, 0,
        /* 0xA8 - 0xAF */
-        0, 0, 0, DstMem | SrcReg | ModRM, 0, 0, 0, 0,
+        0, 0, 0, DstMem | SrcReg | ModRM | BitOp, 0, 0, 0, 0,
        /* 0xB0 - 0xB7 */
        ByteOp | DstMem | SrcReg | ModRM, DstMem | SrcReg | ModRM, 0,
-            DstMem | SrcReg | ModRM,
+            DstMem | SrcReg | ModRM | BitOp,
        0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov,
            DstReg | SrcMem16 | ModRM | Mov,
        /* 0xB8 - 0xBF */
-        0, 0, DstMem | SrcImmByte | ModRM, DstMem | SrcReg | ModRM,
+        0, 0, DstMem | SrcImmByte | ModRM, DstMem | SrcReg | ModRM | BitOp,
        0, 0, ByteOp | DstReg | SrcMem | ModRM | Mov,
            DstReg | SrcMem16 | ModRM | Mov,
        /* 0xC0 - 0xCF */
@@ -469,7 +470,8 @@ static int read_descriptor(struct x86_emulate_ctxt *ctxt,
 int
 x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 {
-        u8 b, d, sib, twobyte = 0, rex_prefix = 0;
+        unsigned d;
+        u8 b, sib, twobyte = 0, rex_prefix = 0;
        u8 modrm, modrm_mod = 0, modrm_reg = 0, modrm_rm = 0;
        unsigned long *override_base = NULL;
        unsigned int op_bytes, ad_bytes, lock_prefix = 0, rep_prefix = 0, i;
@@ -726,46 +728,6 @@ done_prefixes:
                ;
        }
-        /* Decode and fetch the destination operand: register or memory. */
-        switch (d & DstMask) {
-        case ImplicitOps:
-                /* Special instructions do their own operand decoding. */
-                goto special_insn;
-        case DstReg:
-                dst.type = OP_REG;
-                if ((d & ByteOp)
-                    && !(twobyte_table && (b == 0xb6 || b == 0xb7))) {
-                        dst.ptr = decode_register(modrm_reg, _regs,
-                                                  (rex_prefix == 0));
-                        dst.val = *(u8 *) dst.ptr;
-                        dst.bytes = 1;
-                } else {
-                        dst.ptr = decode_register(modrm_reg, _regs, 0);
-                        switch ((dst.bytes = op_bytes)) {
-                        case 2:
-                                dst.val = *(u16 *)dst.ptr;
-                                break;
-                        case 4:
-                                dst.val = *(u32 *)dst.ptr;
-                                break;
-                        case 8:
-                                dst.val = *(u64 *)dst.ptr;
-                                break;
-                        }
-                }
-                break;
-        case DstMem:
-                dst.type = OP_MEM;
-                dst.ptr = (unsigned long *)cr2;
-                dst.bytes = (d & ByteOp) ? 1 : op_bytes;
-                if (!(d & Mov) && /* optimisation - avoid slow emulated read */
-                    ((rc = ops->read_emulated((unsigned long)dst.ptr,
-                                              &dst.val, dst.bytes, ctxt)) != 0))
-                        goto done;
-                break;
-        }
-        dst.orig_val = dst.val;
        /*
         * Decode and fetch the source operand: register, memory
         * or immediate.
@@ -838,6 +800,50 @@ done_prefixes:
                break;
        }
+        /* Decode and fetch the destination operand: register or memory. */
+        switch (d & DstMask) {
+        case ImplicitOps:
+                /* Special instructions do their own operand decoding. */
+                goto special_insn;
+        case DstReg:
+                dst.type = OP_REG;
+                if ((d & ByteOp)
+                    && !(twobyte_table && (b == 0xb6 || b == 0xb7))) {
+                        dst.ptr = decode_register(modrm_reg, _regs,
+                                                  (rex_prefix == 0));
+                        dst.val = *(u8 *) dst.ptr;
+                        dst.bytes = 1;
+                } else {
+                        dst.ptr = decode_register(modrm_reg, _regs, 0);
+                        switch ((dst.bytes = op_bytes)) {
+                        case 2:
+                                dst.val = *(u16 *)dst.ptr;
+                                break;
+                        case 4:
+                                dst.val = *(u32 *)dst.ptr;
+                                break;
+                        case 8:
+                                dst.val = *(u64 *)dst.ptr;
+                                break;
+                        }
+                }
+                break;
+        case DstMem:
+                dst.type = OP_MEM;
+                dst.ptr = (unsigned long *)cr2;
+                dst.bytes = (d & ByteOp) ? 1 : op_bytes;
+                if (d & BitOp) {
+                        dst.ptr += src.val / BITS_PER_LONG;
+                        dst.bytes = sizeof(long);
+                }
+                if (!(d & Mov) && /* optimisation - avoid slow emulated read */
+                    ((rc = ops->read_emulated((unsigned long)dst.ptr,
+                                              &dst.val, dst.bytes, ctxt)) != 0))
+                        goto done;
+                break;
+        }
+        dst.orig_val = dst.val;
        if (twobyte)
                goto twobyte_insn;
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 3482e0114d43..2bd84d351a18 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -38,6 +38,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/errno.h>
+#include <linux/freezer.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
@@ -961,6 +962,7 @@ int cx88_audio_thread(void *data)
                msleep_interruptible(1000);
                if (kthread_should_stop())
                        break;
+                try_to_freeze();
                /* just monitor the audio status for now ... */
                memset(&t, 0, sizeof(t));
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c
index c1a377f797d9..b6cd21e6dab9 100644
--- a/drivers/media/video/ks0127.c
+++ b/drivers/media/video/ks0127.c
@@ -712,13 +712,13 @@ static int ks0127_command(struct i2c_client *client,
                *iarg = 0;
                status = ks0127_read(ks, KS_STAT);
                if (!(status & 0x20))            /* NOVID not set */
-                        *iarg = (*iarg & DECODER_STATUS_GOOD);
+                        *iarg = (*iarg | DECODER_STATUS_GOOD);
                if ((status & 0x01))                  /* CLOCK set */
-                        *iarg = (*iarg & DECODER_STATUS_COLOR);
+                        *iarg = (*iarg | DECODER_STATUS_COLOR);
                if ((status & 0x08))               /* PALDET set */
-                        *iarg = (*iarg & DECODER_STATUS_PAL);
+                        *iarg = (*iarg | DECODER_STATUS_PAL);
                else
-                        *iarg = (*iarg & DECODER_STATUS_NTSC);
+                        *iarg = (*iarg | DECODER_STATUS_NTSC);
                break;
        //Catch any unknown command
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 4dead84aff46..ae984bbe36b6 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2570,6 +2570,7 @@ struct saa7134_board saa7134_boards[] = {
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
+                .gpiomask       = 1 << 21,
                .inputs = {{
                        .name   = name_tv,
                        .vmux   = 1,
@@ -2578,15 +2579,20 @@ struct saa7134_board saa7134_boards[] = {
                },{
                        .name   = name_comp1,
                        .vmux   = 3,
-                        .amux   = LINE1,
+                        .amux   = LINE2,        /* unconfirmed, taken from Philips driver */
+                },{
+                        .name   = name_comp2,
+                        .vmux   = 0,            /* untested, Composite over S-Video */
+                        .amux   = LINE2,
                },{
                        .name   = name_svideo,
-                        .vmux   = 0,
+                        .vmux   = 8,
-                        .amux   = LINE1,
+                        .amux   = LINE2,
                }},
                .radio = {
                        .name   = name_radio,
-                        .amux   = LINE1,
+                        .amux   = TV,
+                        .gpio   = 0x0200000,
                },
        },
        [SAA7134_BOARD_CINERGY250PCI] = {
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 2624e3f7dd29..4e7c1fa668d3 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -184,7 +184,7 @@ hauppauge_tuner[] =
        { TUNER_ABSENT,        "Thompson DTT757"},
        /* 80-89 */
        { TUNER_ABSENT,        "Philips FQ1216LME MK3"},
-        { TUNER_ABSENT,        "LG TAPC G701D"},
+        { TUNER_LG_PAL_NEW_TAPC, "LG TAPC G701D"},
        { TUNER_LG_NTSC_NEW_TAPC, "LG TAPC H791F"},
        { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MB 3"},
        { TUNER_LG_PAL_NEW_TAPC, "TCL 2002MI 3"},
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.h b/drivers/media/video/usbvideo/quickcam_messenger.h
index baab9c081b52..17ace394d981 100644
--- a/drivers/media/video/usbvideo/quickcam_messenger.h
+++ b/drivers/media/video/usbvideo/quickcam_messenger.h
@@ -35,27 +35,13 @@ struct rgb {
 };
 struct bayL0 {
-#ifdef __BIG_ENDIAN
-        u8 r;
-        u8 g;
-#elif __LITTLE_ENDIAN
        u8 g;
        u8 r;
-#else
-#error not byte order defined
-#endif
 };
 struct bayL1 {
-#ifdef __BIG_ENDIAN
-        u8 g;
-        u8 b;
-#elif __LITTLE_ENDIAN
        u8 b;
        u8 g;
-#else
-#error not byte order defined
-#endif
 };
 struct cam_size {
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 8c7eba2a728e..7243337b771a 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -1080,7 +1080,6 @@ static ssize_t usbvision_v4l2_read(struct file *file, char *buf,
        int noblock = file->f_flags & O_NONBLOCK;
        unsigned long lock_flags;
-        int frmx = -1;
        int ret,i;
        struct usbvision_frame *frame;
@@ -1155,7 +1154,7 @@ static ssize_t usbvision_v4l2_read(struct file *file, char *buf,
                frame->bytes_read = 0;
                /* Mark it as available to be used again. */
-                usbvision->frame[frmx].grabstate = FrameState_Unused;
+                frame->grabstate = FrameState_Unused;
 /*      } */
        return count;
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 752c82c37f55..b87d571e0463 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -90,8 +90,15 @@ MODULE_LICENSE("GPL");
 char *v4l2_norm_to_name(v4l2_std_id id)
 {
        char *name;
+        u32 myid = id;
-        switch (id) {
+        /* HACK: ppc32 architecture doesn't have __ucmpdi2 function to handle
+           64 bit comparations. So, on that architecture, with some gcc variants,
+           compilation fails. Currently, the max value is 30bit wide.
+         */
+        BUG_ON(myid != id);
+        switch (myid) {
        case V4L2_STD_PAL:
                name="PAL";             break;
        case V4L2_STD_PAL_BG:
diff --git a/drivers/media/video/video-buf.c b/drivers/media/video/video-buf.c
index f429f49901b9..6504a5866849 100644
--- a/drivers/media/video/video-buf.c
+++ b/drivers/media/video/video-buf.c
@@ -700,6 +700,7 @@ videobuf_qbuf(struct videobuf_queue *q,
                goto done;
        }
        if (buf->state == STATE_QUEUED ||
+            buf->state == STATE_PREPARED ||
            buf->state == STATE_ACTIVE) {
                dprintk(1,"qbuf: buffer is already queued or active.\n");
                goto done;
@@ -1229,7 +1230,7 @@ videobuf_vm_nopage(struct vm_area_struct *vma, unsigned long vaddr,
                vaddr,vma->vm_start,vma->vm_end);
        if (vaddr > vma->vm_end)
                return NOPAGE_SIGBUS;
-        page = alloc_page(GFP_USER);
+        page = alloc_page(GFP_USER | __GFP_DMA32);
        if (!page)
                return NOPAGE_OOM;
        clear_user_page(page_address(page), vaddr, page);
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c
index bacb311b4f24..d4cf55666731 100644
--- a/drivers/media/video/vivi.c
+++ b/drivers/media/video/vivi.c
@@ -270,10 +270,15 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
        char *p,*s,*basep;
        struct page *pg;
        u8   chr,r,g,b,color;
+        unsigned long flags;
+        spinlock_t spinlock;
+        spin_lock_init(&spinlock);
        /* Get first addr pointed to pixel position */
        oldpg=get_addr_pos(pos,pages,to_addr);
        pg=pfn_to_page(sg_dma_address(to_addr[oldpg].sg) >> PAGE_SHIFT);
+        spin_lock_irqsave(&spinlock,flags);
        basep = kmap_atomic(pg, KM_BOUNCE_READ)+to_addr[oldpg].sg->offset;
        /* We will just duplicate the second pixel at the packet */
@@ -376,6 +381,8 @@ static void gen_line(struct sg_to_addr to_addr[],int inipos,int pages,int wmax,
 end:
        kunmap_atomic(basep, KM_BOUNCE_READ);
+        spin_unlock_irqrestore(&spinlock,flags);
 }
 static void vivi_fillbuff(struct vivi_dev *dev,struct vivi_buffer *buf)
 {
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 6e068cf1049b..b3f28a03b6a9 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -5,7 +5,7 @@
 *      For use with LSI Logic PCI chip/adapter(s)
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -73,6 +73,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /*
 *  cmd line parameters
diff --git a/drivers/message/fusion/mptbase.h b/drivers/message/fusion/mptbase.h
index a4afad4ecab2..e316708f76bd 100644
--- a/drivers/message/fusion/mptbase.h
+++ b/drivers/message/fusion/mptbase.h
@@ -5,7 +5,7 @@
 *          LSIFC9xx/LSI409xx Fibre Channel
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -72,11 +72,11 @@
 #endif
 #ifndef COPYRIGHT
-#define COPYRIGHT       "Copyright (c) 1999-2005 " MODULEAUTHOR
+#define COPYRIGHT       "Copyright (c) 1999-2007 " MODULEAUTHOR
 #endif
-#define MPT_LINUX_VERSION_COMMON        "3.04.02"
+#define MPT_LINUX_VERSION_COMMON        "3.04.03"
-#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.02"
+#define MPT_LINUX_PACKAGE_NAME          "@(#)mptlinux-3.04.03"
 #define WHAT_MAGIC_STRING               "@" "(" "#" ")"
 #define show_mptmod_ver(s,ver)  \
@@ -1059,7 +1059,7 @@ extern int		  mpt_stm_index;	/* needed by mptstm.c */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 #endif          /* } __KERNEL__ */
-#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__)
+#if defined(__alpha__) || defined(__sparc_v9__) || defined(__ia64__) || defined(__x86_64__) || defined(__powerpc__)
 #define CAST_U32_TO_PTR(x)      ((void *)(u64)x)
 #define CAST_PTR_TO_U32(x)      ((u32)(u64)x)
 #else
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 30975ccd9947..504632da4347 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -4,7 +4,7 @@
 *      For use with LSI Logic PCI chip/adapters
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -66,7 +66,7 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_tcq.h>
-#define COPYRIGHT       "Copyright (c) 1999-2005 LSI Logic Corporation"
+#define COPYRIGHT       "Copyright (c) 1999-2007 LSI Logic Corporation"
 #define MODULEAUTHOR    "LSI Logic Corporation"
 #include "mptbase.h"
 #include "mptctl.h"
@@ -79,6 +79,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h
index 043941882c6e..e65a1cf5eb0b 100644
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
@@ -5,7 +5,7 @@
 *          LSIFC9xx/LSI409xx Fibre Channel
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c
index ca2f9107f145..c819c23b55b1 100644
--- a/drivers/message/fusion/mptfc.c
+++ b/drivers/message/fusion/mptfc.c
@@ -3,7 +3,7 @@
 *      For use with LSI Logic PCI chip/adapter(s)
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -75,6 +75,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /* Command line args */
 #define MPTFC_DEV_LOSS_TMO (60)
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index b7c4407c5e3f..2936204d8ad6 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -4,7 +4,7 @@
 *      For use with LSI Logic Fibre Channel PCI chip/adapters
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 2000-2005 LSI Logic Corporation
+ *  Copyright (c) 2000-2007 LSI Logic Corporation
 *
 */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -56,9 +56,11 @@
 #include <linux/module.h>
 #include <linux/fs.h>
+#define my_VERSION      MPT_LINUX_VERSION_COMMON
 #define MYNAM           "mptlan"
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
diff --git a/drivers/message/fusion/mptlan.h b/drivers/message/fusion/mptlan.h
index 3726ecba5707..70ab75e7c263 100644
--- a/drivers/message/fusion/mptlan.h
+++ b/drivers/message/fusion/mptlan.h
@@ -4,7 +4,7 @@
 *      For use with LSI Logic Fibre Channel PCI chip/adapters
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 2000-2005 LSI Logic Corporation
+ *  Copyright (c) 2000-2007 LSI Logic Corporation
 *
 */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
index 4f0c530e47b0..09e9a9d96410 100644
--- a/drivers/message/fusion/mptsas.c
+++ b/drivers/message/fusion/mptsas.c
@@ -3,9 +3,9 @@
 *      For use with LSI Logic PCI chip/adapter(s)
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
- *  Copyright (c) 2005-2006 Dell
+ *  Copyright (c) 2005-2007 Dell
 */
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
@@ -75,6 +75,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 static int mpt_pt_clear;
 module_param(mpt_pt_clear, int, 0);
@@ -245,7 +246,8 @@ static void mptsas_print_device_pg0(SasDevicePage0_t *pg0)
        printk("Parent Handle=0x%X\n" ,le16_to_cpu(pg0->ParentDevHandle));
        printk("Enclosure Handle=0x%X\n", le16_to_cpu(pg0->EnclosureHandle));
        printk("Slot=0x%X\n", le16_to_cpu(pg0->Slot));
-        printk("SAS Address=0x%llX\n", le64_to_cpu(sas_address));
+        printk("SAS Address=0x%llX\n", (unsigned long long)
+            le64_to_cpu(sas_address));
        printk("Target ID=0x%X\n", pg0->TargetID);
        printk("Bus=0x%X\n", pg0->Bus);
        /* The PhyNum field specifies the PHY number of the parent
@@ -349,9 +351,9 @@ mptsas_port_delete(struct mptsas_portinfo_details * port_details)
        phy_info = port_info->phy_info;
        dsaswideprintk((KERN_DEBUG "%s: [%p]: num_phys=%02d "
-                "bitmask=0x%016llX\n",
+            "bitmask=0x%016llX\n", __FUNCTION__, port_details,
-                __FUNCTION__, port_details, port_details->num_phys,
+            port_details->num_phys, (unsigned long long)
-                    port_details->phy_bitmask));
+            port_details->phy_bitmask));
        for (i = 0; i < port_info->num_phys; i++, phy_info++) {
                if(phy_info->port_details != port_details)
@@ -476,7 +478,7 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
        for (i = 0 ; i < port_info->num_phys ; i++, phy_info++) {
                sas_address = phy_info->attached.sas_address;
                dsaswideprintk((KERN_DEBUG "phy_id=%d sas_address=0x%018llX\n",
-                        i, sas_address));
+                    i, (unsigned long long)sas_address));
                if (!sas_address)
                        continue;
                port_details = phy_info->port_details;
@@ -495,8 +497,8 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
                                    (1 << phy_info->phy_id);
                        phy_info->sas_port_add_phy=1;
                        dsaswideprintk((KERN_DEBUG "\t\tForming port\n\t\t"
-                                "phy_id=%d sas_address=0x%018llX\n",
+                            "phy_id=%d sas_address=0x%018llX\n",
-                                i, sas_address));
+                            i, (unsigned long long)sas_address));
                        phy_info->port_details = port_details;
                }
@@ -512,8 +514,9 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
                        if (phy_info_cmp->port_details == port_details )
                                continue;
                        dsaswideprintk((KERN_DEBUG
-                                "\t\tphy_id=%d sas_address=0x%018llX\n",
+                            "\t\tphy_id=%d sas_address=0x%018llX\n",
-                                j, phy_info_cmp->attached.sas_address));
+                            j, (unsigned long long)
+                            phy_info_cmp->attached.sas_address));
                        if (phy_info_cmp->port_details) {
                                port_details->rphy =
                                    mptsas_get_rphy(phy_info_cmp);
@@ -546,11 +549,10 @@ mptsas_setup_wide_ports(MPT_ADAPTER *ioc, struct mptsas_portinfo *port_info)
                if (!port_details)
                        continue;
                dsaswideprintk((KERN_DEBUG
-                        "%s: [%p]: phy_id=%02d num_phys=%02d "
+                    "%s: [%p]: phy_id=%02d num_phys=%02d "
-                        "bitmask=0x%016llX\n",
+                    "bitmask=0x%016llX\n", __FUNCTION__,
-                        __FUNCTION__,
+                    port_details, i, port_details->num_phys,
-                        port_details, i, port_details->num_phys,
+                    (unsigned long long)port_details->phy_bitmask));
-                        port_details->phy_bitmask));
                dsaswideprintk((KERN_DEBUG"\t\tport = %p rphy=%p\n",
                        port_details->port, port_details->rphy));
        }
@@ -2079,8 +2081,10 @@ mptsas_persist_clear_table(struct work_struct *work)
 static void
 mptsas_reprobe_lun(struct scsi_device *sdev, void *data)
 {
+        int rc;
        sdev->no_uld_attach = data ? 1 : 0;
-        scsi_device_reprobe(sdev);
+        rc = scsi_device_reprobe(sdev);
 }
 static void
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 2c72c36b8171..f0cca3ea93b2 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -3,7 +3,7 @@
 *      For use with LSI Logic PCI chip/adapter(s)
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -76,6 +76,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -701,6 +702,17 @@ mptscsih_io_done(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *mr)
                                                break;
                                        }
                                }
+                        } else if (ioc->bus_type == FC) {
+                                /*
+                                 * The FC IOC may kill a request for variety of
+                                 * reasons, some of which may be recovered by a
+                                 * retry, some which are unlikely to be
+                                 * recovered. Return DID_ERROR instead of
+                                 * DID_RESET to permit retry of the command,
+                                 * just not an infinite number of them
+                                 */
+                                sc->result = DID_ERROR << 16;
+                                break;
                        }
                        /*
@@ -2688,7 +2700,8 @@ mptscsih_initTarget(MPT_SCSI_HOST *hd, VirtTarget *vtarget,
                    struct scsi_device *sdev)
 {
        dinitprintk((MYIOC_s_INFO_FMT "initTarget bus=%d id=%d lun=%d hd=%p\n",
-                hd->ioc->name, vtarget->bus_id, vtarget->target_id, lun, hd));
+                hd->ioc->name, vtarget->bus_id, vtarget->target_id,
+                sdev->lun, hd));
        /* Is LUN supported? If so, upper 2 bits will be 0
        * in first byte of inquiry data.
@@ -2770,7 +2783,7 @@ mptscsih_setTargetNegoParms(MPT_SCSI_HOST *hd, VirtTarget *target,
                                else {
                                        factor = MPT_ULTRA320;
                                        if (scsi_device_qas(sdev)) {
-                                                ddvtprintk((KERN_INFO "Enabling QAS due to byte56=%02x on id=%d!\n", byte56, id));
+                                                ddvtprintk((KERN_INFO "Enabling QAS due to byte56=%02x on id=%d!\n", scsi_device_qas(sdev), id));
                                                noQas = 0;
                                        }
                                        if (sdev->type == TYPE_TAPE &&
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h
index 14a5b6c2e2bd..187c8af0890b 100644
--- a/drivers/message/fusion/mptscsih.h
+++ b/drivers/message/fusion/mptscsih.h
@@ -5,7 +5,7 @@
 *          LSIFC9xx/LSI409xx Fibre Channel
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 36641da59289..203c661d2c79 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -3,7 +3,7 @@
 *      For use with LSI Logic PCI chip/adapter(s)
 *      running LSI Logic Fusion MPT (Message Passing Technology) firmware.
 *
- *  Copyright (c) 1999-2005 LSI Logic Corporation
+ *  Copyright (c) 1999-2007 LSI Logic Corporation
 *  (mailto:mpt_linux_developer@lsil.com)
 *
 */
@@ -77,6 +77,7 @@
 MODULE_AUTHOR(MODULEAUTHOR);
 MODULE_DESCRIPTION(my_NAME);
 MODULE_LICENSE("GPL");
+MODULE_VERSION(my_VERSION);
 /* Command line args */
 static int mpt_saf_te = MPTSCSIH_SAF_TE;
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/imxmmc.c
index 06e7fcd19221..bfb9ff693208 100644
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/imxmmc.c
@@ -351,9 +351,6 @@ static void imxmci_start_cmd(struct imxmci_host *host, struct mmc_command *cmd,
        case MMC_RSP_R3: /* short */
                cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R3;
                break;
-        case MMC_RSP_R6: /* short CRC */
-                cmdat |= CMD_DAT_CONT_RESPONSE_FORMAT_R6;
-                break;
        default:
                break;
        }
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c
index 9488408308fb..d30540b27614 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/omap.c
@@ -91,7 +91,6 @@
 #define DRIVER_NAME "mmci-omap"
-#define RSP_TYPE(x)     ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))
 /* Specifies how often in millisecs to poll for card status changes
 * when the cover switch is open */
@@ -204,18 +203,22 @@ mmc_omap_start_command(struct mmc_omap_host *host, struct mmc_command *cmd)
        cmdtype = 0;
        /* Our hardware needs to know exact type */
-        switch (RSP_TYPE(mmc_resp_type(cmd))) {
+        switch (mmc_resp_type(cmd)) {
-        case RSP_TYPE(MMC_RSP_R1):
+        case MMC_RSP_NONE:
-                /* resp 1, resp 1b */
+                break;
+        case MMC_RSP_R1:
+        case MMC_RSP_R1B:
+                /* resp 1, 1b, 6, 7 */
                resptype = 1;
                break;
-        case RSP_TYPE(MMC_RSP_R2):
+        case MMC_RSP_R2:
                resptype = 2;
                break;
-        case RSP_TYPE(MMC_RSP_R3):
+        case MMC_RSP_R3:
                resptype = 3;
                break;
        default:
+                dev_err(mmc_dev(host->mmc), "Invalid response type: %04x\n", mmc_resp_type(cmd));
                break;
        }
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/pxamci.c
index 45a9283ce498..6073d998b11f 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/pxamci.c
@@ -171,7 +171,7 @@ static void pxamci_start_cmd(struct pxamci_host *host, struct mmc_command *cmd,
 #define RSP_TYPE(x)     ((x) & ~(MMC_RSP_BUSY|MMC_RSP_OPCODE))
        switch (RSP_TYPE(mmc_resp_type(cmd))) {
-        case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6 */
+        case RSP_TYPE(MMC_RSP_R1): /* r1, r1b, r6, r7 */
                cmdat |= CMDAT_RESP_SHORT;
                break;
        case RSP_TYPE(MMC_RSP_R3):
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/tifm_sd.c
index f18ad998b3cb..fa4a52886b97 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/tifm_sd.c
@@ -173,9 +173,6 @@ static unsigned int tifm_sd_op_flags(struct mmc_command *cmd)
        case MMC_RSP_R3:
                rc |= TIFM_MMCSD_RSP_R3;
                break;
-        case MMC_RSP_R6:
-                rc |= TIFM_MMCSD_RSP_R6;
-                break;
        default:
                BUG();
        }
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index a304b34c2632..26f75c299440 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -164,9 +164,15 @@ config MTD_CHAR
          memory chips, and also use ioctl() to obtain information about
          the device, or to erase parts of it.
+config MTD_BLKDEVS
+        tristate "Common interface to block layer for MTD 'translation layers'"
+        depends on MTD && BLOCK
+        default n
 config MTD_BLOCK
        tristate "Caching block device access to MTD devices"
        depends on MTD && BLOCK
+        select MTD_BLKDEVS
        ---help---
          Although most flash chips have an erase size too large to be useful
          as block devices, it is possible to use MTD devices which are based
@@ -189,6 +195,7 @@ config MTD_BLOCK
 config MTD_BLOCK_RO
        tristate "Readonly block device access to MTD devices"
        depends on MTD_BLOCK!=y && MTD && BLOCK
+        select MTD_BLKDEVS
        help
          This allows you to mount read-only file systems (such as cramfs)
          from an MTD device, without the overhead (and danger) of the caching
@@ -200,6 +207,7 @@ config MTD_BLOCK_RO
 config FTL
        tristate "FTL (Flash Translation Layer) support"
        depends on MTD && BLOCK
+        select MTD_BLKDEVS
        ---help---
          This provides support for the original Flash Translation Layer which
          is part of the PCMCIA specification. It uses a kind of pseudo-
@@ -216,6 +224,7 @@ config FTL
 config NFTL
        tristate "NFTL (NAND Flash Translation Layer) support"
        depends on MTD && BLOCK
+        select MTD_BLKDEVS
        ---help---
          This provides support for the NAND Flash Translation Layer which is
          used on M-Systems' DiskOnChip devices. It uses a kind of pseudo-
@@ -239,6 +248,7 @@ config NFTL_RW
 config INFTL
        tristate "INFTL (Inverse NAND Flash Translation Layer) support"
        depends on MTD && BLOCK
+        select MTD_BLKDEVS
        ---help---
          This provides support for the Inverse NAND Flash Translation
          Layer which is used on M-Systems' newer DiskOnChip devices. It
@@ -256,6 +266,7 @@ config INFTL
 config RFD_FTL
        tristate "Resident Flash Disk (Flash Translation Layer) support"
        depends on MTD && BLOCK
+        select MTD_BLKDEVS
        ---help---
          This provides support for the flash translation layer known
          as the Resident Flash Disk (RFD), as used by the Embedded BIOS
@@ -265,8 +276,8 @@ config RFD_FTL
 config SSFDC
        tristate "NAND SSFDC (SmartMedia) read only translation layer"
-        depends on MTD
+        depends on MTD && BLOCK
-        default n
+        select MTD_BLKDEVS
        help
          This enables read only access to SmartMedia formatted NAND
          flash. You can mount it with FAT file system.
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 1e36b9aed98b..c130e6261adf 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -15,13 +15,14 @@ obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
 # 'Users' - code which presents functionality to userspace.
 obj-$(CONFIG_MTD_CHAR)          += mtdchar.o
-obj-$(CONFIG_MTD_BLOCK)         += mtdblock.o mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLKDEVS)       += mtd_blkdevs.o
-obj-$(CONFIG_MTD_BLOCK_RO)      += mtdblock_ro.o mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLOCK)         += mtdblock.o
-obj-$(CONFIG_FTL)               += ftl.o mtd_blkdevs.o
+obj-$(CONFIG_MTD_BLOCK_RO)      += mtdblock_ro.o
-obj-$(CONFIG_NFTL)              += nftl.o mtd_blkdevs.o
+obj-$(CONFIG_FTL)               += ftl.o
-obj-$(CONFIG_INFTL)             += inftl.o mtd_blkdevs.o
+obj-$(CONFIG_NFTL)              += nftl.o
-obj-$(CONFIG_RFD_FTL)           += rfd_ftl.o mtd_blkdevs.o
+obj-$(CONFIG_INFTL)             += inftl.o
-obj-$(CONFIG_SSFDC)             += ssfdc.o mtd_blkdevs.o
+obj-$(CONFIG_RFD_FTL)           += rfd_ftl.o
+obj-$(CONFIG_SSFDC)             += ssfdc.o
 nftl-objs               := nftlcore.o nftlmount.o
 inftl-objs              := inftlcore.o inftlmount.o
diff --git a/drivers/mtd/afs.c b/drivers/mtd/afs.c
index 6a45be04564b..52d51eb91c16 100644
--- a/drivers/mtd/afs.c
+++ b/drivers/mtd/afs.c
@@ -207,11 +207,10 @@ static int parse_afs_partitions(struct mtd_info *mtd,
        if (!sz)
                return ret;
-        parts = kmalloc(sz, GFP_KERNEL);
+        parts = kzalloc(sz, GFP_KERNEL);
        if (!parts)
                return -ENOMEM;
-        memset(parts, 0, sz);
        str = (char *)(parts + idx);
        /*
diff --git a/drivers/mtd/chips/amd_flash.c b/drivers/mtd/chips/amd_flash.c
index 16eaca69fb5a..e7999f15d85a 100644
--- a/drivers/mtd/chips/amd_flash.c
+++ b/drivers/mtd/chips/amd_flash.c
@@ -643,13 +643,12 @@ static struct mtd_info *amd_flash_probe(struct map_info *map)
        int reg_idx;
        int offset;
-        mtd = (struct mtd_info*)kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd) {
                printk(KERN_WARNING
                       "%s: kmalloc failed for info structure\n", map->name);
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        mtd->priv = map;
        memset(&temp, 0, sizeof(temp));
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
index 296159ec5189..f69184a92eb2 100644
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -337,12 +337,11 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary)
        struct mtd_info *mtd;
        int i;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd) {
                printk(KERN_ERR "Failed to allocate memory for MTD device\n");
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        mtd->priv = map;
        mtd->type = MTD_NORFLASH;
@@ -2224,6 +2223,8 @@ static int cfi_intelext_suspend(struct mtd_info *mtd)
                case FL_CFI_QUERY:
                case FL_JEDEC_QUERY:
                        if (chip->oldstate == FL_READY) {
+                                /* place the chip in a known state before suspend */
+                                map_write(map, CMD(0xFF), cfi->chips[i].start);
                                chip->oldstate = chip->state;
                                chip->state = FL_PM_SUSPENDED;
                                /* No need to wake_up() on this state change -
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 702ae4cd8691..e3acd398fb37 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -48,6 +48,7 @@
 #define MANUFACTURER_ATMEL      0x001F
 #define MANUFACTURER_SST        0x00BF
 #define SST49LF004B             0x0060
+#define SST49LF040B             0x0050
 #define SST49LF008A             0x005a
 #define AT49BV6416              0x00d6
@@ -233,6 +234,7 @@ static struct cfi_fixup cfi_fixup_table[] = {
 };
 static struct cfi_fixup jedec_fixup_table[] = {
        { MANUFACTURER_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
+        { MANUFACTURER_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
        { MANUFACTURER_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
        { 0, 0, NULL, NULL }
 };
@@ -255,12 +257,11 @@ struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary)
        struct mtd_info *mtd;
        int i;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd) {
                printk(KERN_WARNING "Failed to allocate memory for MTD device\n");
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        mtd->priv = map;
        mtd->type = MTD_NORFLASH;
@@ -519,10 +520,12 @@ static int get_chip(struct map_info *map, struct flchip *chip, unsigned long adr
                if (mode == FL_WRITING) /* FIXME: Erase-suspend-program appears broken. */
                        goto sleep;
-                if (!(mode == FL_READY || mode == FL_POINT
+                if (!(   mode == FL_READY
+                      || mode == FL_POINT
                      || !cfip
                      || (mode == FL_WRITING && (cfip->EraseSuspend & 0x2))
-                      || (mode == FL_WRITING && (cfip->EraseSuspend & 0x1))))
+                      || (mode == FL_WRITING && (cfip->EraseSuspend & 0x1)
+                    )))
                        goto sleep;
                /* We could check to see if we're trying to access the sector
diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
index fae70a5db540..d56849f5f107 100644
--- a/drivers/mtd/chips/cfi_cmdset_0020.c
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
@@ -172,7 +172,7 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
        int i,j;
        unsigned long devsize = (1<<cfi->cfiq->DevSize) * cfi->interleave;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        //printk(KERN_DEBUG "number of CFI chips: %d\n", cfi->numchips);
        if (!mtd) {
@@ -181,7 +181,6 @@ static struct mtd_info *cfi_staa_setup(struct map_info *map)
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        mtd->priv = map;
        mtd->type = MTD_NORFLASH;
        mtd->size = devsize * cfi->numchips;
diff --git a/drivers/mtd/chips/gen_probe.c b/drivers/mtd/chips/gen_probe.c
index cdb0f590b40c..2eb696d7b97b 100644
--- a/drivers/mtd/chips/gen_probe.c
+++ b/drivers/mtd/chips/gen_probe.c
@@ -40,7 +40,7 @@ struct mtd_info *mtd_do_chip_probe(struct map_info *map, struct chip_probe *cp)
        if (mtd) {
                if (mtd->size > map->size) {
                        printk(KERN_WARNING "Reducing visibility of %ldKiB chip to %ldKiB\n",
-                               (unsigned long)mtd->size >> 10, 
+                               (unsigned long)mtd->size >> 10,
                               (unsigned long)map->size >> 10);
                        mtd->size = map->size;
                }
@@ -113,13 +113,12 @@ static struct cfi_private *genprobe_ident_chips(struct map_info *map, struct chi
        }
        mapsize = (max_chips + BITS_PER_LONG-1) / BITS_PER_LONG;
-        chip_map = kmalloc(mapsize, GFP_KERNEL);
+        chip_map = kzalloc(mapsize, GFP_KERNEL);
        if (!chip_map) {
                printk(KERN_WARNING "%s: kmalloc failed for CFI chip map\n", map->name);
                kfree(cfi.cfiq);
                return NULL;
        }
-        memset (chip_map, 0, mapsize);
        set_bit(0, chip_map); /* Mark first chip valid */
diff --git a/drivers/mtd/chips/jedec.c b/drivers/mtd/chips/jedec.c
index 2c3f019197c1..14e57b2bf842 100644
--- a/drivers/mtd/chips/jedec.c
+++ b/drivers/mtd/chips/jedec.c
@@ -116,11 +116,10 @@ static struct mtd_info *jedec_probe(struct map_info *map)
   char Part[200];
   memset(&priv,0,sizeof(priv));
-   MTD = kmalloc(sizeof(struct mtd_info) + sizeof(struct jedec_private), GFP_KERNEL);
+   MTD = kzalloc(sizeof(struct mtd_info) + sizeof(struct jedec_private), GFP_KERNEL);
   if (!MTD)
           return NULL;
-   memset(MTD, 0, sizeof(struct mtd_info) + sizeof(struct jedec_private));
   priv = (struct jedec_private *)&MTD[1];
   my_bank_size = map->size;
diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
index 1154dac715aa..58e561e87699 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -154,6 +154,7 @@
 #define SST39SF010A     0x00B5
 #define SST39SF020A     0x00B6
 #define SST49LF004B     0x0060
+#define SST49LF040B     0x0050
 #define SST49LF008A     0x005a
 #define SST49LF030A     0x001C
 #define SST49LF040A     0x0051
@@ -1401,6 +1402,20 @@ static const struct amd_flash_info jedec_table[] = {
                }
        }, {
                .mfr_id         = MANUFACTURER_SST,
+                .dev_id         = SST49LF040B,
+                .name           = "SST 49LF040B",
+                .uaddr          = {
+                        [0] = MTD_UADDR_0x5555_0x2AAA /* x8 */
+                },
+                .DevSize        = SIZE_512KiB,
+                .CmdSet         = P_ID_AMD_STD,
+                .NumEraseRegions= 1,
+                .regions        = {
+                        ERASEINFO(0x01000,128),
+                }
+        }, {
+                .mfr_id         = MANUFACTURER_SST,
                .dev_id         = SST49LF004B,
                .name           = "SST 49LF004B",
                .uaddr          = {
@@ -1874,7 +1889,7 @@ static int cfi_jedec_setup(struct cfi_private *p_cfi, int index)
 /*
- * There is a BIG problem properly ID'ing the JEDEC devic and guaranteeing
+ * There is a BIG problem properly ID'ing the JEDEC device and guaranteeing
 * the mapped address, unlock addresses, and proper chip ID.  This function
 * attempts to minimize errors.  It is doubtfull that this probe will ever
 * be perfect - consequently there should be some module parameters that
diff --git a/drivers/mtd/chips/map_absent.c b/drivers/mtd/chips/map_absent.c
index ac01a949b687..fc478c0f93f5 100644
--- a/drivers/mtd/chips/map_absent.c
+++ b/drivers/mtd/chips/map_absent.c
@@ -47,13 +47,11 @@ static struct mtd_info *map_absent_probe(struct map_info *map)
 {
        struct mtd_info *mtd;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd) {
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        map->fldrv      = &map_absent_chipdrv;
        mtd->priv       = map;
        mtd->name       = map->name;
diff --git a/drivers/mtd/chips/map_ram.c b/drivers/mtd/chips/map_ram.c
index 3a66680abfd0..5cb6d5263661 100644
--- a/drivers/mtd/chips/map_ram.c
+++ b/drivers/mtd/chips/map_ram.c
@@ -55,12 +55,10 @@ static struct mtd_info *map_ram_probe(struct map_info *map)
 #endif
        /* OK. It seems to be RAM. */
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd)
                return NULL;
-        memset(mtd, 0, sizeof(*mtd));
        map->fldrv = &mapram_chipdrv;
        mtd->priv = map;
        mtd->name = map->name;
diff --git a/drivers/mtd/chips/map_rom.c b/drivers/mtd/chips/map_rom.c
index 1b328b1378fd..cb27f855074c 100644
--- a/drivers/mtd/chips/map_rom.c
+++ b/drivers/mtd/chips/map_rom.c
@@ -31,12 +31,10 @@ static struct mtd_info *map_rom_probe(struct map_info *map)
 {
        struct mtd_info *mtd;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd)
                return NULL;
-        memset(mtd, 0, sizeof(*mtd));
        map->fldrv = &maprom_chipdrv;
        mtd->priv = map;
        mtd->name = map->name;
diff --git a/drivers/mtd/chips/sharp.c b/drivers/mtd/chips/sharp.c
index 967abbecdff9..c9cd3d21ccfa 100644
--- a/drivers/mtd/chips/sharp.c
+++ b/drivers/mtd/chips/sharp.c
@@ -112,18 +112,16 @@ static struct mtd_info *sharp_probe(struct map_info *map)
        struct sharp_info *sharp = NULL;
        int width;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if(!mtd)
                return NULL;
-        sharp = kmalloc(sizeof(*sharp), GFP_KERNEL);
+        sharp = kzalloc(sizeof(*sharp), GFP_KERNEL);
        if(!sharp) {
                kfree(mtd);
                return NULL;
        }
-        memset(mtd, 0, sizeof(*mtd));
        width = sharp_probe_map(map,mtd);
        if(!width){
                kfree(mtd);
@@ -143,7 +141,6 @@ static struct mtd_info *sharp_probe(struct map_info *map)
        mtd->writesize = 1;
        mtd->name = map->name;
-        memset(sharp, 0, sizeof(*sharp));
        sharp->chipshift = 23;
        sharp->numchips = 1;
        sharp->chips[0].start = 0;
diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
index a7a7bfe33879..23fab14f1637 100644
--- a/drivers/mtd/cmdlinepart.c
+++ b/drivers/mtd/cmdlinepart.c
@@ -163,13 +163,12 @@ static struct mtd_partition * newpart(char *s,
                *num_parts = this_part + 1;
                alloc_size = *num_parts * sizeof(struct mtd_partition) +
                             extra_mem_size;
-                parts = kmalloc(alloc_size, GFP_KERNEL);
+                parts = kzalloc(alloc_size, GFP_KERNEL);
                if (!parts)
                {
                        printk(KERN_ERR ERRP "out of memory\n");
                        return NULL;
                }
-                memset(parts, 0, alloc_size);
                extra_mem = (unsigned char *)(parts + *num_parts);
        }
        /* enter this partition (offset will be calculated later if it is zero at this point) */
@@ -346,7 +345,7 @@ static int parse_cmdline_partitions(struct mtd_info *master,
 *
 * This function needs to be visible for bootloaders.
 */
-int mtdpart_setup(char *s)
+static int mtdpart_setup(char *s)
 {
        cmdline = s;
        return 1;
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index 401c6a294baa..6d917a4daa9d 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -295,10 +295,9 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
        if (!devname)
                return NULL;
-        dev = kmalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(struct block2mtd_dev), GFP_KERNEL);
        if (!dev)
                return NULL;
-        memset(dev, 0, sizeof(*dev));
        /* Get a handle on the device */
        bdev = open_bdev_excl(devname, O_RDWR, NULL);
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c
index 08dfb899b272..9cff119a2024 100644
--- a/drivers/mtd/devices/ms02-nv.c
+++ b/drivers/mtd/devices/ms02-nv.c
@@ -131,11 +131,10 @@ static int __init ms02nv_init_one(ulong addr)
        int ret = -ENODEV;
        /* The module decodes 8MiB of address space. */
-        mod_res = kmalloc(sizeof(*mod_res), GFP_KERNEL);
+        mod_res = kzalloc(sizeof(*mod_res), GFP_KERNEL);
        if (!mod_res)
                return -ENOMEM;
-        memset(mod_res, 0, sizeof(*mod_res));
        mod_res->name = ms02nv_name;
        mod_res->start = addr;
        mod_res->end = addr + MS02NV_SLOT_SIZE - 1;
@@ -153,24 +152,21 @@ static int __init ms02nv_init_one(ulong addr)
        }
        ret = -ENOMEM;
-        mtd = kmalloc(sizeof(*mtd), GFP_KERNEL);
+        mtd = kzalloc(sizeof(*mtd), GFP_KERNEL);
        if (!mtd)
                goto err_out_mod_res_rel;
-        memset(mtd, 0, sizeof(*mtd));
+        mp = kzalloc(sizeof(*mp), GFP_KERNEL);
-        mp = kmalloc(sizeof(*mp), GFP_KERNEL);
        if (!mp)
                goto err_out_mtd;
-        memset(mp, 0, sizeof(*mp));
        mtd->priv = mp;
        mp->resource.module = mod_res;
        /* Firmware's diagnostic NVRAM area. */
-        diag_res = kmalloc(sizeof(*diag_res), GFP_KERNEL);
+        diag_res = kzalloc(sizeof(*diag_res), GFP_KERNEL);
        if (!diag_res)
                goto err_out_mp;
-        memset(diag_res, 0, sizeof(*diag_res));
        diag_res->name = ms02nv_res_diag_ram;
        diag_res->start = addr;
        diag_res->end = addr + MS02NV_RAM - 1;
@@ -180,11 +176,10 @@ static int __init ms02nv_init_one(ulong addr)
        mp->resource.diag_ram = diag_res;
        /* User-available general-purpose NVRAM area. */
-        user_res = kmalloc(sizeof(*user_res), GFP_KERNEL);
+        user_res = kzalloc(sizeof(*user_res), GFP_KERNEL);
        if (!user_res)
                goto err_out_diag_res;
-        memset(user_res, 0, sizeof(*user_res));
        user_res->name = ms02nv_res_user_ram;
        user_res->start = addr + MS02NV_RAM;
        user_res->end = addr + size - 1;
@@ -194,11 +189,10 @@ static int __init ms02nv_init_one(ulong addr)
        mp->resource.user_ram = user_res;
        /* Control and status register. */
-        csr_res = kmalloc(sizeof(*csr_res), GFP_KERNEL);
+        csr_res = kzalloc(sizeof(*csr_res), GFP_KERNEL);
        if (!csr_res)
                goto err_out_user_res;
-        memset(csr_res, 0, sizeof(*csr_res));
        csr_res->name = ms02nv_res_csr;
        csr_res->start = addr + MS02NV_CSR;
        csr_res->end = addr + MS02NV_CSR + 3;
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c
index 910e4061dfd2..a987e917f4e0 100644
--- a/drivers/mtd/devices/mtd_dataflash.c
+++ b/drivers/mtd/devices/mtd_dataflash.c
@@ -480,7 +480,7 @@ add_dataflash(struct spi_device *spi, char *name,
        device->writesize = pagesize;
        device->owner = THIS_MODULE;
        device->type = MTD_DATAFLASH;
-        device->flags = MTD_CAP_NORFLASH;
+        device->flags = MTD_WRITEABLE;
        device->erase = dataflash_erase;
        device->read = dataflash_read;
        device->write = dataflash_write;
diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 6c7337f9ebbb..56cc1ca7ffd5 100644
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -126,12 +126,10 @@ static int register_device(char *name, unsigned long start, unsigned long len)
        struct phram_mtd_list *new;
        int ret = -ENOMEM;
-        new = kmalloc(sizeof(*new), GFP_KERNEL);
+        new = kzalloc(sizeof(*new), GFP_KERNEL);
        if (!new)
                goto out0;
-        memset(new, 0, sizeof(*new));
        ret = -EIO;
        new->mtd.priv = ioremap(start, len);
        if (!new->mtd.priv) {
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 542a0c009006..5f49248a4856 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -168,19 +168,16 @@ static int register_device(char *name, unsigned long start, unsigned long length
                E("slram: Cannot allocate new MTD device.\n");
                return(-ENOMEM);
        }
-        (*curmtd)->mtdinfo = kmalloc(sizeof(struct mtd_info), GFP_KERNEL);
+        (*curmtd)->mtdinfo = kzalloc(sizeof(struct mtd_info), GFP_KERNEL);
        (*curmtd)->next = NULL;
        if ((*curmtd)->mtdinfo) {
-                memset((char *)(*curmtd)->mtdinfo, 0, sizeof(struct mtd_info));
                (*curmtd)->mtdinfo->priv =
-                        kmalloc(sizeof(slram_priv_t), GFP_KERNEL);
+                        kzalloc(sizeof(slram_priv_t), GFP_KERNEL);
                if (!(*curmtd)->mtdinfo->priv) {
                        kfree((*curmtd)->mtdinfo);
                        (*curmtd)->mtdinfo = NULL;
-                } else {
-                        memset((*curmtd)->mtdinfo->priv,0,sizeof(slram_priv_t));
                }
        }
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 8a878b34eca0..24235d4f1d23 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1033,7 +1033,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
        partition_t *partition;
-        partition = kmalloc(sizeof(partition_t), GFP_KERNEL);
+        partition = kzalloc(sizeof(partition_t), GFP_KERNEL);
        if (!partition) {
                printk(KERN_WARNING "No memory to scan for FTL on %s\n",
@@ -1041,8 +1041,6 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
                return;
        }
-        memset(partition, 0, sizeof(partition_t));
        partition->mbd.mtd = mtd;
        if ((scan_header(partition) == 0) &&
@@ -1054,7 +1052,7 @@ static void ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
                       le32_to_cpu(partition->header.FormattedSize) >> 10);
 #endif
                partition->mbd.size = le32_to_cpu(partition->header.FormattedSize) >> 9;
-                partition->mbd.blksize = SECTOR_SIZE;
                partition->mbd.tr = tr;
                partition->mbd.devnum = -1;
                if (!add_mtd_blktrans_dev((void *)partition))
@@ -1076,6 +1074,7 @@ struct mtd_blktrans_ops ftl_tr = {
        .name           = "ftl",
        .major          = FTL_MAJOR,
        .part_bits      = PART_BITS,
+        .blksize        = SECTOR_SIZE,
        .readsect       = ftl_readsect,
        .writesect      = ftl_writesect,
        .getgeo         = ftl_getgeo,
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 4116535805f1..b0e396504e67 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -67,17 +67,16 @@ static void inftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: add_mtd for %s\n", mtd->name);
-        inftl = kmalloc(sizeof(*inftl), GFP_KERNEL);
+        inftl = kzalloc(sizeof(*inftl), GFP_KERNEL);
        if (!inftl) {
                printk(KERN_WARNING "INFTL: Out of memory for data structures\n");
                return;
        }
-        memset(inftl, 0, sizeof(*inftl));
        inftl->mbd.mtd = mtd;
        inftl->mbd.devnum = -1;
-        inftl->mbd.blksize = 512;
        inftl->mbd.tr = tr;
        if (INFTL_mount(inftl) < 0) {
@@ -163,10 +162,9 @@ int inftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
        ops.ooblen = len;
        ops.oobbuf = buf;
        ops.datbuf = NULL;
-        ops.len = len;
        res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
-        *retlen = ops.retlen;
+        *retlen = ops.oobretlen;
        return res;
 }
@@ -184,10 +182,9 @@ int inftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
        ops.ooblen = len;
        ops.oobbuf = buf;
        ops.datbuf = NULL;
-        ops.len = len;
        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
-        *retlen = ops.retlen;
+        *retlen = ops.oobretlen;
        return res;
 }
@@ -945,6 +942,7 @@ static struct mtd_blktrans_ops inftl_tr = {
        .name           = "inftl",
        .major          = INFTL_MAJOR,
        .part_bits      = INFTL_PARTN_BITS,
+        .blksize        = 512,
        .getgeo         = inftl_getgeo,
        .readsect       = inftl_readblock,
        .writesect      = inftl_writeblock,
diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index d132ed571f13..f457315579db 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -60,6 +60,15 @@ config MTD_PHYSMAP_BANKWIDTH
          Ignore this option if you use run-time physmap configuration
          (i.e., run-time calling physmap_configure()).
+config MTD_PHYSMAP_OF
+        tristate "Flash device in physical memory map based on OF descirption"
+        depends on PPC_OF && (MTD_CFI || MTD_JEDECPROBE || MTD_ROM)
+        help
+          This provides a 'mapping' driver which allows the NOR Flash and
+          ROM driver code to communicate with chips which are mapped
+          physically into the CPU's memory. The mapping description here is
+          taken from OF device tree.
 config MTD_SUN_UFLASH
        tristate "Sun Microsystems userflash support"
        depends on SPARC && MTD_CFI
@@ -184,6 +193,24 @@ config MTD_ICHXROM
          BE VERY CAREFUL.
+config MTD_ESB2ROM
+        tristate "BIOS flash chip on Intel ESB Controller Hub 2"
+        depends on X86 && MTD_JEDECPROBE && PCI
+        help
+          Support for treating the BIOS flash chip on ESB2 motherboards
+          as an MTD device - with this you can reprogram your BIOS.
+          BE VERY CAREFUL.
+config MTD_CK804XROM
+        tristate "BIOS flash chip on Nvidia CK804"
+        depends on X86 && MTD_JEDECPROBE
+        help
+          Support for treating the BIOS flash chip on nvidia motherboards
+          as an MTD device - with this you can reprogram your BIOS.
+          BE VERY CAREFUL.
 config MTD_SCB2_FLASH
        tristate "BIOS flash chip on Intel SCB2 boards"
        depends on X86 && MTD_JEDECPROBE
@@ -355,50 +382,6 @@ config MTD_TQM834x
          TQ Components TQM834x boards. If you have one of these boards
          and would like to use the flash chips on it, say 'Y'.
-config MTD_CSTM_MIPS_IXX
-        tristate "Flash chip mapping on ITE QED-4N-S01B, Globespan IVR or custom board"
-        depends on MIPS && MTD_CFI && MTD_JEDECPROBE && MTD_PARTITIONS
-        help
-          This provides a mapping driver for the Integrated Technology
-          Express, Inc (ITE) QED-4N-S01B eval board and the Globespan IVR
-          Reference Board. It provides the necessary addressing, length,
-          buswidth, vpp code and addition setup of the flash device for
-          these boards. In addition, this mapping driver can be used for
-          other boards via setting of the CONFIG_MTD_CSTM_MIPS_IXX_START/
-          LEN/BUSWIDTH parameters. This mapping will provide one mtd device
-          using one partition. The start address can be offset from the
-          beginning of flash and the len can be less than the total flash
-          device size to allow a window into the flash. Both CFI and JEDEC
-          probes are called.
-config MTD_CSTM_MIPS_IXX_START
-        hex "Physical start address of flash mapping"
-        depends on MTD_CSTM_MIPS_IXX
-        default "0x8000000"
-        help
-          This is the physical memory location that the MTD driver will
-          use for the flash chips on your particular target board.
-          Refer to the memory map which should hopefully be in the
-          documentation for your board.
-config MTD_CSTM_MIPS_IXX_LEN
-        hex "Physical length of flash mapping"
-        depends on MTD_CSTM_MIPS_IXX
-        default "0x4000000"
-        help
-          This is the total length that the MTD driver will use for the
-          flash chips on your particular board.  Refer to the memory
-          map which should hopefully be in the documentation for your
-          board.
-config MTD_CSTM_MIPS_IXX_BUSWIDTH
-        int "Bus width in octets"
-        depends on MTD_CSTM_MIPS_IXX
-        default "2"
-        help
-          This is the total bus width of the mapping of the flash chips
-          on your particular board.
 config MTD_OCELOT
        tristate "Momenco Ocelot boot flash device"
        depends on MIPS && MOMENCO_OCELOT
diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 191c1928bbec..071d0bf922b6 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -12,12 +12,13 @@ obj-$(CONFIG_MTD_CDB89712)	+= cdb89712.o
 obj-$(CONFIG_MTD_ARM_INTEGRATOR)+= integrator-flash.o
 obj-$(CONFIG_MTD_BAST)          += bast-flash.o
 obj-$(CONFIG_MTD_CFI_FLAGADM)   += cfi_flagadm.o
-obj-$(CONFIG_MTD_CSTM_MIPS_IXX) += cstm_mips_ixx.o
 obj-$(CONFIG_MTD_DC21285)       += dc21285.o
 obj-$(CONFIG_MTD_DILNETPC)      += dilnetpc.o
 obj-$(CONFIG_MTD_L440GX)        += l440gx.o
 obj-$(CONFIG_MTD_AMD76XROM)     += amd76xrom.o
+obj-$(CONFIG_MTD_ESB2ROM)       += esb2rom.o
 obj-$(CONFIG_MTD_ICHXROM)       += ichxrom.o
+obj-$(CONFIG_MTD_CK804XROM)     += ck804xrom.o
 obj-$(CONFIG_MTD_TSUNAMI)       += tsunami_flash.o
 obj-$(CONFIG_MTD_LUBBOCK)       += lubbock-flash.o
 obj-$(CONFIG_MTD_MAINSTONE)     += mainstone-flash.o
@@ -25,6 +26,7 @@ obj-$(CONFIG_MTD_MBX860)	+= mbx860.o
 obj-$(CONFIG_MTD_CEIVA)         += ceiva.o
 obj-$(CONFIG_MTD_OCTAGON)       += octagon-5066.o
 obj-$(CONFIG_MTD_PHYSMAP)       += physmap.o
+obj-$(CONFIG_MTD_PHYSMAP_OF)    += physmap_of.o
 obj-$(CONFIG_MTD_PNC2000)       += pnc2000.o
 obj-$(CONFIG_MTD_PCMCIA)        += pcmciamtd.o
 obj-$(CONFIG_MTD_RPXLITE)       += rpxlite.o
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c
index 797caffb20b1..78b671172bb2 100644
--- a/drivers/mtd/maps/amd76xrom.c
+++ b/drivers/mtd/maps/amd76xrom.c
@@ -7,6 +7,7 @@
 #include <linux/module.h>
 #include <linux/types.h>
+#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/io.h>
@@ -44,6 +45,23 @@ struct amd76xrom_map_info {
        char map_name[sizeof(MOD_NAME) + 2 + ADDRESS_NAME_LEN];
 };
+/* The 2 bits controlling the window size are often set to allow reading
+ * the BIOS, but too small to allow writing, since the lock registers are
+ * 4MiB lower in the address space than the data.
+ *
+ * This is intended to prevent flashing the bios, perhaps accidentally.
+ *
+ * This parameter allows the normal driver to over-ride the BIOS settings.
+ *
+ * The bits are 6 and 7.  If both bits are set, it is a 5MiB window.
+ * If only the 7 Bit is set, it is a 4MiB window.  Otherwise, a
+ * 64KiB window.
+ *
+ */
+static uint win_size_bits;
+module_param(win_size_bits, uint, 0);
+MODULE_PARM_DESC(win_size_bits, "ROM window size bits override for 0x43 byte, normally set by BIOS.");
 static struct amd76xrom_window amd76xrom_window = {
        .maps = LIST_HEAD_INIT(amd76xrom_window.maps),
 };
@@ -95,6 +113,16 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
        /* Remember the pci dev I find the window in - already have a ref */
        window->pdev = pdev;
+        /* Enable the selected rom window.  This is often incorrectly
+         * set up by the BIOS, and the 4MiB offset for the lock registers
+         * requires the full 5MiB of window space.
+         *
+         * This 'write, then read' approach leaves the bits for
+         * other uses of the hardware info.
+         */
+        pci_read_config_byte(pdev, 0x43, &byte);
+        pci_write_config_byte(pdev, 0x43, byte | win_size_bits );
        /* Assume the rom window is properly setup, and find it's size */
        pci_read_config_byte(pdev, 0x43, &byte);
        if ((byte & ((1<<7)|(1<<6))) == ((1<<7)|(1<<6))) {
@@ -129,12 +157,6 @@ static int __devinit amd76xrom_init_one (struct pci_dev *pdev,
                        (unsigned long long)window->rsrc.end);
        }
-#if 0
-        /* Enable the selected rom window */
-        pci_read_config_byte(pdev, 0x43, &byte);
-        pci_write_config_byte(pdev, 0x43, byte | rwindow->segen_bits);
-#endif
        /* Enable writes through the rom window */
        pci_read_config_byte(pdev, 0x40, &byte);
diff --git a/drivers/mtd/maps/bast-flash.c b/drivers/mtd/maps/bast-flash.c
index e074bb6787d2..fc3b2672d1e2 100644
--- a/drivers/mtd/maps/bast-flash.c
+++ b/drivers/mtd/maps/bast-flash.c
@@ -131,7 +131,7 @@ static int bast_flash_probe(struct platform_device *pdev)
        info->map.phys = res->start;
        info->map.size = res->end - res->start + 1;
-        info->map.name = pdev->dev.bus_id;      
+        info->map.name = pdev->dev.bus_id;
        info->map.bankwidth = 2;
        if (info->map.size > AREA_MAXSIZE)
diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index 0402c21e291d..629e6e2641a8 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -122,10 +122,9 @@ static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
        /*
         * Allocate the map_info structs in one go.
         */
-        maps = kmalloc(sizeof(struct map_info) * nr, GFP_KERNEL);
+        maps = kzalloc(sizeof(struct map_info) * nr, GFP_KERNEL);
        if (!maps)
                return -ENOMEM;
-        memset(maps, 0, sizeof(struct map_info) * nr);
        /*
         * Claim and then map the memory regions.
         */
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c
new file mode 100644
index 000000000000..238d42e88ec5
--- /dev/null
+++ b/drivers/mtd/maps/ck804xrom.c
@@ -0,0 +1,356 @@
+/*
+ * ck804xrom.c
+ *
+ * Normal mappings of chips in physical memory
+ *
+ * Dave Olsen <dolsen@lnxi.com>
+ * Ryan Jackson <rjackson@lnxi.com>
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/cfi.h>
+#include <linux/mtd/flashchip.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/list.h>
+#define MOD_NAME KBUILD_BASENAME
+#define ADDRESS_NAME_LEN 18
+#define ROM_PROBE_STEP_SIZE (64*1024)
+struct ck804xrom_window {
+        void __iomem *virt;
+        unsigned long phys;
+        unsigned long size;
+        struct list_head maps;
+        struct resource rsrc;
+        struct pci_dev *pdev;
+};
+struct ck804xrom_map_info {
+        struct list_head list;
+        struct map_info map;
+        struct mtd_info *mtd;
+        struct resource rsrc;
+        char map_name[sizeof(MOD_NAME) + 2 + ADDRESS_NAME_LEN];
+};
+/* The 2 bits controlling the window size are often set to allow reading
+ * the BIOS, but too small to allow writing, since the lock registers are
+ * 4MiB lower in the address space than the data.
+ *
+ * This is intended to prevent flashing the bios, perhaps accidentally.
+ *
+ * This parameter allows the normal driver to override the BIOS settings.
+ *
+ * The bits are 6 and 7.  If both bits are set, it is a 5MiB window.
+ * If only the 7 Bit is set, it is a 4MiB window.  Otherwise, a
+ * 64KiB window.
+ *
+ */
+static uint win_size_bits = 0;
+module_param(win_size_bits, uint, 0);
+MODULE_PARM_DESC(win_size_bits, "ROM window size bits override for 0x88 byte, normally set by BIOS.");
+static struct ck804xrom_window ck804xrom_window = {
+        .maps = LIST_HEAD_INIT(ck804xrom_window.maps),
+};
+static void ck804xrom_cleanup(struct ck804xrom_window *window)
+{
+        struct ck804xrom_map_info *map, *scratch;
+        u8 byte;
+        if (window->pdev) {
+                /* Disable writes through the rom window */
+                pci_read_config_byte(window->pdev, 0x6d, &byte);
+                pci_write_config_byte(window->pdev, 0x6d, byte & ~1);
+        }
+        /* Free all of the mtd devices */
+        list_for_each_entry_safe(map, scratch, &window->maps, list) {
+                if (map->rsrc.parent)
+                        release_resource(&map->rsrc);
+                del_mtd_device(map->mtd);
+                map_destroy(map->mtd);
+                list_del(&map->list);
+                kfree(map);
+        }
+        if (window->rsrc.parent)
+                release_resource(&window->rsrc);
+        if (window->virt) {
+                iounmap(window->virt);
+                window->virt = NULL;
+                window->phys = 0;
+                window->size = 0;
+        }
+        pci_dev_put(window->pdev);
+}
+static int __devinit ck804xrom_init_one (struct pci_dev *pdev,
+        const struct pci_device_id *ent)
+{
+        static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
+        u8 byte;
+        struct ck804xrom_window *window = &ck804xrom_window;
+        struct ck804xrom_map_info *map = NULL;
+        unsigned long map_top;
+        /* Remember the pci dev I find the window in */
+        window->pdev = pci_dev_get(pdev);
+        /* Enable the selected rom window.  This is often incorrectly
+         * set up by the BIOS, and the 4MiB offset for the lock registers
+         * requires the full 5MiB of window space.
+         *
+         * This 'write, then read' approach leaves the bits for
+         * other uses of the hardware info.
+         */
+        pci_read_config_byte(pdev, 0x88, &byte);
+        pci_write_config_byte(pdev, 0x88, byte | win_size_bits );
+        /* Assume the rom window is properly setup, and find it's size */
+        pci_read_config_byte(pdev, 0x88, &byte);
+        if ((byte & ((1<<7)|(1<<6))) == ((1<<7)|(1<<6)))
+                window->phys = 0xffb00000; /* 5MiB */
+        else if ((byte & (1<<7)) == (1<<7))
+                window->phys = 0xffc00000; /* 4MiB */
+        else
+                window->phys = 0xffff0000; /* 64KiB */
+        window->size = 0xffffffffUL - window->phys + 1UL;
+        /*
+         * Try to reserve the window mem region.  If this fails then
+         * it is likely due to a fragment of the window being
+         * "reserved" by the BIOS.  In the case that the
+         * request_mem_region() fails then once the rom size is
+         * discovered we will try to reserve the unreserved fragment.
+         */
+        window->rsrc.name = MOD_NAME;
+        window->rsrc.start = window->phys;
+        window->rsrc.end   = window->phys + window->size - 1;
+        window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        if (request_resource(&iomem_resource, &window->rsrc)) {
+                window->rsrc.parent = NULL;
+                printk(KERN_ERR MOD_NAME
+                        " %s(): Unable to register resource"
+                        " 0x%.016llx-0x%.016llx - kernel bug?\n",
+                        __func__,
+                        (unsigned long long)window->rsrc.start,
+                        (unsigned long long)window->rsrc.end);
+        }
+        /* Enable writes through the rom window */
+        pci_read_config_byte(pdev, 0x6d, &byte);
+        pci_write_config_byte(pdev, 0x6d, byte | 1);
+        /* FIXME handle registers 0x80 - 0x8C the bios region locks */
+        /* For write accesses caches are useless */
+        window->virt = ioremap_nocache(window->phys, window->size);
+        if (!window->virt) {
+                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
+                        window->phys, window->size);
+                goto out;
+        }
+        /* Get the first address to look for a rom chip at */
+        map_top = window->phys;
+#if 1
+        /* The probe sequence run over the firmware hub lock
+         * registers sets them to 0x7 (no access).
+         * Probe at most the last 4MiB of the address space.
+         */
+        if (map_top < 0xffc00000)
+                map_top = 0xffc00000;
+#endif
+        /* Loop  through and look for rom chips.  Since we don't know the
+         * starting address for each chip, probe every ROM_PROBE_STEP_SIZE
+         * bytes from the starting address of the window.
+         */
+        while((map_top - 1) < 0xffffffffUL) {
+                struct cfi_private *cfi;
+                unsigned long offset;
+                int i;
+                if (!map)
+                        map = kmalloc(sizeof(*map), GFP_KERNEL);
+                if (!map) {
+                        printk(KERN_ERR MOD_NAME ": kmalloc failed");
+                        goto out;
+                }
+                memset(map, 0, sizeof(*map));
+                INIT_LIST_HEAD(&map->list);
+                map->map.name = map->map_name;
+                map->map.phys = map_top;
+                offset = map_top - window->phys;
+                map->map.virt = (void __iomem *)
+                        (((unsigned long)(window->virt)) + offset);
+                map->map.size = 0xffffffffUL - map_top + 1UL;
+                /* Set the name of the map to the address I am trying */
+                sprintf(map->map_name, "%s @%08lx",
+                        MOD_NAME, map->map.phys);
+                /* There is no generic VPP support */
+                for(map->map.bankwidth = 32; map->map.bankwidth;
+                        map->map.bankwidth >>= 1)
+                {
+                        char **probe_type;
+                        /* Skip bankwidths that are not supported */
+                        if (!map_bankwidth_supported(map->map.bankwidth))
+                                continue;
+                        /* Setup the map methods */
+                        simple_map_init(&map->map);
+                        /* Try all of the probe methods */
+                        probe_type = rom_probe_types;
+                        for(; *probe_type; probe_type++) {
+                                map->mtd = do_map_probe(*probe_type, &map->map);
+                                if (map->mtd)
+                                        goto found;
+                        }
+                }
+                map_top += ROM_PROBE_STEP_SIZE;
+                continue;
+        found:
+                /* Trim the size if we are larger than the map */
+                if (map->mtd->size > map->map.size) {
+                        printk(KERN_WARNING MOD_NAME
+                                " rom(%u) larger than window(%lu). fixing...\n",
+                                map->mtd->size, map->map.size);
+                        map->mtd->size = map->map.size;
+                }
+                if (window->rsrc.parent) {
+                        /*
+                         * Registering the MTD device in iomem may not be possible
+                         * if there is a BIOS "reserved" and BUSY range.  If this
+                         * fails then continue anyway.
+                         */
+                        map->rsrc.name  = map->map_name;
+                        map->rsrc.start = map->map.phys;
+                        map->rsrc.end   = map->map.phys + map->mtd->size - 1;
+                        map->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                        if (request_resource(&window->rsrc, &map->rsrc)) {
+                                printk(KERN_ERR MOD_NAME
+                                        ": cannot reserve MTD resource\n");
+                                map->rsrc.parent = NULL;
+                        }
+                }
+                /* Make the whole region visible in the map */
+                map->map.virt = window->virt;
+                map->map.phys = window->phys;
+                cfi = map->map.fldrv_priv;
+                for(i = 0; i < cfi->numchips; i++)
+                        cfi->chips[i].start += offset;
+                /* Now that the mtd devices is complete claim and export it */
+                map->mtd->owner = THIS_MODULE;
+                if (add_mtd_device(map->mtd)) {
+                        map_destroy(map->mtd);
+                        map->mtd = NULL;
+                        goto out;
+                }
+                /* Calculate the new value of map_top */
+                map_top += map->mtd->size;
+                /* File away the map structure */
+                list_add(&map->list, &window->maps);
+                map = NULL;
+        }
+ out:
+        /* Free any left over map structures */
+        if (map)
+                kfree(map);
+        /* See if I have any map structures */
+        if (list_empty(&window->maps)) {
+                ck804xrom_cleanup(window);
+                return -ENODEV;
+        }
+        return 0;
+}
+static void __devexit ck804xrom_remove_one (struct pci_dev *pdev)
+{
+        struct ck804xrom_window *window = &ck804xrom_window;
+        ck804xrom_cleanup(window);
+}
+static struct pci_device_id ck804xrom_pci_tbl[] = {
+        { PCI_VENDOR_ID_NVIDIA, 0x0051,
+        PCI_ANY_ID, PCI_ANY_ID, }, /* nvidia ck804 */
+        { 0, }
+};
+MODULE_DEVICE_TABLE(pci, ck804xrom_pci_tbl);
+#if 0
+static struct pci_driver ck804xrom_driver = {
+        .name =         MOD_NAME,
+        .id_table =     ck804xrom_pci_tbl,
+        .probe =        ck804xrom_init_one,
+        .remove =       ck804xrom_remove_one,
+};
+#endif
+static int __init init_ck804xrom(void)
+{
+        struct pci_dev *pdev;
+        struct pci_device_id *id;
+        int retVal;
+        pdev = NULL;
+        for(id = ck804xrom_pci_tbl; id->vendor; id++) {
+                pdev = pci_find_device(id->vendor, id->device, NULL);
+                if (pdev)
+                        break;
+        }
+        if (pdev) {
+                retVal = ck804xrom_init_one(pdev, &ck804xrom_pci_tbl[0]);
+                pci_dev_put(pdev);
+                return retVal;
+        }
+        return -ENXIO;
+#if 0
+        return pci_module_init(&ck804xrom_driver);
+#endif
+}
+static void __exit cleanup_ck804xrom(void)
+{
+        ck804xrom_remove_one(ck804xrom_window.pdev);
+}
+module_init(init_ck804xrom);
+module_exit(cleanup_ck804xrom);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Eric Biederman <ebiederman@lnxi.com>, Dave Olsen <dolsen@lnxi.com>");
+MODULE_DESCRIPTION("MTD map driver for BIOS chips on the Nvidia ck804 southbridge");
diff --git a/drivers/mtd/maps/cstm_mips_ixx.c b/drivers/mtd/maps/cstm_mips_ixx.c
deleted file mode 100644
index df2c38ef105a..000000000000
--- a/drivers/mtd/maps/cstm_mips_ixx.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * $Id: cstm_mips_ixx.c,v 1.14 2005/11/07 11:14:26 gleixner Exp $
- *
- * Mapping of a custom board with both AMD CFI and JEDEC flash in partitions.
- * Config with both CFI and JEDEC device support.
- *
- * Basically physmap.c with the addition of partitions and
- * an array of mapping info to accomodate more than one flash type per board.
- *
- * Copyright 2000 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 as published by the
- *  Free Software Foundation;  either version 2 of the  License, or (at your
- *  option) any later version.
- *
- *  THIS  SOFTWARE  IS PROVIDED   ``AS  IS'' AND   ANY  EXPRESS OR IMPLIED
- *  WARRANTIES,   INCLUDING, BUT NOT  LIMITED  TO, THE IMPLIED WARRANTIES OF
- *  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN
- *  NO  EVENT  SHALL   THE AUTHOR  BE    LIABLE FOR ANY   DIRECT, INDIRECT,
- *  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED   TO, PROCUREMENT OF  SUBSTITUTE GOODS  OR SERVICES; LOSS OF
- *  USE, DATA,  OR PROFITS; OR  BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- *  ANY THEORY OF LIABILITY, WHETHER IN  CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- *  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *  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/module.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <asm/io.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/map.h>
-#include <linux/mtd/partitions.h>
-#include <linux/delay.h>
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-#define CC_GCR             0xB4013818
-#define CC_GPBCR           0xB401380A
-#define CC_GPBDR           0xB4013808
-#define CC_M68K_DEVICE     1
-#define CC_M68K_FUNCTION   6
-#define CC_CONFADDR        0xB8004000
-#define CC_CONFDATA        0xB8004004
-#define CC_FC_FCR          0xB8002004
-#define CC_FC_DCR          0xB8002008
-#define CC_GPACR           0xB4013802
-#define CC_GPAICR          0xB4013804
-#endif /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-void cstm_mips_ixx_set_vpp(struct map_info *map,int vpp)
-{
-        static DEFINE_SPINLOCK(vpp_lock);
-        static int vpp_count = 0;
-        unsigned long flags;
-        spin_lock_irqsave(&vpp_lock, flags);
-        if (vpp) {
-                if (!vpp_count++) {
-                        __u16   data;
-                        __u8    data1;
-                        static u8 first = 1;
-                        // Set GPIO port B pin3 to high
-                        data = *(__u16 *)(CC_GPBCR);
-                        data = (data & 0xff0f) | 0x0040;
-                        *(__u16 *)CC_GPBCR = data;
-                        *(__u8 *)CC_GPBDR = (*(__u8*)CC_GPBDR) | 0x08;
-                        if (first) {
-                                first = 0;
-                                /* need to have this delay for first
-                                   enabling vpp after powerup */
-                                udelay(40);
-                        }
-                }
-        } else {
-                if (!--vpp_count) {
-                        __u16   data;
-                        // Set GPIO port B pin3 to high
-                        data = *(__u16 *)(CC_GPBCR);
-                        data = (data & 0xff3f) | 0x0040;
-                        *(__u16 *)CC_GPBCR = data;
-                        *(__u8 *)CC_GPBDR = (*(__u8*)CC_GPBDR) & 0xf7;
-                }
-        }
-        spin_unlock_irqrestore(&vpp_lock, flags);
-}
-#endif
-/* board and partition description */
-#define MAX_PHYSMAP_PARTITIONS    8
-struct cstm_mips_ixx_info {
-        char *name;
-        unsigned long window_addr;
-        unsigned long window_size;
-        int bankwidth;
-        int num_partitions;
-};
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type
-const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] =
-{
-    {   // 28F128J3A in 2x16 configuration
-        "big flash",     // name
-        0x08000000,      // window_addr
-        0x02000000,      // window_size
-        4,               // bankwidth
-        1,               // num_partitions
-    }
-};
-static struct mtd_partition cstm_mips_ixx_partitions[PHYSMAP_NUMBER][MAX_PHYSMAP_PARTITIONS] = {
-{   // 28F128J3A in 2x16 configuration
-        {
-                .name = "main partition ",
-                .size = 0x02000000, // 128 x 2 x 128k byte sectors
-                .offset = 0,
-        },
-},
-};
-#else /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-#define PHYSMAP_NUMBER  1  // number of board desc structs needed, one per contiguous flash type
-const struct cstm_mips_ixx_info cstm_mips_ixx_board_desc[PHYSMAP_NUMBER] =
-{
-    {
-        "MTD flash",                   // name
-        CONFIG_MTD_CSTM_MIPS_IXX_START,      // window_addr
-        CONFIG_MTD_CSTM_MIPS_IXX_LEN,        // window_size
-        CONFIG_MTD_CSTM_MIPS_IXX_BUSWIDTH,   // bankwidth
-        1,                             // num_partitions
-    },
-};
-static struct mtd_partition cstm_mips_ixx_partitions[PHYSMAP_NUMBER][MAX_PHYSMAP_PARTITIONS] = {
-{
-        {
-                .name = "main partition",
-                .size =  CONFIG_MTD_CSTM_MIPS_IXX_LEN,
-                .offset = 0,
-        },
-},
-};
-#endif /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-struct map_info cstm_mips_ixx_map[PHYSMAP_NUMBER];
-int __init init_cstm_mips_ixx(void)
-{
-        int i;
-        int jedec;
-        struct mtd_info *mymtd;
-        struct mtd_partition *parts;
-        /* Initialize mapping */
-        for (i=0;i<PHYSMAP_NUMBER;i++) {
-                printk(KERN_NOTICE "cstm_mips_ixx flash device: 0x%lx at 0x%lx\n",
-                       cstm_mips_ixx_board_desc[i].window_size, cstm_mips_ixx_board_desc[i].window_addr);
-                cstm_mips_ixx_map[i].phys = cstm_mips_ixx_board_desc[i].window_addr;
-                cstm_mips_ixx_map[i].virt = ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
-                if (!cstm_mips_ixx_map[i].virt) {
-                        int j = 0;
-                        printk(KERN_WARNING "Failed to ioremap\n");
-                        for (j = 0; j < i; j++) {
-                                if (cstm_mips_ixx_map[j].virt) {
-                                        iounmap(cstm_mips_ixx_map[j].virt);
-                                        cstm_mips_ixx_map[j].virt = NULL;
-                                }
-                        }
-                        return -EIO;
-                }
-                cstm_mips_ixx_map[i].name = cstm_mips_ixx_board_desc[i].name;
-                cstm_mips_ixx_map[i].size = cstm_mips_ixx_board_desc[i].window_size;
-                cstm_mips_ixx_map[i].bankwidth = cstm_mips_ixx_board_desc[i].bankwidth;
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-                cstm_mips_ixx_map[i].set_vpp = cstm_mips_ixx_set_vpp;
-#endif
-                simple_map_init(&cstm_mips_ixx_map[i]);
-                //printk(KERN_NOTICE "cstm_mips_ixx: ioremap is %x\n",(unsigned int)(cstm_mips_ixx_map[i].virt));
-        }
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-        setup_ITE_IVR_flash();
-#endif /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-        for (i=0;i<PHYSMAP_NUMBER;i++) {
-                parts = &cstm_mips_ixx_partitions[i][0];
-                jedec = 0;
-                mymtd = (struct mtd_info *)do_map_probe("cfi_probe", &cstm_mips_ixx_map[i]);
-                //printk(KERN_NOTICE "phymap %d cfi_probe: mymtd is %x\n",i,(unsigned int)mymtd);
-                if (!mymtd) {
-                        jedec = 1;
-                        mymtd = (struct mtd_info *)do_map_probe("jedec", &cstm_mips_ixx_map[i]);
-                        printk(KERN_NOTICE "cstm_mips_ixx %d jedec: mymtd is %x\n",i,(unsigned int)mymtd);
-                }
-                if (mymtd) {
-                        mymtd->owner = THIS_MODULE;
-                        cstm_mips_ixx_map[i].map_priv_2 = (unsigned long)mymtd;
-                        add_mtd_partitions(mymtd, parts, cstm_mips_ixx_board_desc[i].num_partitions);
-                }
-                else {
-                        for (i = 0; i < PHYSMAP_NUMBER; i++) {
-                                if (cstm_mips_ixx_map[i].virt) {
-                                        iounmap(cstm_mips_ixx_map[i].virt);
-                                        cstm_mips_ixx_map[i].virt = NULL;
-                                }
-                        }
-                        return -ENXIO;
-                }
-        }
-        return 0;
-}
-static void __exit cleanup_cstm_mips_ixx(void)
-{
-        int i;
-        struct mtd_info *mymtd;
-        for (i=0;i<PHYSMAP_NUMBER;i++) {
-                mymtd = (struct mtd_info *)cstm_mips_ixx_map[i].map_priv_2;
-                if (mymtd) {
-                        del_mtd_partitions(mymtd);
-                        map_destroy(mymtd);
-                }
-                if (cstm_mips_ixx_map[i].virt) {
-                        iounmap((void *)cstm_mips_ixx_map[i].virt);
-                        cstm_mips_ixx_map[i].virt = 0;
-                }
-        }
-}
-#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
-void PCISetULongByOffset(__u32 DevNumber, __u32 FuncNumber, __u32 Offset, __u32 data)
-{
-        __u32   offset;
-        offset = ( unsigned long )( 0x80000000 | ( DevNumber << 11 ) + ( FuncNumber << 8 ) + Offset) ;
-        *(__u32 *)CC_CONFADDR = offset;
-        *(__u32 *)CC_CONFDATA = data;
-}
-void setup_ITE_IVR_flash()
-{
-                __u32   size, base;
-                size = 0x0e000000;              // 32MiB
-                base = (0x08000000) >> 8 >>1; // Bug: we must shift one more bit
-                /* need to set ITE flash to 32 bits instead of default 8 */
-#ifdef CONFIG_MIPS_IVR
-                *(__u32 *)CC_FC_FCR = 0x55;
-                *(__u32 *)CC_GPACR = 0xfffc;
-#else
-                *(__u32 *)CC_FC_FCR = 0x77;
-#endif
-                /* turn bursting off */
-                *(__u32 *)CC_FC_DCR = 0x0;
-                /* setup for one chip 4 byte PCI access */
-                PCISetULongByOffset(CC_M68K_DEVICE, CC_M68K_FUNCTION, 0x60, size | base);
-                PCISetULongByOffset(CC_M68K_DEVICE, CC_M68K_FUNCTION, 0x64, 0x02);
-}
-#endif /* defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR) */
-module_init(init_cstm_mips_ixx);
-module_exit(cleanup_cstm_mips_ixx);
-MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Alice Hennessy <ahennessy@mvista.com>");
-MODULE_DESCRIPTION("MTD map driver for ITE 8172G and Globespan IVR boards");
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c
new file mode 100644
index 000000000000..a9d808a617c9
--- /dev/null
+++ b/drivers/mtd/maps/esb2rom.c
@@ -0,0 +1,450 @@
+/*
+ * esb2rom.c
+ *
+ * Normal mappings of flash chips in physical memory
+ * through the Intel ESB2 Southbridge.
+ *
+ * This was derived from ichxrom.c in May 2006 by
+ *      Lew Glendenning <lglendenning@lnxi.com>
+ *
+ * Eric Biederman, of course, was a major help in this effort.
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/version.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <asm/io.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/cfi.h>
+#include <linux/mtd/flashchip.h>
+#include <linux/pci.h>
+#include <linux/pci_ids.h>
+#include <linux/list.h>
+#define MOD_NAME KBUILD_BASENAME
+#define ADDRESS_NAME_LEN 18
+#define ROM_PROBE_STEP_SIZE (64*1024) /* 64KiB */
+#define BIOS_CNTL       0xDC
+#define BIOS_LOCK_ENABLE        0x02
+#define BIOS_WRITE_ENABLE       0x01
+/* This became a 16-bit register, and EN2 has disappeared */
+#define FWH_DEC_EN1     0xD8
+#define FWH_F8_EN       0x8000
+#define FWH_F0_EN       0x4000
+#define FWH_E8_EN       0x2000
+#define FWH_E0_EN       0x1000
+#define FWH_D8_EN       0x0800
+#define FWH_D0_EN       0x0400
+#define FWH_C8_EN       0x0200
+#define FWH_C0_EN       0x0100
+#define FWH_LEGACY_F_EN 0x0080
+#define FWH_LEGACY_E_EN 0x0040
+/* reserved  0x0020 and 0x0010 */
+#define FWH_70_EN       0x0008
+#define FWH_60_EN       0x0004
+#define FWH_50_EN       0x0002
+#define FWH_40_EN       0x0001
+/* these are 32-bit values */
+#define FWH_SEL1        0xD0
+#define FWH_SEL2        0xD4
+#define FWH_8MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN | FWH_C0_EN | \
+                         FWH_70_EN | FWH_60_EN | FWH_50_EN | FWH_40_EN)
+#define FWH_7MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN | FWH_C0_EN | \
+                         FWH_70_EN | FWH_60_EN | FWH_50_EN)
+#define FWH_6MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN | FWH_C0_EN | \
+                         FWH_70_EN | FWH_60_EN)
+#define FWH_5MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN | FWH_C0_EN | \
+                         FWH_70_EN)
+#define FWH_4MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN | FWH_C0_EN)
+#define FWH_3_5MiB      (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN | FWH_C8_EN)
+#define FWH_3MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN | FWH_D0_EN)
+#define FWH_2_5MiB      (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN | \
+                         FWH_D8_EN)
+#define FWH_2MiB        (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN | FWH_E0_EN)
+#define FWH_1_5MiB      (FWH_F8_EN | FWH_F0_EN | FWH_E8_EN)
+#define FWH_1MiB        (FWH_F8_EN | FWH_F0_EN)
+#define FWH_0_5MiB      (FWH_F8_EN)
+struct esb2rom_window {
+        void __iomem* virt;
+        unsigned long phys;
+        unsigned long size;
+        struct list_head maps;
+        struct resource rsrc;
+        struct pci_dev *pdev;
+};
+struct esb2rom_map_info {
+        struct list_head list;
+        struct map_info map;
+        struct mtd_info *mtd;
+        struct resource rsrc;
+        char map_name[sizeof(MOD_NAME) + 2 + ADDRESS_NAME_LEN];
+};
+static struct esb2rom_window esb2rom_window = {
+        .maps = LIST_HEAD_INIT(esb2rom_window.maps),
+};
+static void esb2rom_cleanup(struct esb2rom_window *window)
+{
+        struct esb2rom_map_info *map, *scratch;
+        u8 byte;
+        /* Disable writes through the rom window */
+        pci_read_config_byte(window->pdev, BIOS_CNTL, &byte);
+        pci_write_config_byte(window->pdev, BIOS_CNTL,
+                byte & ~BIOS_WRITE_ENABLE);
+        /* Free all of the mtd devices */
+        list_for_each_entry_safe(map, scratch, &window->maps, list) {
+                if (map->rsrc.parent)
+                        release_resource(&map->rsrc);
+                del_mtd_device(map->mtd);
+                map_destroy(map->mtd);
+                list_del(&map->list);
+                kfree(map);
+        }
+        if (window->rsrc.parent)
+                release_resource(&window->rsrc);
+        if (window->virt) {
+                iounmap(window->virt);
+                window->virt = NULL;
+                window->phys = 0;
+                window->size = 0;
+        }
+        pci_dev_put(window->pdev);
+}
+static int __devinit esb2rom_init_one(struct pci_dev *pdev,
+                                const struct pci_device_id *ent)
+{
+        static char *rom_probe_types[] = { "cfi_probe", "jedec_probe", NULL };
+        struct esb2rom_window *window = &esb2rom_window;
+        struct esb2rom_map_info *map = NULL;
+        unsigned long map_top;
+        u8 byte;
+        u16 word;
+        /* For now I just handle the ecb2 and I assume there
+         * are not a lot of resources up at the top of the address
+         * space.  It is possible to handle other devices in the
+         * top 16MiB but it is very painful.  Also since
+         * you can only really attach a FWH to an ICHX there
+         * a number of simplifications you can make.
+         *
+         * Also you can page firmware hubs if an 8MiB window isn't enough
+         * but don't currently handle that case either.
+         */
+        window->pdev = pci_dev_get(pdev);
+        /* RLG:  experiment 2.  Force the window registers to the widest values */
+/*
+        pci_read_config_word(pdev, FWH_DEC_EN1, &word);
+        printk(KERN_DEBUG "Original FWH_DEC_EN1 : %x\n", word);
+        pci_write_config_byte(pdev, FWH_DEC_EN1, 0xff);
+        pci_read_config_byte(pdev, FWH_DEC_EN1, &byte);
+        printk(KERN_DEBUG "New FWH_DEC_EN1 : %x\n", byte);
+        pci_read_config_byte(pdev, FWH_DEC_EN2, &byte);
+        printk(KERN_DEBUG "Original FWH_DEC_EN2 : %x\n", byte);
+        pci_write_config_byte(pdev, FWH_DEC_EN2, 0x0f);
+        pci_read_config_byte(pdev, FWH_DEC_EN2, &byte);
+        printk(KERN_DEBUG "New FWH_DEC_EN2 : %x\n", byte);
+*/
+        /* Find a region continuous to the end of the ROM window  */
+        window->phys = 0;
+        pci_read_config_word(pdev, FWH_DEC_EN1, &word);
+        printk(KERN_DEBUG "pci_read_config_byte : %x\n", word);
+        if ((word & FWH_8MiB) == FWH_8MiB)
+                window->phys = 0xff400000;
+        else if ((word & FWH_7MiB) == FWH_7MiB)
+                window->phys = 0xff500000;
+        else if ((word & FWH_6MiB) == FWH_6MiB)
+                window->phys = 0xff600000;
+        else if ((word & FWH_5MiB) == FWH_5MiB)
+                window->phys = 0xFF700000;
+        else if ((word & FWH_4MiB) == FWH_4MiB)
+                window->phys = 0xffc00000;
+        else if ((word & FWH_3_5MiB) == FWH_3_5MiB)
+                window->phys = 0xffc80000;
+        else if ((word & FWH_3MiB) == FWH_3MiB)
+                window->phys = 0xffd00000;
+        else if ((word & FWH_2_5MiB) == FWH_2_5MiB)
+                window->phys = 0xffd80000;
+        else if ((word & FWH_2MiB) == FWH_2MiB)
+                window->phys = 0xffe00000;
+        else if ((word & FWH_1_5MiB) == FWH_1_5MiB)
+                window->phys = 0xffe80000;
+        else if ((word & FWH_1MiB) == FWH_1MiB)
+                window->phys = 0xfff00000;
+        else if ((word & FWH_0_5MiB) == FWH_0_5MiB)
+                window->phys = 0xfff80000;
+        /* reserved  0x0020 and 0x0010 */
+        window->phys -= 0x400000UL;
+        window->size = (0xffffffffUL - window->phys) + 1UL;
+        /* Enable writes through the rom window */
+        pci_read_config_byte(pdev, BIOS_CNTL, &byte);
+        if (!(byte & BIOS_WRITE_ENABLE)  && (byte & (BIOS_LOCK_ENABLE))) {
+                /* The BIOS will generate an error if I enable
+                 * this device, so don't even try.
+                 */
+                printk(KERN_ERR MOD_NAME ": firmware access control, I can't enable writes\n");
+                goto out;
+        }
+        pci_write_config_byte(pdev, BIOS_CNTL, byte | BIOS_WRITE_ENABLE);
+        /*
+         * Try to reserve the window mem region.  If this fails then
+         * it is likely due to the window being "reseved" by the BIOS.
+         */
+        window->rsrc.name = MOD_NAME;
+        window->rsrc.start = window->phys;
+        window->rsrc.end   = window->phys + window->size - 1;
+        window->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+        if (request_resource(&iomem_resource, &window->rsrc)) {
+                window->rsrc.parent = NULL;
+                printk(KERN_DEBUG MOD_NAME
+                        ": %s(): Unable to register resource"
+                        " 0x%.08llx-0x%.08llx - kernel bug?\n",
+                        __func__,
+                        (unsigned long long)window->rsrc.start,
+                        (unsigned long long)window->rsrc.end);
+        }
+        /* Map the firmware hub into my address space. */
+        window->virt = ioremap_nocache(window->phys, window->size);
+        if (!window->virt) {
+                printk(KERN_ERR MOD_NAME ": ioremap(%08lx, %08lx) failed\n",
+                        window->phys, window->size);
+                goto out;
+        }
+        /* Get the first address to look for an rom chip at */
+        map_top = window->phys;
+        if ((window->phys & 0x3fffff) != 0) {
+                /* if not aligned on 4MiB, look 4MiB lower in address space */
+                map_top = window->phys + 0x400000;
+        }
+#if 1
+        /* The probe sequence run over the firmware hub lock
+         * registers sets them to 0x7 (no access).
+         * (Insane hardware design, but most copied Intel's.)
+         * ==> Probe at most the last 4M of the address space.
+         */
+        if (map_top < 0xffc00000)
+                map_top = 0xffc00000;
+#endif
+        /* Loop through and look for rom chips */
+        while ((map_top - 1) < 0xffffffffUL) {
+                struct cfi_private *cfi;
+                unsigned long offset;
+                int i;
+                if (!map)
+                        map = kmalloc(sizeof(*map), GFP_KERNEL);
+                if (!map) {
+                        printk(KERN_ERR MOD_NAME ": kmalloc failed");
+                        goto out;
+                }
+                memset(map, 0, sizeof(*map));
+                INIT_LIST_HEAD(&map->list);
+                map->map.name = map->map_name;
+                map->map.phys = map_top;
+                offset = map_top - window->phys;
+                map->map.virt = (void __iomem *)
+                        (((unsigned long)(window->virt)) + offset);
+                map->map.size = 0xffffffffUL - map_top + 1UL;
+                /* Set the name of the map to the address I am trying */
+                sprintf(map->map_name, "%s @%08lx",
+                        MOD_NAME, map->map.phys);
+                /* Firmware hubs only use vpp when being programmed
+                 * in a factory setting.  So in-place programming
+                 * needs to use a different method.
+                 */
+                for(map->map.bankwidth = 32; map->map.bankwidth;
+                        map->map.bankwidth >>= 1) {
+                        char **probe_type;
+                        /* Skip bankwidths that are not supported */
+                        if (!map_bankwidth_supported(map->map.bankwidth))
+                                continue;
+                        /* Setup the map methods */
+                        simple_map_init(&map->map);
+                        /* Try all of the probe methods */
+                        probe_type = rom_probe_types;
+                        for(; *probe_type; probe_type++) {
+                                map->mtd = do_map_probe(*probe_type, &map->map);
+                                if (map->mtd)
+                                        goto found;
+                        }
+                }
+                map_top += ROM_PROBE_STEP_SIZE;
+                continue;
+        found:
+                /* Trim the size if we are larger than the map */
+                if (map->mtd->size > map->map.size) {
+                        printk(KERN_WARNING MOD_NAME
+                                " rom(%u) larger than window(%lu). fixing...\n",
+                                map->mtd->size, map->map.size);
+                        map->mtd->size = map->map.size;
+                }
+                if (window->rsrc.parent) {
+                        /*
+                         * Registering the MTD device in iomem may not be possible
+                         * if there is a BIOS "reserved" and BUSY range.  If this
+                         * fails then continue anyway.
+                         */
+                        map->rsrc.name  = map->map_name;
+                        map->rsrc.start = map->map.phys;
+                        map->rsrc.end   = map->map.phys + map->mtd->size - 1;
+                        map->rsrc.flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+                        if (request_resource(&window->rsrc, &map->rsrc)) {
+                                printk(KERN_ERR MOD_NAME
+                                        ": cannot reserve MTD resource\n");
+                                map->rsrc.parent = NULL;
+                        }
+                }
+                /* Make the whole region visible in the map */
+                map->map.virt = window->virt;
+                map->map.phys = window->phys;
+                cfi = map->map.fldrv_priv;
+                for(i = 0; i < cfi->numchips; i++)
+                        cfi->chips[i].start += offset;
+                /* Now that the mtd devices is complete claim and export it */
+                map->mtd->owner = THIS_MODULE;
+                if (add_mtd_device(map->mtd)) {
+                        map_destroy(map->mtd);
+                        map->mtd = NULL;
+                        goto out;
+                }
+                /* Calculate the new value of map_top */
+                map_top += map->mtd->size;
+                /* File away the map structure */
+                list_add(&map->list, &window->maps);
+                map = NULL;
+        }
+ out:
+        /* Free any left over map structures */
+        kfree(map);
+        /* See if I have any map structures */
+        if (list_empty(&window->maps)) {
+                esb2rom_cleanup(window);
+                return -ENODEV;
+        }
+        return 0;
+}
+static void __devexit esb2rom_remove_one (struct pci_dev *pdev)
+{
+        struct esb2rom_window *window = &esb2rom_window;
+        esb2rom_cleanup(window);
+}
+static struct pci_device_id esb2rom_pci_tbl[] __devinitdata = {
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801BA_0,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801DB_0,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801EB_0,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,
+          PCI_ANY_ID, PCI_ANY_ID, },
+        { 0, },
+};
+#if 0
+MODULE_DEVICE_TABLE(pci, esb2rom_pci_tbl);
+static struct pci_driver esb2rom_driver = {
+        .name =         MOD_NAME,
+        .id_table =     esb2rom_pci_tbl,
+        .probe =        esb2rom_init_one,
+        .remove =       esb2rom_remove_one,
+};
+#endif
+static int __init init_esb2rom(void)
+{
+        struct pci_dev *pdev;
+        struct pci_device_id *id;
+        int retVal;
+        pdev = NULL;
+        for (id = esb2rom_pci_tbl; id->vendor; id++) {
+                printk(KERN_DEBUG "device id = %x\n", id->device);
+                pdev = pci_get_device(id->vendor, id->device, NULL);
+                if (pdev) {
+                        printk(KERN_DEBUG "matched device = %x\n", id->device);
+                        break;
+                }
+        }
+        if (pdev) {
+                printk(KERN_DEBUG "matched device id %x\n", id->device);
+                retVal = esb2rom_init_one(pdev, &esb2rom_pci_tbl[0]);
+                pci_dev_put(pdev);
+                printk(KERN_DEBUG "retVal = %d\n", retVal);
+                return retVal;
+        }
+        return -ENXIO;
+#if 0
+        return pci_register_driver(&esb2rom_driver);
+#endif
+}
+static void __exit cleanup_esb2rom(void)
+{
+        esb2rom_remove_one(esb2rom_window.pdev);
+}
+module_init(init_esb2rom);
+module_exit(cleanup_esb2rom);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Lew Glendenning <lglendenning@lnxi.com>");
+MODULE_DESCRIPTION("MTD map driver for BIOS chips on the ESB2 southbridge");
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index c8db01b3e45f..6946d802e6f6 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -75,14 +75,12 @@ static int armflash_probe(struct platform_device *dev)
        int err;
        void __iomem *base;
-        info = kmalloc(sizeof(struct armflash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct armflash_info), GFP_KERNEL);
        if (!info) {
                err = -ENOMEM;
                goto out;
        }
-        memset(info, 0, sizeof(struct armflash_info));
        info->plat = plat;
        if (plat && plat->init) {
                err = plat->init();
diff --git a/drivers/mtd/maps/nettel.c b/drivers/mtd/maps/nettel.c
index f9e8e5bcbc33..9f53c655af3a 100644
--- a/drivers/mtd/maps/nettel.c
+++ b/drivers/mtd/maps/nettel.c
@@ -20,6 +20,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/cfi.h>
 #include <linux/reboot.h>
+#include <linux/err.h>
 #include <linux/kdev_t.h>
 #include <linux/root_dev.h>
 #include <asm/io.h>
@@ -178,7 +179,7 @@ int nettel_eraseconfig(void)
        init_waitqueue_head(&wait_q);
        mtd = get_mtd_device(NULL, 2);
-        if (mtd) {
+        if (!IS_ERR(mtd)) {
                nettel_erase.mtd = mtd;
                nettel_erase.callback = nettel_erasecallback;
                nettel_erase.callback = NULL;
@@ -471,7 +472,7 @@ out_unmap2:
        iounmap(nettel_amd_map.virt);
        return(rc);
-                
 }
 /****************************************************************************/
diff --git a/drivers/mtd/maps/omap_nor.c b/drivers/mtd/maps/omap_nor.c
index 418afffb2d80..e8d9ae535673 100644
--- a/drivers/mtd/maps/omap_nor.c
+++ b/drivers/mtd/maps/omap_nor.c
@@ -78,12 +78,10 @@ static int __devinit omapflash_probe(struct platform_device *pdev)
        struct resource *res = pdev->resource;
        unsigned long size = res->end - res->start + 1;
-        info = kmalloc(sizeof(struct omapflash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct omapflash_info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-        memset(info, 0, sizeof(struct omapflash_info));
        if (!request_mem_region(res->start, size, "flash")) {
                err = -EBUSY;
                goto out_free_info;
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c
index 995347b1beba..eaeb56a4070a 100644
--- a/drivers/mtd/maps/pcmciamtd.c
+++ b/drivers/mtd/maps/pcmciamtd.c
@@ -735,11 +735,10 @@ static int pcmciamtd_probe(struct pcmcia_device *link)
        struct pcmciamtd_dev *dev;
        /* Create new memory card device */
-        dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev) return -ENOMEM;
        DEBUG(1, "dev=0x%p", dev);
-        memset(dev, 0, sizeof(*dev));
        dev->p_dev = link;
        link->priv = dev;
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index d1717763f719..28c5ffd75233 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -89,15 +89,14 @@ static int physmap_flash_probe(struct platform_device *dev)
                return -ENODEV;
        printk(KERN_NOTICE "physmap platform flash device: %.8llx at %.8llx\n",
-            (unsigned long long)dev->resource->end - dev->resource->start + 1,
+            (unsigned long long)(dev->resource->end - dev->resource->start + 1),
            (unsigned long long)dev->resource->start);
-        info = kmalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
        if (info == NULL) {
                err = -ENOMEM;
                goto err_out;
        }
-        memset(info, 0, sizeof(*info));
        platform_set_drvdata(dev, info);
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
new file mode 100644
index 000000000000..7efe744ad31e
--- /dev/null
+++ b/drivers/mtd/maps/physmap_of.c
@@ -0,0 +1,255 @@
+/*
+ * Normal mappings of chips in physical memory for OF devices
+ *
+ * Copyright (C) 2006 MontaVista Software Inc.
+ * Author: Vitaly Wool <vwool@ru.mvista.com>
+ *
+ * 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.
+ */
+#include <linux/module.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+struct physmap_flash_info {
+        struct mtd_info         *mtd;
+        struct map_info         map;
+        struct resource         *res;
+#ifdef CONFIG_MTD_PARTITIONS
+        int                     nr_parts;
+        struct mtd_partition    *parts;
+#endif
+};
+static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
+#ifdef CONFIG_MTD_PARTITIONS
+static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL };
+#endif
+#ifdef CONFIG_MTD_PARTITIONS
+static int parse_flash_partitions(struct device_node *node,
+                struct mtd_partition **parts)
+{
+        int i, plen, retval = -ENOMEM;
+        const  u32  *part;
+        const  char *name;
+        part = get_property(node, "partitions", &plen);
+        if (part == NULL)
+                goto err;
+        retval = plen / (2 * sizeof(u32));
+        *parts = kzalloc(retval * sizeof(struct mtd_partition), GFP_KERNEL);
+        if (*parts == NULL) {
+                printk(KERN_ERR "Can't allocate the flash partition data!\n");
+                goto err;
+        }
+        name = get_property(node, "partition-names", &plen);
+        for (i = 0; i < retval; i++) {
+                (*parts)[i].offset = *part++;
+                (*parts)[i].size   = *part & ~1;
+                if (*part++ & 1) /* bit 0 set signifies read only partition */
+                        (*parts)[i].mask_flags = MTD_WRITEABLE;
+                if (name != NULL && plen > 0) {
+                        int len = strlen(name) + 1;
+                        (*parts)[i].name = (char *)name;
+                        plen -= len;
+                        name += len;
+                } else
+                        (*parts)[i].name = "unnamed";
+        }
+err:
+        return retval;
+}
+#endif
+static int of_physmap_remove(struct of_device *dev)
+{
+        struct physmap_flash_info *info;
+        info = dev_get_drvdata(&dev->dev);
+        if (info == NULL)
+                return 0;
+        dev_set_drvdata(&dev->dev, NULL);
+        if (info->mtd != NULL) {
+#ifdef CONFIG_MTD_PARTITIONS
+                if (info->nr_parts) {
+                        del_mtd_partitions(info->mtd);
+                        kfree(info->parts);
+                } else {
+                        del_mtd_device(info->mtd);
+                }
+#else
+                del_mtd_device(info->mtd);
+#endif
+                map_destroy(info->mtd);
+        }
+        if (info->map.virt != NULL)
+                iounmap(info->map.virt);
+        if (info->res != NULL) {
+                release_resource(info->res);
+                kfree(info->res);
+        }
+        return 0;
+}
+static int __devinit of_physmap_probe(struct of_device *dev, const struct of_device_id *match)
+{
+        struct device_node *dp = dev->node;
+        struct resource res;
+        struct physmap_flash_info *info;
+        const char **probe_type;
+        const char *of_probe;
+        const u32 *width;
+        int err;
+        if (of_address_to_resource(dp, 0, &res)) {
+                dev_err(&dev->dev, "Can't get the flash mapping!\n");
+                err = -EINVAL;
+                goto err_out;
+        }
+        dev_dbg(&dev->dev, "physmap flash device: %.8llx at %.8llx\n",
+            (unsigned long long)res.end - res.start + 1,
+            (unsigned long long)res.start);
+        info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+        if (info == NULL) {
+                err = -ENOMEM;
+                goto err_out;
+        }
+        memset(info, 0, sizeof(*info));
+        dev_set_drvdata(&dev->dev, info);
+        info->res = request_mem_region(res.start, res.end - res.start + 1,
+                        dev->dev.bus_id);
+        if (info->res == NULL) {
+                dev_err(&dev->dev, "Could not reserve memory region\n");
+                err = -ENOMEM;
+                goto err_out;
+        }
+        width = get_property(dp, "bank-width", NULL);
+        if (width == NULL) {
+                dev_err(&dev->dev, "Can't get the flash bank width!\n");
+                err = -EINVAL;
+                goto err_out;
+        }
+        info->map.name = dev->dev.bus_id;
+        info->map.phys = res.start;
+        info->map.size = res.end - res.start + 1;
+        info->map.bankwidth = *width;
+        info->map.virt = ioremap(info->map.phys, info->map.size);
+        if (info->map.virt == NULL) {
+                dev_err(&dev->dev, "Failed to ioremap flash region\n");
+                err = EIO;
+                goto err_out;
+        }
+        simple_map_init(&info->map);
+        of_probe = get_property(dp, "probe-type", NULL);
+        if (of_probe == NULL) {
+                probe_type = rom_probe_types;
+                for (; info->mtd == NULL && *probe_type != NULL; probe_type++)
+                        info->mtd = do_map_probe(*probe_type, &info->map);
+        } else if (!strcmp(of_probe, "CFI"))
+                info->mtd = do_map_probe("cfi_probe", &info->map);
+        else if (!strcmp(of_probe, "JEDEC"))
+                info->mtd = do_map_probe("jedec_probe", &info->map);
+        else {
+                if (strcmp(of_probe, "ROM"))
+                        dev_dbg(&dev->dev, "map_probe: don't know probe type "
+                        "'%s', mapping as rom\n");
+                info->mtd = do_map_probe("mtd_rom", &info->map);
+        }
+        if (info->mtd == NULL) {
+                dev_err(&dev->dev, "map_probe failed\n");
+                err = -ENXIO;
+                goto err_out;
+        }
+        info->mtd->owner = THIS_MODULE;
+#ifdef CONFIG_MTD_PARTITIONS
+        err = parse_mtd_partitions(info->mtd, part_probe_types, &info->parts, 0);
+        if (err > 0) {
+                add_mtd_partitions(info->mtd, info->parts, err);
+        } else if ((err = parse_flash_partitions(dp, &info->parts)) > 0) {
+                dev_info(&dev->dev, "Using OF partition information\n");
+                add_mtd_partitions(info->mtd, info->parts, err);
+                info->nr_parts = err;
+        } else
+#endif
+        add_mtd_device(info->mtd);
+        return 0;
+err_out:
+        of_physmap_remove(dev);
+        return err;
+        return 0;
+}
+static struct of_device_id of_physmap_match[] = {
+        {
+                .type           = "rom",
+                .compatible     = "direct-mapped"
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, of_physmap_match);
+static struct of_platform_driver of_physmap_flash_driver = {
+        .name           = "physmap-flash",
+        .match_table    = of_physmap_match,
+        .probe          = of_physmap_probe,
+        .remove         = of_physmap_remove,
+};
+static int __init of_physmap_init(void)
+{
+        return of_register_platform_driver(&of_physmap_flash_driver);
+}
+static void __exit of_physmap_exit(void)
+{
+        of_unregister_platform_driver(&of_physmap_flash_driver);
+}
+module_init(of_physmap_init);
+module_exit(of_physmap_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Vitaly Wool <vwool@ru.mvista.com>");
+MODULE_DESCRIPTION("Configurable MTD map driver for OF");
diff --git a/drivers/mtd/maps/plat-ram.c b/drivers/mtd/maps/plat-ram.c
index 5d3c75451ca2..2b6504ecbbd1 100644
--- a/drivers/mtd/maps/plat-ram.c
+++ b/drivers/mtd/maps/plat-ram.c
@@ -147,14 +147,13 @@ static int platram_probe(struct platform_device *pdev)
        pdata = pdev->dev.platform_data;
-        info = kmalloc(sizeof(*info), GFP_KERNEL);
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (info == NULL) {
                dev_err(&pdev->dev, "no memory for flash info\n");
                err = -ENOMEM;
                goto exit_error;
        }
-        memset(info, 0, sizeof(*info));
        platform_set_drvdata(pdev, info);
        info->dev = &pdev->dev;
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 950bf1c57841..f904e6bd02e0 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -273,14 +273,12 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
        /*
         * Allocate the map_info structs in one go.
         */
-        info = kmalloc(size, GFP_KERNEL);
+        info = kzalloc(size, GFP_KERNEL);
        if (!info) {
                ret = -ENOMEM;
                goto out;
        }
-        memset(info, 0, size);
        if (plat->init) {
                ret = plat->init();
                if (ret)
diff --git a/drivers/mtd/maps/tqm834x.c b/drivers/mtd/maps/tqm834x.c
index 58e5912bd381..9adc970e55e6 100644
--- a/drivers/mtd/maps/tqm834x.c
+++ b/drivers/mtd/maps/tqm834x.c
@@ -132,20 +132,16 @@ static int __init init_tqm834x_mtd(void)
                pr_debug("%s: chip probing count %d\n", __FUNCTION__, idx);
-                map_banks[idx] =
+                map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL);
-                        (struct map_info *)kmalloc(sizeof(struct map_info),
-                                                   GFP_KERNEL);
                if (map_banks[idx] == NULL) {
                        ret = -ENOMEM;
                        goto error_mem;
                }
-                memset((void *)map_banks[idx], 0, sizeof(struct map_info));
+                map_banks[idx]->name = kzalloc(16, GFP_KERNEL);
-                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
                if (map_banks[idx]->name == NULL) {
                        ret = -ENOMEM;
                        goto error_mem;
                }
-                memset((void *)map_banks[idx]->name, 0, 16);
                sprintf(map_banks[idx]->name, "TQM834x-%d", idx);
                map_banks[idx]->size = flash_size;
diff --git a/drivers/mtd/maps/tqm8xxl.c b/drivers/mtd/maps/tqm8xxl.c
index 19578ba84ee8..37e4ded9b600 100644
--- a/drivers/mtd/maps/tqm8xxl.c
+++ b/drivers/mtd/maps/tqm8xxl.c
@@ -134,14 +134,13 @@ int __init init_tqm_mtd(void)
                printk(KERN_INFO "%s: chip probing count %d\n", __FUNCTION__, idx);
-                map_banks[idx] = (struct map_info *)kmalloc(sizeof(struct map_info), GFP_KERNEL);
+                map_banks[idx] = kzalloc(sizeof(struct map_info), GFP_KERNEL);
                if(map_banks[idx] == NULL) {
                        ret = -ENOMEM;
                        /* FIXME: What if some MTD devices were probed already? */
                        goto error_mem;
                }
-                memset((void *)map_banks[idx], 0, sizeof(struct map_info));
                map_banks[idx]->name = (char *)kmalloc(16, GFP_KERNEL);
                if (!map_banks[idx]->name) {
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 178b53b56be9..b879a66daa9e 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -42,19 +42,20 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,
        unsigned long block, nsect;
        char *buf;
-        block = req->sector;
+        block = req->sector << 9 >> tr->blkshift;
-        nsect = req->current_nr_sectors;
+        nsect = req->current_nr_sectors << 9 >> tr->blkshift;
        buf = req->buffer;
        if (!blk_fs_request(req))
                return 0;
-        if (block + nsect > get_capacity(req->rq_disk))
+        if (req->sector + req->current_nr_sectors > get_capacity(req->rq_disk))
                return 0;
        switch(rq_data_dir(req)) {
        case READ:
-                for (; nsect > 0; nsect--, block++, buf += 512)
+                for (; nsect > 0; nsect--, block++, buf += tr->blksize)
                        if (tr->readsect(dev, block, buf))
                                return 0;
                return 1;
@@ -63,7 +64,7 @@ static int do_blktrans_request(struct mtd_blktrans_ops *tr,
                if (!tr->writesect)
                        return 0;
-                for (; nsect > 0; nsect--, block++, buf += 512)
+                for (; nsect > 0; nsect--, block++, buf += tr->blksize)
                        if (tr->writesect(dev, block, buf))
                                return 0;
                return 1;
@@ -297,7 +298,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
        /* 2.5 has capacity in units of 512 bytes while still
           having BLOCK_SIZE_BITS set to 10. Just to keep us amused. */
-        set_capacity(gd, (new->size * new->blksize) >> 9);
+        set_capacity(gd, (new->size * tr->blksize) >> 9);
        gd->private_data = new;
        new->blkcore_priv = gd;
@@ -372,12 +373,10 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
        if (!blktrans_notifier.list.next)
                register_mtd_user(&blktrans_notifier);
-        tr->blkcore_priv = kmalloc(sizeof(*tr->blkcore_priv), GFP_KERNEL);
+        tr->blkcore_priv = kzalloc(sizeof(*tr->blkcore_priv), GFP_KERNEL);
        if (!tr->blkcore_priv)
                return -ENOMEM;
-        memset(tr->blkcore_priv, 0, sizeof(*tr->blkcore_priv));
        mutex_lock(&mtd_table_mutex);
        ret = register_blkdev(tr->major, tr->name);
@@ -401,6 +400,8 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
        }
        tr->blkcore_priv->rq->queuedata = tr;
+        blk_queue_hardsect_size(tr->blkcore_priv->rq, tr->blksize);
+        tr->blkshift = ffs(tr->blksize) - 1;
        ret = kernel_thread(mtd_blktrans_thread, tr, CLONE_KERNEL);
        if (ret < 0) {
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c
index 04ed34694b14..952da30b1745 100644
--- a/drivers/mtd/mtdblock.c
+++ b/drivers/mtd/mtdblock.c
@@ -278,11 +278,10 @@ static int mtdblock_open(struct mtd_blktrans_dev *mbd)
        }
        /* OK, it's not open. Create cache info for it */
-        mtdblk = kmalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
+        mtdblk = kzalloc(sizeof(struct mtdblk_dev), GFP_KERNEL);
        if (!mtdblk)
                return -ENOMEM;
-        memset(mtdblk, 0, sizeof(*mtdblk));
        mtdblk->count = 1;
        mtdblk->mtd = mtd;
@@ -339,16 +338,14 @@ static int mtdblock_flush(struct mtd_blktrans_dev *dev)
 static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
-        struct mtd_blktrans_dev *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        struct mtd_blktrans_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)
                return;
-        memset(dev, 0, sizeof(*dev));
        dev->mtd = mtd;
        dev->devnum = mtd->index;
-        dev->blksize = 512;
        dev->size = mtd->size >> 9;
        dev->tr = tr;
@@ -368,6 +365,7 @@ static struct mtd_blktrans_ops mtdblock_tr = {
        .name           = "mtdblock",
        .major          = 31,
        .part_bits      = 0,
+        .blksize        = 512,
        .open           = mtdblock_open,
        .flush          = mtdblock_flush,
        .release        = mtdblock_release,
diff --git a/drivers/mtd/mtdblock_ro.c b/drivers/mtd/mtdblock_ro.c
index 29563ed258a4..f79dbb49b1a2 100644
--- a/drivers/mtd/mtdblock_ro.c
+++ b/drivers/mtd/mtdblock_ro.c
@@ -33,16 +33,14 @@ static int mtdblock_writesect(struct mtd_blktrans_dev *dev,
 static void mtdblock_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
 {
-        struct mtd_blktrans_dev *dev = kmalloc(sizeof(*dev), GFP_KERNEL);
+        struct mtd_blktrans_dev *dev = kzalloc(sizeof(*dev), GFP_KERNEL);
        if (!dev)
                return;
-        memset(dev, 0, sizeof(*dev));
        dev->mtd = mtd;
        dev->devnum = mtd->index;
-        dev->blksize = 512;
        dev->size = mtd->size >> 9;
        dev->tr = tr;
        dev->readonly = 1;
@@ -60,6 +58,7 @@ static struct mtd_blktrans_ops mtdblock_tr = {
        .name           = "mtdblock",
        .major          = 31,
        .part_bits      = 0,
+        .blksize        = 512,
        .readsect       = mtdblock_readsect,
        .writesect      = mtdblock_writesect,
        .add_mtd        = mtdblock_add_mtd,
diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 5b6acfcb2b88..3013d0883b97 100644
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -7,6 +7,7 @@
 #include <linux/device.h>
 #include <linux/fs.h>
+#include <linux/err.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
@@ -100,8 +101,8 @@ static int mtd_open(struct inode *inode, struct file *file)
        mtd = get_mtd_device(NULL, devnum);
-        if (!mtd)
+        if (IS_ERR(mtd))
-                return -ENODEV;
+                return PTR_ERR(mtd);
        if (MTD_ABSENT == mtd->type) {
                put_mtd_device(mtd);
@@ -431,7 +432,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                if(!(file->f_mode & 2))
                        return -EPERM;
-                erase=kmalloc(sizeof(struct erase_info),GFP_KERNEL);
+                erase=kzalloc(sizeof(struct erase_info),GFP_KERNEL);
                if (!erase)
                        ret = -ENOMEM;
                else {
@@ -440,7 +441,6 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                        init_waitqueue_head(&waitq);
-                        memset (erase,0,sizeof(struct erase_info));
                        if (copy_from_user(&erase->addr, argp,
                                    sizeof(struct erase_info_user))) {
                                kfree(erase);
@@ -499,13 +499,12 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                if (ret)
                        return ret;
-                ops.len = buf.length;
                ops.ooblen = buf.length;
                ops.ooboffs = buf.start & (mtd->oobsize - 1);
                ops.datbuf = NULL;
                ops.mode = MTD_OOB_PLACE;
-                if (ops.ooboffs && ops.len > (mtd->oobsize - ops.ooboffs))
+                if (ops.ooboffs && ops.ooblen > (mtd->oobsize - ops.ooboffs))
                        return -EINVAL;
                ops.oobbuf = kmalloc(buf.length, GFP_KERNEL);
@@ -520,7 +519,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                buf.start &= ~(mtd->oobsize - 1);
                ret = mtd->write_oob(mtd, buf.start, &ops);
-                if (copy_to_user(argp + sizeof(uint32_t), &ops.retlen,
+                if (copy_to_user(argp + sizeof(uint32_t), &ops.oobretlen,
                                 sizeof(uint32_t)))
                        ret = -EFAULT;
@@ -548,7 +547,6 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                if (ret)
                        return ret;
-                ops.len = buf.length;
                ops.ooblen = buf.length;
                ops.ooboffs = buf.start & (mtd->oobsize - 1);
                ops.datbuf = NULL;
@@ -564,10 +562,10 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                buf.start &= ~(mtd->oobsize - 1);
                ret = mtd->read_oob(mtd, buf.start, &ops);
-                if (put_user(ops.retlen, (uint32_t __user *)argp))
+                if (put_user(ops.oobretlen, (uint32_t __user *)argp))
                        ret = -EFAULT;
-                else if (ops.retlen && copy_to_user(buf.ptr, ops.oobbuf,
+                else if (ops.oobretlen && copy_to_user(buf.ptr, ops.oobbuf,
-                                                    ops.retlen))
+                                                    ops.oobretlen))
                        ret = -EFAULT;
                kfree(ops.oobbuf);
@@ -616,6 +614,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                memcpy(&oi.eccpos, mtd->ecclayout->eccpos, sizeof(oi.eccpos));
                memcpy(&oi.oobfree, mtd->ecclayout->oobfree,
                       sizeof(oi.oobfree));
+                oi.eccbytes = mtd->ecclayout->eccbytes;
                if (copy_to_user(argp, &oi, sizeof(struct nand_oobinfo)))
                        return -EFAULT;
@@ -715,7 +714,7 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
                if (!mtd->ecclayout)
                        return -EOPNOTSUPP;
-                if (copy_to_user(argp, &mtd->ecclayout,
+                if (copy_to_user(argp, mtd->ecclayout,
                                 sizeof(struct nand_ecclayout)))
                        return -EFAULT;
                break;
diff --git a/drivers/mtd/mtdconcat.c b/drivers/mtd/mtdconcat.c
index 1fea631b5852..06902683bc2a 100644
--- a/drivers/mtd/mtdconcat.c
+++ b/drivers/mtd/mtdconcat.c
@@ -247,7 +247,7 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)
        struct mtd_oob_ops devops = *ops;
        int i, err, ret = 0;
-        ops->retlen = 0;
+        ops->retlen = ops->oobretlen = 0;
        for (i = 0; i < concat->num_subdev; i++) {
                struct mtd_info *subdev = concat->subdev[i];
@@ -263,6 +263,7 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)
                err = subdev->read_oob(subdev, from, &devops);
                ops->retlen += devops.retlen;
+                ops->oobretlen += devops.oobretlen;
                /* Save information about bitflips! */
                if (unlikely(err)) {
@@ -278,14 +279,18 @@ concat_read_oob(struct mtd_info *mtd, loff_t from, struct mtd_oob_ops *ops)
                                return err;
                }
-                devops.len = ops->len - ops->retlen;
+                if (devops.datbuf) {
-                if (!devops.len)
+                        devops.len = ops->len - ops->retlen;
-                        return ret;
+                        if (!devops.len)
+                                return ret;
-                if (devops.datbuf)
                        devops.datbuf += devops.retlen;
-                if (devops.oobbuf)
+                }
-                        devops.oobbuf += devops.ooblen;
+                if (devops.oobbuf) {
+                        devops.ooblen = ops->ooblen - ops->oobretlen;
+                        if (!devops.ooblen)
+                                return ret;
+                        devops.oobbuf += ops->oobretlen;
+                }
                from = 0;
        }
@@ -321,14 +326,18 @@ concat_write_oob(struct mtd_info *mtd, loff_t to, struct mtd_oob_ops *ops)
                if (err)
                        return err;
-                devops.len = ops->len - ops->retlen;
+                if (devops.datbuf) {
-                if (!devops.len)
+                        devops.len = ops->len - ops->retlen;
-                        return 0;
+                        if (!devops.len)
+                                return 0;
-                if (devops.datbuf)
                        devops.datbuf += devops.retlen;
-                if (devops.oobbuf)
+                }
-                        devops.oobbuf += devops.ooblen;
+                if (devops.oobbuf) {
+                        devops.ooblen = ops->ooblen - ops->oobretlen;
+                        if (!devops.ooblen)
+                                return 0;
+                        devops.oobbuf += devops.oobretlen;
+                }
                to = 0;
        }
        return -EINVAL;
@@ -699,14 +708,13 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
        /* allocate the device structure */
        size = SIZEOF_STRUCT_MTD_CONCAT(num_devs);
-        concat = kmalloc(size, GFP_KERNEL);
+        concat = kzalloc(size, GFP_KERNEL);
        if (!concat) {
                printk
                    ("memory allocation error while creating concatenated device \"%s\"\n",
                     name);
                return NULL;
        }
-        memset(concat, 0, size);
        concat->subdev = (struct mtd_info **) (concat + 1);
        /*
@@ -764,6 +772,7 @@ struct mtd_info *mtd_concat_create(struct mtd_info *subdev[],	/* subdevices to c
                concat->mtd.ecc_stats.badblocks +=
                        subdev[i]->ecc_stats.badblocks;
                if (concat->mtd.writesize   !=  subdev[i]->writesize ||
+                    concat->mtd.subpage_sft != subdev[i]->subpage_sft ||
                    concat->mtd.oobsize    !=  subdev[i]->oobsize ||
                    concat->mtd.ecctype    !=  subdev[i]->ecctype ||
                    concat->mtd.eccsize    !=  subdev[i]->eccsize ||
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c4d26de74349..7070110aba2a 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -15,6 +15,7 @@
 #include <linux/timer.h>
 #include <linux/major.h>
 #include <linux/fs.h>
+#include <linux/err.h>
 #include <linux/ioctl.h>
 #include <linux/init.h>
 #include <linux/mtd/compatmac.h>
@@ -192,14 +193,14 @@ int unregister_mtd_user (struct mtd_notifier *old)
 *      Given a number and NULL address, return the num'th entry in the device
 *      table, if any.  Given an address and num == -1, search the device table
 *      for a device with that address and return if it's still present. Given
- *      both, return the num'th driver only if its address matches. Return NULL
+ *      both, return the num'th driver only if its address matches. Return
- *      if not.
+ *      error code if not.
 */
 struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
 {
        struct mtd_info *ret = NULL;
-        int i;
+        int i, err = -ENODEV;
        mutex_lock(&mtd_table_mutex);
@@ -213,14 +214,73 @@ struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num)
                        ret = NULL;
        }
-        if (ret && !try_module_get(ret->owner))
+        if (!ret)
-                ret = NULL;
+                goto out_unlock;
+        if (!try_module_get(ret->owner))
+                goto out_unlock;
-        if (ret)
+        if (ret->get_device) {
-                ret->usecount++;
+                err = ret->get_device(ret);
+                if (err)
+                        goto out_put;
+        }
+        ret->usecount++;
        mutex_unlock(&mtd_table_mutex);
        return ret;
+out_put:
+        module_put(ret->owner);
+out_unlock:
+        mutex_unlock(&mtd_table_mutex);
+        return ERR_PTR(err);
+}
+/**
+ *      get_mtd_device_nm - obtain a validated handle for an MTD device by
+ *      device name
+ *      @name: MTD device name to open
+ *
+ *      This function returns MTD device description structure in case of
+ *      success and an error code in case of failure.
+ */
+struct mtd_info *get_mtd_device_nm(const char *name)
+{
+        int i, err = -ENODEV;
+        struct mtd_info *mtd = NULL;
+        mutex_lock(&mtd_table_mutex);
+        for (i = 0; i < MAX_MTD_DEVICES; i++) {
+                if (mtd_table[i] && !strcmp(name, mtd_table[i]->name)) {
+                        mtd = mtd_table[i];
+                        break;
+                }
+        }
+        if (!mtd)
+                goto out_unlock;
+        if (!try_module_get(mtd->owner))
+                goto out_unlock;
+        if (mtd->get_device) {
+                err = mtd->get_device(mtd);
+                if (err)
+                        goto out_put;
+        }
+        mtd->usecount++;
+        mutex_unlock(&mtd_table_mutex);
+        return mtd;
+out_put:
+        module_put(mtd->owner);
+out_unlock:
+        mutex_unlock(&mtd_table_mutex);
+        return ERR_PTR(err);
 }
 void put_mtd_device(struct mtd_info *mtd)
@@ -229,6 +289,8 @@ void put_mtd_device(struct mtd_info *mtd)
        mutex_lock(&mtd_table_mutex);
        c = --mtd->usecount;
+        if (mtd->put_device)
+                mtd->put_device(mtd);
        mutex_unlock(&mtd_table_mutex);
        BUG_ON(c < 0);
@@ -236,7 +298,7 @@ void put_mtd_device(struct mtd_info *mtd)
 }
 /* default_mtd_writev - default mtd writev method for MTD devices that
- *                      dont implement their own
+ *                      don't implement their own
 */
 int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
@@ -264,13 +326,14 @@ int default_mtd_writev(struct mtd_info *mtd, const struct kvec *vecs,
        return ret;
 }
-EXPORT_SYMBOL(add_mtd_device);
+EXPORT_SYMBOL_GPL(add_mtd_device);
-EXPORT_SYMBOL(del_mtd_device);
+EXPORT_SYMBOL_GPL(del_mtd_device);
-EXPORT_SYMBOL(get_mtd_device);
+EXPORT_SYMBOL_GPL(get_mtd_device);
-EXPORT_SYMBOL(put_mtd_device);
+EXPORT_SYMBOL_GPL(get_mtd_device_nm);
-EXPORT_SYMBOL(register_mtd_user);
+EXPORT_SYMBOL_GPL(put_mtd_device);
-EXPORT_SYMBOL(unregister_mtd_user);
+EXPORT_SYMBOL_GPL(register_mtd_user);
-EXPORT_SYMBOL(default_mtd_writev);
+EXPORT_SYMBOL_GPL(unregister_mtd_user);
+EXPORT_SYMBOL_GPL(default_mtd_writev);
 #ifdef CONFIG_PROC_FS
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index 06a930372b7a..bafd2fba87bd 100644
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -94,7 +94,7 @@ static int part_read_oob(struct mtd_info *mtd, loff_t from,
        if (from >= mtd->size)
                return -EINVAL;
-        if (from + ops->len > mtd->size)
+        if (ops->datbuf && from + ops->len > mtd->size)
                return -EINVAL;
        res = part->master->read_oob(part->master, from + part->offset, ops);
@@ -161,7 +161,7 @@ static int part_write_oob(struct mtd_info *mtd, loff_t to,
        if (to >= mtd->size)
                return -EINVAL;
-        if (to + ops->len > mtd->size)
+        if (ops->datbuf && to + ops->len > mtd->size)
                return -EINVAL;
        return part->master->write_oob(part->master, to + part->offset, ops);
 }
@@ -323,14 +323,13 @@ int add_mtd_partitions(struct mtd_info *master,
        for (i = 0; i < nbparts; i++) {
                /* allocate the partition structure */
-                slave = kmalloc (sizeof(*slave), GFP_KERNEL);
+                slave = kzalloc (sizeof(*slave), GFP_KERNEL);
                if (!slave) {
                        printk ("memory allocation error while creating partitions for \"%s\"\n",
                                master->name);
                        del_mtd_partitions(master);
                        return -ENOMEM;
                }
-                memset(slave, 0, sizeof(*slave));
                list_add(&slave->list, &mtd_partitions);
                /* set up the MTD object for this partition */
@@ -341,6 +340,7 @@ int add_mtd_partitions(struct mtd_info *master,
                slave->mtd.oobsize = master->oobsize;
                slave->mtd.ecctype = master->ecctype;
                slave->mtd.eccsize = master->eccsize;
+                slave->mtd.subpage_sft = master->subpage_sft;
                slave->mtd.name = parts[i].name;
                slave->mtd.bank_size = master->bank_size;
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 1831340e5f51..358f55a82dbe 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -90,6 +90,7 @@ config MTD_NAND_RTC_FROM4
        depends on MTD_NAND && SH_SOLUTION_ENGINE
        select REED_SOLOMON
        select REED_SOLOMON_DEC8
+        select BITREVERSE
        help
          This enables the driver for the Renesas Technology AG-AND
          flash interface board (FROM_BOARD4)
@@ -132,6 +133,7 @@ config MTD_NAND_S3C2410_HWECC
 config MTD_NAND_NDFC
        tristate "NDFC NanD Flash Controller"
        depends on MTD_NAND && 44x
+        select MTD_NAND_ECC_SMC
        help
         NDFC Nand Flash Controllers are integrated in EP44x SoCs
@@ -219,6 +221,13 @@ config MTD_NAND_SHARPSL
        tristate "Support for NAND Flash on Sharp SL Series (C7xx + others)"
        depends on MTD_NAND && ARCH_PXA
+config MTD_NAND_CAFE
+       tristate "NAND support for OLPC CAFÉ chip"
+       depends on PCI
+       help
+         Use NAND flash attached to the CAFÉ chip designed for the $100
+         laptop.
 config MTD_NAND_CS553X
        tristate "NAND support for CS5535/CS5536 (AMD Geode companion chip)"
        depends on MTD_NAND && X86_32 && (X86_PC || X86_GENERICARCH)
@@ -232,6 +241,13 @@ config MTD_NAND_CS553X
          If you say "m", the module will be called "cs553x_nand.ko".
+config MTD_NAND_AT91
+        bool "Support for NAND Flash / SmartMedia on AT91"
+        depends on MTD_NAND && ARCH_AT91
+        help
+          Enables support for NAND Flash / Smart Media Card interface
+          on Atmel AT91 processors.
 config MTD_NAND_NANDSIM
        tristate "Support for NAND Flash Simulator"
        depends on MTD_NAND && MTD_PARTITIONS
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index f74759351c91..f7a53f0b7017 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -6,6 +6,7 @@
 obj-$(CONFIG_MTD_NAND)                  += nand.o nand_ecc.o
 obj-$(CONFIG_MTD_NAND_IDS)              += nand_ids.o
+obj-$(CONFIG_MTD_NAND_CAFE)             += cafe_nand.o
 obj-$(CONFIG_MTD_NAND_SPIA)             += spia.o
 obj-$(CONFIG_MTD_NAND_AMS_DELTA)        += ams-delta.o
 obj-$(CONFIG_MTD_NAND_TOTO)             += toto.o
@@ -22,5 +23,7 @@ obj-$(CONFIG_MTD_NAND_TS7250)		+= ts7250.o
 obj-$(CONFIG_MTD_NAND_NANDSIM)          += nandsim.o
 obj-$(CONFIG_MTD_NAND_CS553X)           += cs553x_nand.o
 obj-$(CONFIG_MTD_NAND_NDFC)             += ndfc.o
+obj-$(CONFIG_MTD_NAND_AT91)             += at91_nand.o
-nand-objs = nand_base.o nand_bbt.o
+nand-objs := nand_base.o nand_bbt.o
+cafe_nand-objs := cafe.o cafe_ecc.o
diff --git a/drivers/mtd/nand/at91_nand.c b/drivers/mtd/nand/at91_nand.c
new file mode 100644
index 000000000000..14b80cc90a7b
--- /dev/null
+++ b/drivers/mtd/nand/at91_nand.c
@@ -0,0 +1,223 @@
+/*
+ * drivers/mtd/nand/at91_nand.c
+ *
+ *  Copyright (C) 2003 Rick Bronson
+ *
+ *  Derived from drivers/mtd/nand/autcpu12.c
+ *       Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
+ *
+ *  Derived from drivers/mtd/spia.c
+ *       Copyright (C) 2000 Steven J. Hill (sjhill@cotw.com)
+ *
+ * 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.
+ *
+ */
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/partitions.h>
+#include <asm/io.h>
+#include <asm/sizes.h>
+#include <asm/hardware.h>
+#include <asm/arch/board.h>
+#include <asm/arch/gpio.h>
+struct at91_nand_host {
+        struct nand_chip        nand_chip;
+        struct mtd_info         mtd;
+        void __iomem            *io_base;
+        struct at91_nand_data   *board;
+};
+/*
+ * Hardware specific access to control-lines
+ */
+static void at91_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct at91_nand_host *host = nand_chip->priv;
+        if (cmd == NAND_CMD_NONE)
+                return;
+        if (ctrl & NAND_CLE)
+                writeb(cmd, host->io_base + (1 << host->board->cle));
+        else
+                writeb(cmd, host->io_base + (1 << host->board->ale));
+}
+/*
+ * Read the Device Ready pin.
+ */
+static int at91_nand_device_ready(struct mtd_info *mtd)
+{
+        struct nand_chip *nand_chip = mtd->priv;
+        struct at91_nand_host *host = nand_chip->priv;
+        return at91_get_gpio_value(host->board->rdy_pin);
+}
+/*
+ * Enable NAND.
+ */
+static void at91_nand_enable(struct at91_nand_host *host)
+{
+        if (host->board->enable_pin)
+                at91_set_gpio_value(host->board->enable_pin, 0);
+}
+/*
+ * Disable NAND.
+ */
+static void at91_nand_disable(struct at91_nand_host *host)
+{
+        if (host->board->enable_pin)
+                at91_set_gpio_value(host->board->enable_pin, 1);
+}
+/*
+ * Probe for the NAND device.
+ */
+static int __init at91_nand_probe(struct platform_device *pdev)
+{
+        struct at91_nand_host *host;
+        struct mtd_info *mtd;
+        struct nand_chip *nand_chip;
+        int res;
+#ifdef CONFIG_MTD_PARTITIONS
+        struct mtd_partition *partitions = NULL;
+        int num_partitions = 0;
+#endif
+        /* Allocate memory for the device structure (and zero it) */
+        host = kzalloc(sizeof(struct at91_nand_host), GFP_KERNEL);
+        if (!host) {
+                printk(KERN_ERR "at91_nand: failed to allocate device structure.\n");
+                return -ENOMEM;
+        }
+        host->io_base = ioremap(pdev->resource[0].start,
+                                pdev->resource[0].end - pdev->resource[0].start + 1);
+        if (host->io_base == NULL) {
+                printk(KERN_ERR "at91_nand: ioremap failed\n");
+                kfree(host);
+                return -EIO;
+        }
+        mtd = &host->mtd;
+        nand_chip = &host->nand_chip;
+        host->board = pdev->dev.platform_data;
+        nand_chip->priv = host;         /* link the private data structures */
+        mtd->priv = nand_chip;
+        mtd->owner = THIS_MODULE;
+        /* Set address of NAND IO lines */
+        nand_chip->IO_ADDR_R = host->io_base;
+        nand_chip->IO_ADDR_W = host->io_base;
+        nand_chip->cmd_ctrl = at91_nand_cmd_ctrl;
+        nand_chip->dev_ready = at91_nand_device_ready;
+        nand_chip->ecc.mode = NAND_ECC_SOFT;    /* enable ECC */
+        nand_chip->chip_delay = 20;             /* 20us command delay time */
+        if (host->board->bus_width_16)          /* 16-bit bus width */
+                nand_chip->options |= NAND_BUSWIDTH_16;
+        platform_set_drvdata(pdev, host);
+        at91_nand_enable(host);
+        if (host->board->det_pin) {
+                if (at91_get_gpio_value(host->board->det_pin)) {
+                        printk ("No SmartMedia card inserted.\n");
+                        res = ENXIO;
+                        goto out;
+                }
+        }
+        /* Scan to find existance of the device */
+        if (nand_scan(mtd, 1)) {
+                res = -ENXIO;
+                goto out;
+        }
+#ifdef CONFIG_MTD_PARTITIONS
+        if (host->board->partition_info)
+                partitions = host->board->partition_info(mtd->size, &num_partitions);
+        if ((!partitions) || (num_partitions == 0)) {
+                printk(KERN_ERR "at91_nand: No parititions defined, or unsupported device.\n");
+                res = ENXIO;
+                goto release;
+        }
+        res = add_mtd_partitions(mtd, partitions, num_partitions);
+#else
+        res = add_mtd_device(mtd);
+#endif
+        if (!res)
+                return res;
+release:
+        nand_release(mtd);
+out:
+        at91_nand_disable(host);
+        platform_set_drvdata(pdev, NULL);
+        iounmap(host->io_base);
+        kfree(host);
+        return res;
+}
+/*
+ * Remove a NAND device.
+ */
+static int __devexit at91_nand_remove(struct platform_device *pdev)
+{
+        struct at91_nand_host *host = platform_get_drvdata(pdev);
+        struct mtd_info *mtd = &host->mtd;
+        nand_release(mtd);
+        at91_nand_disable(host);
+        iounmap(host->io_base);
+        kfree(host);
+        return 0;
+}
+static struct platform_driver at91_nand_driver = {
+        .probe          = at91_nand_probe,
+        .remove         = at91_nand_remove,
+        .driver         = {
+                .name   = "at91_nand",
+                .owner  = THIS_MODULE,
+        },
+};
+static int __init at91_nand_init(void)
+{
+        return platform_driver_register(&at91_nand_driver);
+}
+static void __exit at91_nand_exit(void)
+{
+        platform_driver_unregister(&at91_nand_driver);
+}
+module_init(at91_nand_init);
+module_exit(at91_nand_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Rick Bronson");
+MODULE_DESCRIPTION("NAND/SmartMedia driver for AT91RM9200");
diff --git a/drivers/mtd/nand/cafe.c b/drivers/mtd/nand/cafe.c
new file mode 100644
index 000000000000..b8d9b64cccc0
--- /dev/null
+++ b/drivers/mtd/nand/cafe.c
@@ -0,0 +1,770 @@
+/*
+ * Driver for One Laptop Per Child ‘CAFÉ’ controller, aka Marvell 88ALP01
+ *
+ * Copyright © 2006 Red Hat, Inc.
+ * Copyright © 2006 David Woodhouse <dwmw2@infradead.org>
+ */
+#define DEBUG
+#include <linux/device.h>
+#undef DEBUG
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/pci.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <asm/io.h>
+#define CAFE_NAND_CTRL1         0x00
+#define CAFE_NAND_CTRL2         0x04
+#define CAFE_NAND_CTRL3         0x08
+#define CAFE_NAND_STATUS        0x0c
+#define CAFE_NAND_IRQ           0x10
+#define CAFE_NAND_IRQ_MASK      0x14
+#define CAFE_NAND_DATA_LEN      0x18
+#define CAFE_NAND_ADDR1         0x1c
+#define CAFE_NAND_ADDR2         0x20
+#define CAFE_NAND_TIMING1       0x24
+#define CAFE_NAND_TIMING2       0x28
+#define CAFE_NAND_TIMING3       0x2c
+#define CAFE_NAND_NONMEM        0x30
+#define CAFE_NAND_ECC_RESULT    0x3C
+#define CAFE_NAND_DMA_CTRL      0x40
+#define CAFE_NAND_DMA_ADDR0     0x44
+#define CAFE_NAND_DMA_ADDR1     0x48
+#define CAFE_NAND_ECC_SYN01     0x50
+#define CAFE_NAND_ECC_SYN23     0x54
+#define CAFE_NAND_ECC_SYN45     0x58
+#define CAFE_NAND_ECC_SYN67     0x5c
+#define CAFE_NAND_READ_DATA     0x1000
+#define CAFE_NAND_WRITE_DATA    0x2000
+#define CAFE_GLOBAL_CTRL        0x3004
+#define CAFE_GLOBAL_IRQ         0x3008
+#define CAFE_GLOBAL_IRQ_MASK    0x300c
+#define CAFE_NAND_RESET         0x3034
+int cafe_correct_ecc(unsigned char *buf,
+                     unsigned short *chk_syndrome_list);
+struct cafe_priv {
+        struct nand_chip nand;
+        struct pci_dev *pdev;
+        void __iomem *mmio;
+        uint32_t ctl1;
+        uint32_t ctl2;
+        int datalen;
+        int nr_data;
+        int data_pos;
+        int page_addr;
+        dma_addr_t dmaaddr;
+        unsigned char *dmabuf;
+};
+static int usedma = 1;
+module_param(usedma, int, 0644);
+static int skipbbt = 0;
+module_param(skipbbt, int, 0644);
+static int debug = 0;
+module_param(debug, int, 0644);
+static int regdebug = 0;
+module_param(regdebug, int, 0644);
+static int checkecc = 1;
+module_param(checkecc, int, 0644);
+static int slowtiming = 0;
+module_param(slowtiming, int, 0644);
+/* Hrm. Why isn't this already conditional on something in the struct device? */
+#define cafe_dev_dbg(dev, args...) do { if (debug) dev_dbg(dev, ##args); } while(0)
+/* Make it easier to switch to PIO if we need to */
+#define cafe_readl(cafe, addr)                  readl((cafe)->mmio + CAFE_##addr)
+#define cafe_writel(cafe, datum, addr)          writel(datum, (cafe)->mmio + CAFE_##addr)
+static int cafe_device_ready(struct mtd_info *mtd)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        int result = !!(cafe_readl(cafe, NAND_STATUS) | 0x40000000);
+        uint32_t irqs = cafe_readl(cafe, NAND_IRQ);
+        cafe_writel(cafe, irqs, NAND_IRQ);
+        cafe_dev_dbg(&cafe->pdev->dev, "NAND device is%s ready, IRQ %x (%x) (%x,%x)\n",
+                result?"":" not", irqs, cafe_readl(cafe, NAND_IRQ),
+                cafe_readl(cafe, GLOBAL_IRQ), cafe_readl(cafe, GLOBAL_IRQ_MASK));
+        return result;
+}
+static void cafe_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        if (usedma)
+                memcpy(cafe->dmabuf + cafe->datalen, buf, len);
+        else
+                memcpy_toio(cafe->mmio + CAFE_NAND_WRITE_DATA + cafe->datalen, buf, len);
+        cafe->datalen += len;
+        cafe_dev_dbg(&cafe->pdev->dev, "Copy 0x%x bytes to write buffer. datalen 0x%x\n",
+                len, cafe->datalen);
+}
+static void cafe_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        if (usedma)
+                memcpy(buf, cafe->dmabuf + cafe->datalen, len);
+        else
+                memcpy_fromio(buf, cafe->mmio + CAFE_NAND_READ_DATA + cafe->datalen, len);
+        cafe_dev_dbg(&cafe->pdev->dev, "Copy 0x%x bytes from position 0x%x in read buffer.\n",
+                  len, cafe->datalen);
+        cafe->datalen += len;
+}
+static uint8_t cafe_read_byte(struct mtd_info *mtd)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        uint8_t d;
+        cafe_read_buf(mtd, &d, 1);
+        cafe_dev_dbg(&cafe->pdev->dev, "Read %02x\n", d);
+        return d;
+}
+static void cafe_nand_cmdfunc(struct mtd_info *mtd, unsigned command,
+                              int column, int page_addr)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        int adrbytes = 0;
+        uint32_t ctl1;
+        uint32_t doneint = 0x80000000;
+        cafe_dev_dbg(&cafe->pdev->dev, "cmdfunc %02x, 0x%x, 0x%x\n",
+                command, column, page_addr);
+        if (command == NAND_CMD_ERASE2 || command == NAND_CMD_PAGEPROG) {
+                /* Second half of a command we already calculated */
+                cafe_writel(cafe, cafe->ctl2 | 0x100 | command, NAND_CTRL2);
+                ctl1 = cafe->ctl1;
+                cafe->ctl2 &= ~(1<<30);
+                cafe_dev_dbg(&cafe->pdev->dev, "Continue command, ctl1 %08x, #data %d\n",
+                          cafe->ctl1, cafe->nr_data);
+                goto do_command;
+        }
+        /* Reset ECC engine */
+        cafe_writel(cafe, 0, NAND_CTRL2);
+        /* Emulate NAND_CMD_READOOB on large-page chips */
+        if (mtd->writesize > 512 &&
+            command == NAND_CMD_READOOB) {
+                column += mtd->writesize;
+                command = NAND_CMD_READ0;
+        }
+        /* FIXME: Do we need to send read command before sending data
+           for small-page chips, to position the buffer correctly? */
+        if (column != -1) {
+                cafe_writel(cafe, column, NAND_ADDR1);
+                adrbytes = 2;
+                if (page_addr != -1)
+                        goto write_adr2;
+        } else if (page_addr != -1) {
+                cafe_writel(cafe, page_addr & 0xffff, NAND_ADDR1);
+                page_addr >>= 16;
+        write_adr2:
+                cafe_writel(cafe, page_addr, NAND_ADDR2);
+                adrbytes += 2;
+                if (mtd->size > mtd->writesize << 16)
+                        adrbytes++;
+        }
+        cafe->data_pos = cafe->datalen = 0;
+        /* Set command valid bit */
+        ctl1 = 0x80000000 | command;
+        /* Set RD or WR bits as appropriate */
+        if (command == NAND_CMD_READID || command == NAND_CMD_STATUS) {
+                ctl1 |= (1<<26); /* rd */
+                /* Always 5 bytes, for now */
+                cafe->datalen = 4;
+                /* And one address cycle -- even for STATUS, since the controller doesn't work without */
+                adrbytes = 1;
+        } else if (command == NAND_CMD_READ0 || command == NAND_CMD_READ1 ||
+                   command == NAND_CMD_READOOB || command == NAND_CMD_RNDOUT) {
+                ctl1 |= 1<<26; /* rd */
+                /* For now, assume just read to end of page */
+                cafe->datalen = mtd->writesize + mtd->oobsize - column;
+        } else if (command == NAND_CMD_SEQIN)
+                ctl1 |= 1<<25; /* wr */
+        /* Set number of address bytes */
+        if (adrbytes)
+                ctl1 |= ((adrbytes-1)|8) << 27;
+        if (command == NAND_CMD_SEQIN || command == NAND_CMD_ERASE1) {
+                /* Ignore the first command of a pair; the hardware
+                   deals with them both at once, later */
+                cafe->ctl1 = ctl1;
+                cafe_dev_dbg(&cafe->pdev->dev, "Setup for delayed command, ctl1 %08x, dlen %x\n",
+                          cafe->ctl1, cafe->datalen);
+                return;
+        }
+        /* RNDOUT and READ0 commands need a following byte */
+        if (command == NAND_CMD_RNDOUT)
+                cafe_writel(cafe, cafe->ctl2 | 0x100 | NAND_CMD_RNDOUTSTART, NAND_CTRL2);
+        else if (command == NAND_CMD_READ0 && mtd->writesize > 512)
+                cafe_writel(cafe, cafe->ctl2 | 0x100 | NAND_CMD_READSTART, NAND_CTRL2);
+ do_command:
+        cafe_dev_dbg(&cafe->pdev->dev, "dlen %x, ctl1 %x, ctl2 %x\n",
+                cafe->datalen, ctl1, cafe_readl(cafe, NAND_CTRL2));
+        /* NB: The datasheet lies -- we really should be subtracting 1 here */
+        cafe_writel(cafe, cafe->datalen, NAND_DATA_LEN);
+        cafe_writel(cafe, 0x90000000, NAND_IRQ);
+        if (usedma && (ctl1 & (3<<25))) {
+                uint32_t dmactl = 0xc0000000 + cafe->datalen;
+                /* If WR or RD bits set, set up DMA */
+                if (ctl1 & (1<<26)) {
+                        /* It's a read */
+                        dmactl |= (1<<29);
+                        /* ... so it's done when the DMA is done, not just
+                           the command. */
+                        doneint = 0x10000000;
+                }
+                cafe_writel(cafe, dmactl, NAND_DMA_CTRL);
+        }
+        cafe->datalen = 0;
+        if (unlikely(regdebug)) {
+                int i;
+                printk("About to write command %08x to register 0\n", ctl1);
+                for (i=4; i< 0x5c; i+=4)
+                        printk("Register %x: %08x\n", i, readl(cafe->mmio + i));
+        }
+        cafe_writel(cafe, ctl1, NAND_CTRL1);
+        /* Apply this short delay always to ensure that we do wait tWB in
+         * any case on any machine. */
+        ndelay(100);
+        if (1) {
+                int c = 500000;
+                uint32_t irqs;
+                while (c--) {
+                        irqs = cafe_readl(cafe, NAND_IRQ);
+                        if (irqs & doneint)
+                                break;
+                        udelay(1);
+                        if (!(c % 100000))
+                                cafe_dev_dbg(&cafe->pdev->dev, "Wait for ready, IRQ %x\n", irqs);
+                        cpu_relax();
+                }
+                cafe_writel(cafe, doneint, NAND_IRQ);
+                cafe_dev_dbg(&cafe->pdev->dev, "Command %x completed after %d usec, irqs %x (%x)\n",
+                             command, 500000-c, irqs, cafe_readl(cafe, NAND_IRQ));
+        }
+        WARN_ON(cafe->ctl2 & (1<<30));
+        switch (command) {
+        case NAND_CMD_CACHEDPROG:
+        case NAND_CMD_PAGEPROG:
+        case NAND_CMD_ERASE1:
+        case NAND_CMD_ERASE2:
+        case NAND_CMD_SEQIN:
+        case NAND_CMD_RNDIN:
+        case NAND_CMD_STATUS:
+        case NAND_CMD_DEPLETE1:
+        case NAND_CMD_RNDOUT:
+        case NAND_CMD_STATUS_ERROR:
+        case NAND_CMD_STATUS_ERROR0:
+        case NAND_CMD_STATUS_ERROR1:
+        case NAND_CMD_STATUS_ERROR2:
+        case NAND_CMD_STATUS_ERROR3:
+                cafe_writel(cafe, cafe->ctl2, NAND_CTRL2);
+                return;
+        }
+        nand_wait_ready(mtd);
+        cafe_writel(cafe, cafe->ctl2, NAND_CTRL2);
+}
+static void cafe_select_chip(struct mtd_info *mtd, int chipnr)
+{
+        //struct cafe_priv *cafe = mtd->priv;
+        //      cafe_dev_dbg(&cafe->pdev->dev, "select_chip %d\n", chipnr);
+}
+static int cafe_nand_interrupt(int irq, void *id)
+{
+        struct mtd_info *mtd = id;
+        struct cafe_priv *cafe = mtd->priv;
+        uint32_t irqs = cafe_readl(cafe, NAND_IRQ);
+        cafe_writel(cafe, irqs & ~0x90000000, NAND_IRQ);
+        if (!irqs)
+                return IRQ_NONE;
+        cafe_dev_dbg(&cafe->pdev->dev, "irq, bits %x (%x)\n", irqs, cafe_readl(cafe, NAND_IRQ));
+        return IRQ_HANDLED;
+}
+static void cafe_nand_bug(struct mtd_info *mtd)
+{
+        BUG();
+}
+static int cafe_nand_write_oob(struct mtd_info *mtd,
+                               struct nand_chip *chip, int page)
+{
+        int status = 0;
+        chip->cmdfunc(mtd, NAND_CMD_SEQIN, mtd->writesize, page);
+        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
+        chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+        status = chip->waitfunc(mtd, chip);
+        return status & NAND_STATUS_FAIL ? -EIO : 0;
+}
+/* Don't use -- use nand_read_oob_std for now */
+static int cafe_nand_read_oob(struct mtd_info *mtd, struct nand_chip *chip,
+                              int page, int sndcmd)
+{
+        chip->cmdfunc(mtd, NAND_CMD_READOOB, 0, page);
+        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        return 1;
+}
+/**
+ * cafe_nand_read_page_syndrome - {REPLACABLE] hardware ecc syndrom based page read
+ * @mtd:        mtd info structure
+ * @chip:       nand chip info structure
+ * @buf:        buffer to store read data
+ *
+ * The hw generator calculates the error syndrome automatically. Therefor
+ * we need a special oob layout and handling.
+ */
+static int cafe_nand_read_page(struct mtd_info *mtd, struct nand_chip *chip,
+                               uint8_t *buf)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        cafe_dev_dbg(&cafe->pdev->dev, "ECC result %08x SYN1,2 %08x\n",
+                     cafe_readl(cafe, NAND_ECC_RESULT),
+                     cafe_readl(cafe, NAND_ECC_SYN01));
+        chip->read_buf(mtd, buf, mtd->writesize);
+        chip->read_buf(mtd, chip->oob_poi, mtd->oobsize);
+        if (checkecc && cafe_readl(cafe, NAND_ECC_RESULT) & (1<<18)) {
+                unsigned short syn[8];
+                int i;
+                for (i=0; i<8; i+=2) {
+                        uint32_t tmp = cafe_readl(cafe, NAND_ECC_SYN01 + (i*2));
+                        syn[i] = tmp & 0xfff;
+                        syn[i+1] = (tmp >> 16) & 0xfff;
+                }
+                if ((i = cafe_correct_ecc(buf, syn)) < 0) {
+                        dev_dbg(&cafe->pdev->dev, "Failed to correct ECC at %08x\n",
+                                cafe_readl(cafe, NAND_ADDR2) * 2048);
+                        for (i=0; i< 0x5c; i+=4)
+                                printk("Register %x: %08x\n", i, readl(cafe->mmio + i));
+                        mtd->ecc_stats.failed++;
+                } else {
+                        dev_dbg(&cafe->pdev->dev, "Corrected %d symbol errors\n", i);
+                        mtd->ecc_stats.corrected += i;
+                }
+        }
+        return 0;
+}
+static struct nand_ecclayout cafe_oobinfo_2048 = {
+        .eccbytes = 14,
+        .eccpos = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13},
+        .oobfree = {{14, 50}}
+};
+/* Ick. The BBT code really ought to be able to work this bit out
+   for itself from the above, at least for the 2KiB case */
+static uint8_t cafe_bbt_pattern_2048[] = { 'B', 'b', 't', '0' };
+static uint8_t cafe_mirror_pattern_2048[] = { '1', 't', 'b', 'B' };
+static uint8_t cafe_bbt_pattern_512[] = { 0xBB };
+static uint8_t cafe_mirror_pattern_512[] = { 0xBC };
+static struct nand_bbt_descr cafe_bbt_main_descr_2048 = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 14,
+        .len = 4,
+        .veroffs = 18,
+        .maxblocks = 4,
+        .pattern = cafe_bbt_pattern_2048
+};
+static struct nand_bbt_descr cafe_bbt_mirror_descr_2048 = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 14,
+        .len = 4,
+        .veroffs = 18,
+        .maxblocks = 4,
+        .pattern = cafe_mirror_pattern_2048
+};
+static struct nand_ecclayout cafe_oobinfo_512 = {
+        .eccbytes = 14,
+        .eccpos = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13},
+        .oobfree = {{14, 2}}
+};
+static struct nand_bbt_descr cafe_bbt_main_descr_512 = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 14,
+        .len = 1,
+        .veroffs = 15,
+        .maxblocks = 4,
+        .pattern = cafe_bbt_pattern_512
+};
+static struct nand_bbt_descr cafe_bbt_mirror_descr_512 = {
+        .options = NAND_BBT_LASTBLOCK | NAND_BBT_CREATE | NAND_BBT_WRITE
+                | NAND_BBT_2BIT | NAND_BBT_VERSION | NAND_BBT_PERCHIP,
+        .offs = 14,
+        .len = 1,
+        .veroffs = 15,
+        .maxblocks = 4,
+        .pattern = cafe_mirror_pattern_512
+};
+static void cafe_nand_write_page_lowlevel(struct mtd_info *mtd,
+                                          struct nand_chip *chip, const uint8_t *buf)
+{
+        struct cafe_priv *cafe = mtd->priv;
+        chip->write_buf(mtd, buf, mtd->writesize);
+        chip->write_buf(mtd, chip->oob_poi, mtd->oobsize);
+        /* Set up ECC autogeneration */
+        cafe->ctl2 |= (1<<30);
+}
+static int cafe_nand_write_page(struct mtd_info *mtd, struct nand_chip *chip,
+                                const uint8_t *buf, int page, int cached, int raw)
+{
+        int status;
+        chip->cmdfunc(mtd, NAND_CMD_SEQIN, 0x00, page);
+        if (unlikely(raw))
+                chip->ecc.write_page_raw(mtd, chip, buf);
+        else
+                chip->ecc.write_page(mtd, chip, buf);
+        /*
+         * Cached progamming disabled for now, Not sure if its worth the
+         * trouble. The speed gain is not very impressive. (2.3->2.6Mib/s)
+         */
+        cached = 0;
+        if (!cached || !(chip->options & NAND_CACHEPRG)) {
+                chip->cmdfunc(mtd, NAND_CMD_PAGEPROG, -1, -1);
+                status = chip->waitfunc(mtd, chip);
+                /*
+                 * See if operation failed and additional status checks are
+                 * available
+                 */
+                if ((status & NAND_STATUS_FAIL) && (chip->errstat))
+                        status = chip->errstat(mtd, chip, FL_WRITING, status,
+                                               page);
+                if (status & NAND_STATUS_FAIL)
+                        return -EIO;
+        } else {
+                chip->cmdfunc(mtd, NAND_CMD_CACHEDPROG, -1, -1);
+                status = chip->waitfunc(mtd, chip);
+        }
+#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
+        /* Send command to read back the data */
+        chip->cmdfunc(mtd, NAND_CMD_READ0, 0, page);
+        if (chip->verify_buf(mtd, buf, mtd->writesize))
+                return -EIO;
+#endif
+        return 0;
+}
+static int cafe_nand_block_bad(struct mtd_info *mtd, loff_t ofs, int getchip)
+{
+        return 0;
+}
+static int __devinit cafe_nand_probe(struct pci_dev *pdev,
+                                     const struct pci_device_id *ent)
+{
+        struct mtd_info *mtd;
+        struct cafe_priv *cafe;
+        uint32_t ctrl;
+        int err = 0;
+        err = pci_enable_device(pdev);
+        if (err)
+                return err;
+        pci_set_master(pdev);
+        mtd = kzalloc(sizeof(*mtd) + sizeof(struct cafe_priv), GFP_KERNEL);
+        if (!mtd) {
+                dev_warn(&pdev->dev, "failed to alloc mtd_info\n");
+                return  -ENOMEM;
+        }
+        cafe = (void *)(&mtd[1]);
+        mtd->priv = cafe;
+        mtd->owner = THIS_MODULE;
+        cafe->pdev = pdev;
+        cafe->mmio = pci_iomap(pdev, 0, 0);
+        if (!cafe->mmio) {
+                dev_warn(&pdev->dev, "failed to iomap\n");
+                err = -ENOMEM;
+                goto out_free_mtd;
+        }
+        cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, 2112 + sizeof(struct nand_buffers),
+                                          &cafe->dmaaddr, GFP_KERNEL);
+        if (!cafe->dmabuf) {
+                err = -ENOMEM;
+                goto out_ior;
+        }
+        cafe->nand.buffers = (void *)cafe->dmabuf + 2112;
+        cafe->nand.cmdfunc = cafe_nand_cmdfunc;
+        cafe->nand.dev_ready = cafe_device_ready;
+        cafe->nand.read_byte = cafe_read_byte;
+        cafe->nand.read_buf = cafe_read_buf;
+        cafe->nand.write_buf = cafe_write_buf;
+        cafe->nand.select_chip = cafe_select_chip;
+        cafe->nand.chip_delay = 0;
+        /* Enable the following for a flash based bad block table */
+        cafe->nand.options = NAND_USE_FLASH_BBT | NAND_NO_AUTOINCR | NAND_OWN_BUFFERS;
+        if (skipbbt) {
+                cafe->nand.options |= NAND_SKIP_BBTSCAN;
+                cafe->nand.block_bad = cafe_nand_block_bad;
+        }
+        /* Start off by resetting the NAND controller completely */
+        cafe_writel(cafe, 1, NAND_RESET);
+        cafe_writel(cafe, 0, NAND_RESET);
+        cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);
+        /* Timings from Marvell's test code (not verified or calculated by us) */
+        if (!slowtiming) {
+                cafe_writel(cafe, 0x01010a0a, NAND_TIMING1);
+                cafe_writel(cafe, 0x24121212, NAND_TIMING2);
+                cafe_writel(cafe, 0x11000000, NAND_TIMING3);
+        } else {
+                cafe_writel(cafe, 0xffffffff, NAND_TIMING1);
+                cafe_writel(cafe, 0xffffffff, NAND_TIMING2);
+                cafe_writel(cafe, 0xffffffff, NAND_TIMING3);
+        }
+        cafe_writel(cafe, 0xffffffff, NAND_IRQ_MASK);
+        err = request_irq(pdev->irq, &cafe_nand_interrupt, SA_SHIRQ, "CAFE NAND", mtd);
+        if (err) {
+                dev_warn(&pdev->dev, "Could not register IRQ %d\n", pdev->irq);
+                goto out_free_dma;
+        }
+#if 1
+        /* Disable master reset, enable NAND clock */
+        ctrl = cafe_readl(cafe, GLOBAL_CTRL);
+        ctrl &= 0xffffeff0;
+        ctrl |= 0x00007000;
+        cafe_writel(cafe, ctrl | 0x05, GLOBAL_CTRL);
+        cafe_writel(cafe, ctrl | 0x0a, GLOBAL_CTRL);
+        cafe_writel(cafe, 0, NAND_DMA_CTRL);
+        cafe_writel(cafe, 0x7006, GLOBAL_CTRL);
+        cafe_writel(cafe, 0x700a, GLOBAL_CTRL);
+        /* Set up DMA address */
+        cafe_writel(cafe, cafe->dmaaddr & 0xffffffff, NAND_DMA_ADDR0);
+        if (sizeof(cafe->dmaaddr) > 4)
+                /* Shift in two parts to shut the compiler up */
+                cafe_writel(cafe, (cafe->dmaaddr >> 16) >> 16, NAND_DMA_ADDR1);
+        else
+                cafe_writel(cafe, 0, NAND_DMA_ADDR1);
+        cafe_dev_dbg(&cafe->pdev->dev, "Set DMA address to %x (virt %p)\n",
+                cafe_readl(cafe, NAND_DMA_ADDR0), cafe->dmabuf);
+        /* Enable NAND IRQ in global IRQ mask register */
+        cafe_writel(cafe, 0x80000007, GLOBAL_IRQ_MASK);
+        cafe_dev_dbg(&cafe->pdev->dev, "Control %x, IRQ mask %x\n",
+                cafe_readl(cafe, GLOBAL_CTRL), cafe_readl(cafe, GLOBAL_IRQ_MASK));
+#endif
+#if 1
+        mtd->writesize=2048;
+        mtd->oobsize = 0x40;
+        memset(cafe->dmabuf, 0x5a, 2112);
+        cafe->nand.cmdfunc(mtd, NAND_CMD_READID, 0, -1);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+#endif
+#if 0
+        cafe->nand.cmdfunc(mtd, NAND_CMD_READ0, 0, 0);
+        //      nand_wait_ready(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+        cafe->nand.read_byte(mtd);
+#endif
+#if 0
+        writel(0x84600070, cafe->mmio);
+        udelay(10);
+        cafe_dev_dbg(&cafe->pdev->dev, "Status %x\n", cafe_readl(cafe, NAND_NONMEM));
+#endif
+        /* Scan to find existance of the device */
+        if (nand_scan_ident(mtd, 1)) {
+                err = -ENXIO;
+                goto out_irq;
+        }
+        cafe->ctl2 = 1<<27; /* Reed-Solomon ECC */
+        if (mtd->writesize == 2048)
+                cafe->ctl2 |= 1<<29; /* 2KiB page size */
+        /* Set up ECC according to the type of chip we found */
+        if (mtd->writesize == 2048) {
+                cafe->nand.ecc.layout = &cafe_oobinfo_2048;
+                cafe->nand.bbt_td = &cafe_bbt_main_descr_2048;
+                cafe->nand.bbt_md = &cafe_bbt_mirror_descr_2048;
+        } else if (mtd->writesize == 512) {
+                cafe->nand.ecc.layout = &cafe_oobinfo_512;
+                cafe->nand.bbt_td = &cafe_bbt_main_descr_512;
+                cafe->nand.bbt_md = &cafe_bbt_mirror_descr_512;
+        } else {
+                printk(KERN_WARNING "Unexpected NAND flash writesize %d. Aborting\n",
+                       mtd->writesize);
+                goto out_irq;
+        }
+        cafe->nand.ecc.mode = NAND_ECC_HW_SYNDROME;
+        cafe->nand.ecc.size = mtd->writesize;
+        cafe->nand.ecc.bytes = 14;
+        cafe->nand.ecc.hwctl  = (void *)cafe_nand_bug;
+        cafe->nand.ecc.calculate = (void *)cafe_nand_bug;
+        cafe->nand.ecc.correct  = (void *)cafe_nand_bug;
+        cafe->nand.write_page = cafe_nand_write_page;
+        cafe->nand.ecc.write_page = cafe_nand_write_page_lowlevel;
+        cafe->nand.ecc.write_oob = cafe_nand_write_oob;
+        cafe->nand.ecc.read_page = cafe_nand_read_page;
+        cafe->nand.ecc.read_oob = cafe_nand_read_oob;
+        err = nand_scan_tail(mtd);
+        if (err)
+                goto out_irq;
+        pci_set_drvdata(pdev, mtd);
+        add_mtd_device(mtd);
+        goto out;
+ out_irq:
+        /* Disable NAND IRQ in global IRQ mask register */
+        cafe_writel(cafe, ~1 & cafe_readl(cafe, GLOBAL_IRQ_MASK), GLOBAL_IRQ_MASK);
+        free_irq(pdev->irq, mtd);
+ out_free_dma:
+        dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
+ out_ior:
+        pci_iounmap(pdev, cafe->mmio);
+ out_free_mtd:
+        kfree(mtd);
+ out:
+        return err;
+}
+static void __devexit cafe_nand_remove(struct pci_dev *pdev)
+{
+        struct mtd_info *mtd = pci_get_drvdata(pdev);
+        struct cafe_priv *cafe = mtd->priv;
+        del_mtd_device(mtd);
+        /* Disable NAND IRQ in global IRQ mask register */
+        cafe_writel(cafe, ~1 & cafe_readl(cafe, GLOBAL_IRQ_MASK), GLOBAL_IRQ_MASK);
+        free_irq(pdev->irq, mtd);
+        nand_release(mtd);
+        pci_iounmap(pdev, cafe->mmio);
+        dma_free_coherent(&cafe->pdev->dev, 2112, cafe->dmabuf, cafe->dmaaddr);
+        kfree(mtd);
+}
+static struct pci_device_id cafe_nand_tbl[] = {
+        { 0x11ab, 0x4100, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_MEMORY_FLASH << 8, 0xFFFF0 }
+};
+MODULE_DEVICE_TABLE(pci, cafe_nand_tbl);
+static struct pci_driver cafe_nand_pci_driver = {
+        .name = "CAFÉ NAND",
+        .id_table = cafe_nand_tbl,
+        .probe = cafe_nand_probe,
+        .remove = __devexit_p(cafe_nand_remove),
+#ifdef CONFIG_PMx
+        .suspend = cafe_nand_suspend,
+        .resume = cafe_nand_resume,
+#endif
+};
+static int cafe_nand_init(void)
+{
+        return pci_register_driver(&cafe_nand_pci_driver);
+}
+static void cafe_nand_exit(void)
+{
+        pci_unregister_driver(&cafe_nand_pci_driver);
+}
+module_init(cafe_nand_init);
+module_exit(cafe_nand_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
+MODULE_DESCRIPTION("NAND flash driver for OLPC CAFE chip");
+/* Correct ECC for 2048 bytes of 0xff:
+   41 a0 71 65 54 27 f3 93 ec a9 be ed 0b a1 */
+/* dwmw2's B-test board, in case of completely screwing it:
+Bad eraseblock 2394 at 0x12b40000
+Bad eraseblock 2627 at 0x14860000
+Bad eraseblock 3349 at 0x1a2a0000
+*/
diff --git a/drivers/mtd/nand/cafe_ecc.c b/drivers/mtd/nand/cafe_ecc.c
new file mode 100644
index 000000000000..1b9fa05a4474
--- /dev/null
+++ b/drivers/mtd/nand/cafe_ecc.c
@@ -0,0 +1,1381 @@
+/* Error correction for CAFÉ NAND controller
+ *
+ * © 2006 Marvell, Inc.
+ * Author: Tom Chiou
+ *
+ * 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., 59
+ * Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+static unsigned short gf4096_mul(unsigned short, unsigned short);
+static unsigned short gf64_mul(unsigned short, unsigned short);
+static unsigned short gf4096_inv(unsigned short);
+static unsigned short err_pos(unsigned short);
+static void find_4bit_err_coefs(unsigned short, unsigned short, unsigned short,
+                                unsigned short, unsigned short, unsigned short,
+                                unsigned short, unsigned short, unsigned short *);
+static void zero_4x5_col3(unsigned short[4][5]);
+static void zero_4x5_col2(unsigned short[4][5]);
+static void zero_4x5_col1(unsigned short[4][5]);
+static void swap_4x5_rows(unsigned short[4][5], int, int, int);
+static void swap_2x3_rows(unsigned short m[2][3]);
+static void solve_4x5(unsigned short m[4][5], unsigned short *, int *);
+static void sort_coefs(int *, unsigned short *, int);
+static void find_4bit_err_pats(unsigned short, unsigned short, unsigned short,
+                               unsigned short, unsigned short, unsigned short,
+                               unsigned short, unsigned short, unsigned short *);
+static void find_3bit_err_coefs(unsigned short, unsigned short, unsigned short,
+                                unsigned short, unsigned short, unsigned short,
+                                unsigned short *);
+static void zero_3x4_col2(unsigned short[3][4]);
+static void zero_3x4_col1(unsigned short[3][4]);
+static void swap_3x4_rows(unsigned short[3][4], int, int, int);
+static void solve_3x4(unsigned short[3][4], unsigned short *, int *);
+static void find_3bit_err_pats(unsigned short, unsigned short, unsigned short,
+                               unsigned short, unsigned short, unsigned short,
+                               unsigned short *);
+static void find_2bit_err_pats(unsigned short, unsigned short, unsigned short,
+                               unsigned short, unsigned short *);
+static void find_2x2_soln(unsigned short, unsigned short, unsigned short,
+                          unsigned short, unsigned short, unsigned short,
+                          unsigned short *);
+static void solve_2x3(unsigned short[2][3], unsigned short *);
+static int chk_no_err_only(unsigned short *, unsigned short *);
+static int chk_1_err_only(unsigned short *, unsigned short *);
+static int chk_2_err_only(unsigned short *, unsigned short *);
+static int chk_3_err_only(unsigned short *, unsigned short *);
+static int chk_4_err_only(unsigned short *, unsigned short *);
+static unsigned short gf64_mul(unsigned short a, unsigned short b)
+{
+        unsigned short tmp1, tmp2, tmp3, tmp4, tmp5;
+        unsigned short c_bit0, c_bit1, c_bit2, c_bit3, c_bit4, c_bit5, c;
+        tmp1 = ((a) ^ (a >> 5));
+        tmp2 = ((a >> 4) ^ (a >> 5));
+        tmp3 = ((a >> 3) ^ (a >> 4));
+        tmp4 = ((a >> 2) ^ (a >> 3));
+        tmp5 = ((a >> 1) ^ (a >> 2));
+        c_bit0 = ((a & b) ^ ((a >> 5) & (b >> 1)) ^ ((a >> 4) & (b >> 2)) ^
+                  ((a >> 3) & (b >> 3)) ^ ((a >> 2) & (b >> 4)) ^ ((a >> 1) & (b >> 5))) & 0x1;
+        c_bit1 = (((a >> 1) & b) ^ (tmp1 & (b >> 1)) ^ (tmp2 & (b >> 2)) ^
+                  (tmp3 & (b >> 3)) ^ (tmp4 & (b >> 4)) ^ (tmp5 & (b >> 5))) & 0x1;
+        c_bit2 = (((a >> 2) & b) ^ ((a >> 1) & (b >> 1)) ^ (tmp1 & (b >> 2)) ^
+                  (tmp2 & (b >> 3)) ^ (tmp3 & (b >> 4)) ^ (tmp4 & (b >> 5))) & 0x1;
+        c_bit3 = (((a >> 3) & b) ^ ((a >> 2) & (b >> 1)) ^ ((a >> 1) & (b >> 2)) ^
+                  (tmp1 & (b >> 3)) ^ (tmp2 & (b >> 4)) ^ (tmp3 & (b >> 5))) & 0x1;
+        c_bit4 = (((a >> 4) & b) ^ ((a >> 3) & (b >> 1)) ^ ((a >> 2) & (b >> 2)) ^
+                  ((a >> 1) & (b >> 3)) ^ (tmp1 & (b >> 4)) ^ (tmp2 & (b >> 5))) & 0x1;
+        c_bit5 = (((a >> 5) & b) ^ ((a >> 4) & (b >> 1)) ^ ((a >> 3) & (b >> 2)) ^
+                  ((a >> 2) & (b >> 3)) ^ ((a >> 1) & (b >> 4)) ^ (tmp1 & (b >> 5))) & 0x1;
+        c = c_bit0 | (c_bit1 << 1) | (c_bit2 << 2) | (c_bit3 << 3) | (c_bit4 << 4) | (c_bit5 << 5);
+        return c;
+}
+static unsigned short gf4096_mul(unsigned short a, unsigned short b)
+{
+        unsigned short ah, al, bh, bl, alxah, blxbh, ablh, albl, ahbh, ahbhB, c;
+        ah = (a >> 6) & 0x3f;
+        al = a & 0x3f;
+        bh = (b >> 6) & 0x3f;
+        bl = b & 0x3f;
+        alxah = al ^ ah;
+        blxbh = bl ^ bh;
+        ablh = gf64_mul(alxah, blxbh);
+        albl = gf64_mul(al, bl);
+        ahbh = gf64_mul(ah, bh);
+        ahbhB = ((ahbh & 0x1) << 5) |
+            ((ahbh & 0x20) >> 1) |
+            ((ahbh & 0x10) >> 1) | ((ahbh & 0x8) >> 1) | ((ahbh & 0x4) >> 1) | (((ahbh >> 1) ^ ahbh) & 0x1);
+        c = ((ablh ^ albl) << 6) | (ahbhB ^ albl);
+        return c;
+}
+static void find_2bit_err_pats(unsigned short s0, unsigned short s1, unsigned short r0, unsigned short r1, unsigned short *pats)
+{
+        find_2x2_soln(0x1, 0x1, r0, r1, s0, s1, pats);
+}
+static void find_3bit_err_coefs(unsigned short s0, unsigned short s1,
+                                unsigned short s2, unsigned short s3, unsigned short s4, unsigned short s5, unsigned short *coefs)
+{
+        unsigned short m[3][4];
+        int row_order[3];
+        row_order[0] = 0;
+        row_order[1] = 1;
+        row_order[2] = 2;
+        m[0][0] = s2;
+        m[0][1] = s1;
+        m[0][2] = s0;
+        m[0][3] = s3;
+        m[1][0] = s3;
+        m[1][1] = s2;
+        m[1][2] = s1;
+        m[1][3] = s4;
+        m[2][0] = s4;
+        m[2][1] = s3;
+        m[2][2] = s2;
+        m[2][3] = s5;
+        if (m[0][2] != 0x0) {
+                zero_3x4_col2(m);
+        } else if (m[1][2] != 0x0) {
+                swap_3x4_rows(m, 0, 1, 4);
+                zero_3x4_col2(m);
+        } else if (m[2][2] != 0x0) {
+                swap_3x4_rows(m, 0, 2, 4);
+                zero_3x4_col2(m);
+        } else {
+                printk(KERN_ERR "Error: find_3bit_err_coefs, s0,s1,s2 all zeros!\n");
+        }
+        if (m[1][1] != 0x0) {
+                zero_3x4_col1(m);
+        } else if (m[2][1] != 0x0) {
+                swap_3x4_rows(m, 1, 2, 4);
+                zero_3x4_col1(m);
+        } else {
+                printk(KERN_ERR "Error: find_3bit_err_coefs, cannot resolve col 1!\n");
+        }
+        /* solve coefs */
+        solve_3x4(m, coefs, row_order);
+}
+static void zero_3x4_col2(unsigned short m[3][4])
+{
+        unsigned short minv1, minv2;
+        minv1 = gf4096_mul(m[1][2], gf4096_inv(m[0][2]));
+        minv2 = gf4096_mul(m[2][2], gf4096_inv(m[0][2]));
+        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv1);
+        m[1][1] = m[1][1] ^ gf4096_mul(m[0][1], minv1);
+        m[1][3] = m[1][3] ^ gf4096_mul(m[0][3], minv1);
+        m[2][0] = m[2][0] ^ gf4096_mul(m[0][0], minv2);
+        m[2][1] = m[2][1] ^ gf4096_mul(m[0][1], minv2);
+        m[2][3] = m[2][3] ^ gf4096_mul(m[0][3], minv2);
+}
+static void zero_3x4_col1(unsigned short m[3][4])
+{
+        unsigned short minv;
+        minv = gf4096_mul(m[2][1], gf4096_inv(m[1][1]));
+        m[2][0] = m[2][0] ^ gf4096_mul(m[1][0], minv);
+        m[2][3] = m[2][3] ^ gf4096_mul(m[1][3], minv);
+}
+static void swap_3x4_rows(unsigned short m[3][4], int i, int j, int col_width)
+{
+        unsigned short tmp0;
+        int cnt;
+        for (cnt = 0; cnt < col_width; cnt++) {
+                tmp0 = m[i][cnt];
+                m[i][cnt] = m[j][cnt];
+                m[j][cnt] = tmp0;
+        }
+}
+static void solve_3x4(unsigned short m[3][4], unsigned short *coefs, int *row_order)
+{
+        unsigned short tmp[3];
+        tmp[0] = gf4096_mul(m[2][3], gf4096_inv(m[2][0]));
+        tmp[1] = gf4096_mul((gf4096_mul(tmp[0], m[1][0]) ^ m[1][3]), gf4096_inv(m[1][1]));
+        tmp[2] = gf4096_mul((gf4096_mul(tmp[0], m[0][0]) ^ gf4096_mul(tmp[1], m[0][1]) ^ m[0][3]), gf4096_inv(m[0][2]));
+        sort_coefs(row_order, tmp, 3);
+        coefs[0] = tmp[0];
+        coefs[1] = tmp[1];
+        coefs[2] = tmp[2];
+}
+static void find_3bit_err_pats(unsigned short s0, unsigned short s1,
+                               unsigned short s2, unsigned short r0,
+                               unsigned short r1, unsigned short r2,
+                               unsigned short *pats)
+{
+        find_2x2_soln(r0 ^ r2, r1 ^ r2,
+                      gf4096_mul(r0, r0 ^ r2), gf4096_mul(r1, r1 ^ r2),
+                      gf4096_mul(s0, r2) ^ s1, gf4096_mul(s1, r2) ^ s2, pats);
+        pats[2] = s0 ^ pats[0] ^ pats[1];
+}
+static void find_4bit_err_coefs(unsigned short s0, unsigned short s1,
+                                unsigned short s2, unsigned short s3,
+                                unsigned short s4, unsigned short s5,
+                                unsigned short s6, unsigned short s7,
+                                unsigned short *coefs)
+{
+        unsigned short m[4][5];
+        int row_order[4];
+        row_order[0] = 0;
+        row_order[1] = 1;
+        row_order[2] = 2;
+        row_order[3] = 3;
+        m[0][0] = s3;
+        m[0][1] = s2;
+        m[0][2] = s1;
+        m[0][3] = s0;
+        m[0][4] = s4;
+        m[1][0] = s4;
+        m[1][1] = s3;
+        m[1][2] = s2;
+        m[1][3] = s1;
+        m[1][4] = s5;
+        m[2][0] = s5;
+        m[2][1] = s4;
+        m[2][2] = s3;
+        m[2][3] = s2;
+        m[2][4] = s6;
+        m[3][0] = s6;
+        m[3][1] = s5;
+        m[3][2] = s4;
+        m[3][3] = s3;
+        m[3][4] = s7;
+        if (m[0][3] != 0x0) {
+                zero_4x5_col3(m);
+        } else if (m[1][3] != 0x0) {
+                swap_4x5_rows(m, 0, 1, 5);
+                zero_4x5_col3(m);
+        } else if (m[2][3] != 0x0) {
+                swap_4x5_rows(m, 0, 2, 5);
+                zero_4x5_col3(m);
+        } else if (m[3][3] != 0x0) {
+                swap_4x5_rows(m, 0, 3, 5);
+                zero_4x5_col3(m);
+        } else {
+                printk(KERN_ERR "Error: find_4bit_err_coefs, s0,s1,s2,s3 all zeros!\n");
+        }
+        if (m[1][2] != 0x0) {
+                zero_4x5_col2(m);
+        } else if (m[2][2] != 0x0) {
+                swap_4x5_rows(m, 1, 2, 5);
+                zero_4x5_col2(m);
+        } else if (m[3][2] != 0x0) {
+                swap_4x5_rows(m, 1, 3, 5);
+                zero_4x5_col2(m);
+        } else {
+                printk(KERN_ERR "Error: find_4bit_err_coefs, cannot resolve col 2!\n");
+        }
+        if (m[2][1] != 0x0) {
+                zero_4x5_col1(m);
+        } else if (m[3][1] != 0x0) {
+                swap_4x5_rows(m, 2, 3, 5);
+                zero_4x5_col1(m);
+        } else {
+                printk(KERN_ERR "Error: find_4bit_err_coefs, cannot resolve col 1!\n");
+        }
+        solve_4x5(m, coefs, row_order);
+}
+static void zero_4x5_col3(unsigned short m[4][5])
+{
+        unsigned short minv1, minv2, minv3;
+        minv1 = gf4096_mul(m[1][3], gf4096_inv(m[0][3]));
+        minv2 = gf4096_mul(m[2][3], gf4096_inv(m[0][3]));
+        minv3 = gf4096_mul(m[3][3], gf4096_inv(m[0][3]));
+        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv1);
+        m[1][1] = m[1][1] ^ gf4096_mul(m[0][1], minv1);
+        m[1][2] = m[1][2] ^ gf4096_mul(m[0][2], minv1);
+        m[1][4] = m[1][4] ^ gf4096_mul(m[0][4], minv1);
+        m[2][0] = m[2][0] ^ gf4096_mul(m[0][0], minv2);
+        m[2][1] = m[2][1] ^ gf4096_mul(m[0][1], minv2);
+        m[2][2] = m[2][2] ^ gf4096_mul(m[0][2], minv2);
+        m[2][4] = m[2][4] ^ gf4096_mul(m[0][4], minv2);
+        m[3][0] = m[3][0] ^ gf4096_mul(m[0][0], minv3);
+        m[3][1] = m[3][1] ^ gf4096_mul(m[0][1], minv3);
+        m[3][2] = m[3][2] ^ gf4096_mul(m[0][2], minv3);
+        m[3][4] = m[3][4] ^ gf4096_mul(m[0][4], minv3);
+}
+static void zero_4x5_col2(unsigned short m[4][5])
+{
+        unsigned short minv2, minv3;
+        minv2 = gf4096_mul(m[2][2], gf4096_inv(m[1][2]));
+        minv3 = gf4096_mul(m[3][2], gf4096_inv(m[1][2]));
+        m[2][0] = m[2][0] ^ gf4096_mul(m[1][0], minv2);
+        m[2][1] = m[2][1] ^ gf4096_mul(m[1][1], minv2);
+        m[2][4] = m[2][4] ^ gf4096_mul(m[1][4], minv2);
+        m[3][0] = m[3][0] ^ gf4096_mul(m[1][0], minv3);
+        m[3][1] = m[3][1] ^ gf4096_mul(m[1][1], minv3);
+        m[3][4] = m[3][4] ^ gf4096_mul(m[1][4], minv3);
+}
+static void zero_4x5_col1(unsigned short m[4][5])
+{
+        unsigned short minv;
+        minv = gf4096_mul(m[3][1], gf4096_inv(m[2][1]));
+        m[3][0] = m[3][0] ^ gf4096_mul(m[2][0], minv);
+        m[3][4] = m[3][4] ^ gf4096_mul(m[2][4], minv);
+}
+static void swap_4x5_rows(unsigned short m[4][5], int i, int j, int col_width)
+{
+        unsigned short tmp0;
+        int cnt;
+        for (cnt = 0; cnt < col_width; cnt++) {
+                tmp0 = m[i][cnt];
+                m[i][cnt] = m[j][cnt];
+                m[j][cnt] = tmp0;
+        }
+}
+static void solve_4x5(unsigned short m[4][5], unsigned short *coefs, int *row_order)
+{
+        unsigned short tmp[4];
+        tmp[0] = gf4096_mul(m[3][4], gf4096_inv(m[3][0]));
+        tmp[1] = gf4096_mul((gf4096_mul(tmp[0], m[2][0]) ^ m[2][4]), gf4096_inv(m[2][1]));
+        tmp[2] = gf4096_mul((gf4096_mul(tmp[0], m[1][0]) ^ gf4096_mul(tmp[1], m[1][1]) ^ m[1][4]), gf4096_inv(m[1][2]));
+        tmp[3] = gf4096_mul((gf4096_mul(tmp[0], m[0][0]) ^
+                        gf4096_mul(tmp[1], m[0][1]) ^ gf4096_mul(tmp[2], m[0][2]) ^ m[0][4]), gf4096_inv(m[0][3]));
+        sort_coefs(row_order, tmp, 4);
+        coefs[0] = tmp[0];
+        coefs[1] = tmp[1];
+        coefs[2] = tmp[2];
+        coefs[3] = tmp[3];
+}
+static void sort_coefs(int *order, unsigned short *soln, int len)
+{
+        int cnt, start_cnt, least_ord, least_cnt;
+        unsigned short tmp0;
+        for (start_cnt = 0; start_cnt < len; start_cnt++) {
+                for (cnt = start_cnt; cnt < len; cnt++) {
+                        if (cnt == start_cnt) {
+                                least_ord = order[cnt];
+                                least_cnt = start_cnt;
+                        } else {
+                                if (least_ord > order[cnt]) {
+                                        least_ord = order[cnt];
+                                        least_cnt = cnt;
+                                }
+                        }
+                }
+                if (least_cnt != start_cnt) {
+                        tmp0 = order[least_cnt];
+                        order[least_cnt] = order[start_cnt];
+                        order[start_cnt] = tmp0;
+                        tmp0 = soln[least_cnt];
+                        soln[least_cnt] = soln[start_cnt];
+                        soln[start_cnt] = tmp0;
+                }
+        }
+}
+static void find_4bit_err_pats(unsigned short s0, unsigned short s1,
+                               unsigned short s2, unsigned short s3,
+                               unsigned short z1, unsigned short z2,
+                               unsigned short z3, unsigned short z4,
+                               unsigned short *pats)
+{
+        unsigned short z4_z1, z3z4_z3z3, z4_z2, s0z4_s1, z1z4_z1z1,
+                z4_z3, z2z4_z2z2, s1z4_s2, z3z3z4_z3z3z3, z1z1z4_z1z1z1, z2z2z4_z2z2z2, s2z4_s3;
+        unsigned short tmp0, tmp1, tmp2, tmp3;
+        z4_z1 = z4 ^ z1;
+        z3z4_z3z3 = gf4096_mul(z3, z4) ^ gf4096_mul(z3, z3);
+        z4_z2 = z4 ^ z2;
+        s0z4_s1 = gf4096_mul(s0, z4) ^ s1;
+        z1z4_z1z1 = gf4096_mul(z1, z4) ^ gf4096_mul(z1, z1);
+        z4_z3 = z4 ^ z3;
+        z2z4_z2z2 = gf4096_mul(z2, z4) ^ gf4096_mul(z2, z2);
+        s1z4_s2 = gf4096_mul(s1, z4) ^ s2;
+        z3z3z4_z3z3z3 = gf4096_mul(gf4096_mul(z3, z3), z4) ^ gf4096_mul(gf4096_mul(z3, z3), z3);
+        z1z1z4_z1z1z1 = gf4096_mul(gf4096_mul(z1, z1), z4) ^ gf4096_mul(gf4096_mul(z1, z1), z1);
+        z2z2z4_z2z2z2 = gf4096_mul(gf4096_mul(z2, z2), z4) ^ gf4096_mul(gf4096_mul(z2, z2), z2);
+        s2z4_s3 = gf4096_mul(s2, z4) ^ s3;
+        //find err pat 0,1
+        find_2x2_soln(gf4096_mul(z4_z1, z3z4_z3z3) ^
+                      gf4096_mul(z1z4_z1z1, z4_z3), gf4096_mul(z4_z2,
+                                                               z3z4_z3z3) ^
+                      gf4096_mul(z2z4_z2z2, z4_z3), gf4096_mul(z1z4_z1z1,
+                                                               z3z3z4_z3z3z3) ^
+                      gf4096_mul(z1z1z4_z1z1z1, z3z4_z3z3),
+                      gf4096_mul(z2z4_z2z2,
+                                 z3z3z4_z3z3z3) ^ gf4096_mul(z2z2z4_z2z2z2,
+                                                             z3z4_z3z3),
+                      gf4096_mul(s0z4_s1, z3z4_z3z3) ^ gf4096_mul(s1z4_s2,
+                                                                  z4_z3),
+                      gf4096_mul(s1z4_s2, z3z3z4_z3z3z3) ^ gf4096_mul(s2z4_s3, z3z4_z3z3), pats);
+        tmp0 = pats[0];
+        tmp1 = pats[1];
+        tmp2 = pats[0] ^ pats[1] ^ s0;
+        tmp3 = gf4096_mul(pats[0], z1) ^ gf4096_mul(pats[1], z2) ^ s1;
+        //find err pat 2,3
+        find_2x2_soln(0x1, 0x1, z3, z4, tmp2, tmp3, pats);
+        pats[2] = pats[0];
+        pats[3] = pats[1];
+        pats[0] = tmp0;
+        pats[1] = tmp1;
+}
+static void find_2x2_soln(unsigned short c00, unsigned short c01,
+                          unsigned short c10, unsigned short c11,
+                          unsigned short lval0, unsigned short lval1,
+                          unsigned short *soln)
+{
+        unsigned short m[2][3];
+        m[0][0] = c00;
+        m[0][1] = c01;
+        m[0][2] = lval0;
+        m[1][0] = c10;
+        m[1][1] = c11;
+        m[1][2] = lval1;
+        if (m[0][1] != 0x0) {
+                /* */
+        } else if (m[1][1] != 0x0) {
+                swap_2x3_rows(m);
+        } else {
+                printk(KERN_ERR "Warning: find_2bit_err_coefs, s0,s1 all zeros!\n");
+        }
+        solve_2x3(m, soln);
+}
+static void swap_2x3_rows(unsigned short m[2][3])
+{
+        unsigned short tmp0;
+        int cnt;
+        for (cnt = 0; cnt < 3; cnt++) {
+                tmp0 = m[0][cnt];
+                m[0][cnt] = m[1][cnt];
+                m[1][cnt] = tmp0;
+        }
+}
+static void solve_2x3(unsigned short m[2][3], unsigned short *coefs)
+{
+        unsigned short minv;
+        minv = gf4096_mul(m[1][1], gf4096_inv(m[0][1]));
+        m[1][0] = m[1][0] ^ gf4096_mul(m[0][0], minv);
+        m[1][2] = m[1][2] ^ gf4096_mul(m[0][2], minv);
+        coefs[0] = gf4096_mul(m[1][2], gf4096_inv(m[1][0]));
+        coefs[1] = gf4096_mul((gf4096_mul(coefs[0], m[0][0]) ^ m[0][2]), gf4096_inv(m[0][1]));
+}
+static unsigned char gf64_inv[64] = {
+         0,  1, 33, 62, 49, 43, 31, 44, 57, 37, 52, 28, 46, 40, 22, 25,
+        61, 54, 51, 39, 26, 35, 14, 24, 23, 15, 20, 34, 11, 53, 45,  6,
+        63,  2, 27, 21, 56,  9, 50, 19, 13, 47, 48,  5,  7, 30, 12, 41,
+        42,  4, 38, 18, 10, 29, 17, 60, 36,  8, 59, 58, 55, 16,  3, 32
+};
+static unsigned short gf4096_inv(unsigned short din)
+{
+        unsigned short alahxal, ah2B, deno, inv, bl, bh;
+        unsigned short ah, al, ahxal;
+        unsigned short dout;
+        ah = (din >> 6) & 0x3f;
+        al = din & 0x3f;
+        ahxal = ah ^ al;
+        ah2B = (((ah ^ (ah >> 3)) & 0x1) << 5) |
+                ((ah >> 1) & 0x10) |
+                ((((ah >> 5) ^ (ah >> 2)) & 0x1) << 3) |
+                ((ah >> 2) & 0x4) | ((((ah >> 4) ^ (ah >> 1)) & 0x1) << 1) | (ah & 0x1);
+        alahxal = gf64_mul(ahxal, al);
+        deno = alahxal ^ ah2B;
+        inv = gf64_inv[deno];
+        bl = gf64_mul(inv, ahxal);
+        bh = gf64_mul(inv, ah);
+        dout = ((bh & 0x3f) << 6) | (bl & 0x3f);
+        return (((bh & 0x3f) << 6) | (bl & 0x3f));
+}
+static unsigned short err_pos_lut[4096] = {
+        0xfff, 0x000, 0x451, 0xfff, 0xfff, 0x3cf, 0xfff, 0x041,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x28a, 0xfff, 0x492, 0xfff,
+        0x145, 0xfff, 0xfff, 0x514, 0xfff, 0x082, 0xfff, 0xfff,
+        0xfff, 0x249, 0x38e, 0x410, 0xfff, 0x104, 0x208, 0x1c7,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x2cb, 0xfff, 0xfff, 0xfff,
+        0x0c3, 0x34d, 0x4d3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x186, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x30c, 0x555, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x166, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x385, 0x14e, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e1,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x538, 0xfff, 0x16d, 0xfff,
+        0xfff, 0xfff, 0x45b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x29c, 0x2cc, 0x30b, 0x2b3, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0b3, 0xfff, 0x2f7,
+        0xfff, 0x32b, 0xfff, 0xfff, 0xfff, 0xfff, 0x0a7, 0xfff,
+        0xfff, 0x2da, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x07e, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x11c, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x22f, 0xfff, 0x1f4, 0xfff, 0xfff,
+        0x2b0, 0x504, 0xfff, 0x114, 0xfff, 0xfff, 0xfff, 0x21d,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x00d, 0x3c4, 0x340, 0x10f,
+        0xfff, 0xfff, 0x266, 0x02e, 0xfff, 0xfff, 0xfff, 0x4f8,
+        0x337, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x07b, 0x168, 0xfff, 0xfff, 0x0fe,
+        0xfff, 0xfff, 0x51a, 0xfff, 0x458, 0xfff, 0x36d, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x073, 0x37d, 0x415, 0x550, 0xfff,
+        0xfff, 0xfff, 0x23b, 0x4b4, 0xfff, 0xfff, 0xfff, 0x1a1,
+        0xfff, 0xfff, 0x3aa, 0xfff, 0x117, 0x04d, 0x341, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x518, 0x03e, 0x0f2, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x363, 0xfff, 0x0b9, 0xfff, 0xfff,
+        0x241, 0xfff, 0xfff, 0x049, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x15f, 0x52d, 0xfff, 0xfff, 0xfff, 0x29e, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x4cf, 0x0fc, 0xfff, 0x36f, 0x3d3, 0xfff,
+        0x228, 0xfff, 0xfff, 0x45e, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x238, 0xfff, 0xfff, 0xfff, 0xfff, 0x47f, 0xfff, 0xfff,
+        0x43a, 0x265, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3e8,
+        0xfff, 0xfff, 0x01a, 0xfff, 0xfff, 0xfff, 0xfff, 0x21e,
+        0x1fc, 0x40b, 0xfff, 0xfff, 0xfff, 0x2d0, 0x159, 0xfff,
+        0xfff, 0x313, 0xfff, 0xfff, 0x05c, 0x4cc, 0xfff, 0xfff,
+        0x0f6, 0x3d5, 0xfff, 0xfff, 0xfff, 0x54f, 0xfff, 0xfff,
+        0xfff, 0x172, 0x1e4, 0x07c, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x53c, 0x1ad, 0x535,
+        0x19b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x092, 0xfff, 0x2be, 0xfff, 0xfff, 0x482,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0e6, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x476, 0xfff, 0x51d, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x342, 0x2b5, 0x22e, 0x09a, 0xfff, 0x08d,
+        0x44f, 0x3ed, 0xfff, 0xfff, 0xfff, 0xfff, 0x3d1, 0xfff,
+        0xfff, 0x543, 0xfff, 0x48f, 0xfff, 0x3d2, 0xfff, 0x0d5,
+        0x113, 0x0ec, 0x427, 0xfff, 0xfff, 0xfff, 0x4c4, 0xfff,
+        0xfff, 0x50a, 0xfff, 0x144, 0xfff, 0x105, 0x39f, 0x294,
+        0x164, 0xfff, 0x31a, 0xfff, 0xfff, 0x49a, 0xfff, 0x130,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x1be, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x49e, 0x371, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x0e8, 0x49c, 0x0f4, 0xfff,
+        0x338, 0x1a7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x36c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x1ae, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x31b, 0xfff, 0xfff, 0x2dd, 0x522, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2f4,
+        0x3c6, 0x30d, 0xfff, 0xfff, 0xfff, 0xfff, 0x34c, 0x18f,
+        0x30a, 0xfff, 0x01f, 0x079, 0xfff, 0xfff, 0x54d, 0x46b,
+        0x28c, 0x37f, 0xfff, 0xfff, 0xfff, 0xfff, 0x355, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x14f, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x359, 0x3fe, 0x3c5, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x423, 0xfff, 0xfff, 0x34a, 0x22c, 0xfff,
+        0x25a, 0xfff, 0xfff, 0x4ad, 0xfff, 0x28d, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x547, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x2e2, 0xfff, 0xfff, 0x1d5, 0xfff, 0x2a8, 0xfff, 0xfff,
+        0x03f, 0xfff, 0xfff, 0xfff, 0xfff, 0x3eb, 0x0fa, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x55b, 0xfff,
+        0x08e, 0xfff, 0x3ae, 0xfff, 0x3a4, 0xfff, 0x282, 0x158,
+        0xfff, 0x382, 0xfff, 0xfff, 0x499, 0xfff, 0xfff, 0x08a,
+        0xfff, 0xfff, 0xfff, 0x456, 0x3be, 0xfff, 0x1e2, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x559, 0xfff, 0x1a0, 0xfff,
+        0xfff, 0x0b4, 0xfff, 0xfff, 0xfff, 0x2df, 0xfff, 0xfff,
+        0xfff, 0x07f, 0x4f5, 0xfff, 0xfff, 0x27c, 0x133, 0x017,
+        0xfff, 0x3fd, 0xfff, 0xfff, 0xfff, 0x44d, 0x4cd, 0x17a,
+        0x0d7, 0x537, 0xfff, 0xfff, 0x353, 0xfff, 0xfff, 0x351,
+        0x366, 0xfff, 0x44a, 0xfff, 0x1a6, 0xfff, 0xfff, 0xfff,
+        0x291, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1e3,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x389, 0xfff, 0x07a, 0xfff,
+        0x1b6, 0x2ed, 0xfff, 0xfff, 0xfff, 0xfff, 0x24e, 0x074,
+        0xfff, 0xfff, 0x3dc, 0xfff, 0x4e3, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x4eb, 0xfff, 0xfff, 0x3b8, 0x4de, 0xfff, 0x19c,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x262,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x076, 0x4e8, 0x3da,
+        0xfff, 0x531, 0xfff, 0xfff, 0x14a, 0xfff, 0x0a2, 0x433,
+        0x3df, 0x1e9, 0xfff, 0xfff, 0xfff, 0xfff, 0x3e7, 0x285,
+        0x2d8, 0xfff, 0xfff, 0xfff, 0x349, 0x18d, 0x098, 0xfff,
+        0x0df, 0x4bf, 0xfff, 0xfff, 0x0b2, 0xfff, 0x346, 0x24d,
+        0xfff, 0xfff, 0xfff, 0x24f, 0x4fa, 0x2f9, 0xfff, 0xfff,
+        0x3c9, 0xfff, 0x2b4, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x056, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x179, 0xfff, 0x0e9, 0x3f0, 0x33d, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x1fd, 0xfff, 0xfff, 0x526, 0xfff,
+        0xfff, 0xfff, 0x53d, 0xfff, 0xfff, 0xfff, 0x170, 0x331,
+        0xfff, 0x068, 0xfff, 0xfff, 0xfff, 0x3f7, 0xfff, 0x3d8,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x09f, 0x556, 0xfff, 0xfff, 0x02d, 0xfff, 0xfff,
+        0x553, 0xfff, 0xfff, 0xfff, 0x1f0, 0xfff, 0xfff, 0x4d6,
+        0x41e, 0xfff, 0xfff, 0xfff, 0xfff, 0x4d5, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x248, 0xfff, 0xfff, 0xfff, 0x0a3,
+        0xfff, 0x217, 0xfff, 0xfff, 0xfff, 0x4f1, 0x209, 0xfff,
+        0xfff, 0x475, 0x234, 0x52b, 0x398, 0xfff, 0x08b, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x2c2, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x268, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x4a3, 0xfff, 0x0aa, 0xfff, 0x1d9, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x155, 0xfff, 0xfff, 0xfff, 0xfff, 0x0bf,
+        0x539, 0xfff, 0xfff, 0x2f1, 0x545, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x2a7, 0x06f, 0xfff, 0x378, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x25e, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x15d, 0x02a, 0xfff, 0xfff, 0x0bc,
+        0x235, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x150, 0xfff, 0x1a9, 0xfff, 0xfff, 0xfff, 0xfff, 0x381,
+        0xfff, 0x04e, 0x270, 0x13f, 0xfff, 0xfff, 0x405, 0xfff,
+        0x3cd, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x2ef, 0xfff, 0x06a, 0xfff, 0xfff, 0xfff, 0x34f,
+        0x212, 0xfff, 0xfff, 0x0e2, 0xfff, 0x083, 0x298, 0xfff,
+        0xfff, 0xfff, 0x0c2, 0xfff, 0xfff, 0x52e, 0xfff, 0x488,
+        0xfff, 0xfff, 0xfff, 0x36b, 0xfff, 0xfff, 0xfff, 0x442,
+        0x091, 0xfff, 0x41c, 0xfff, 0xfff, 0x3a5, 0xfff, 0x4e6,
+        0xfff, 0xfff, 0x40d, 0x31d, 0xfff, 0xfff, 0xfff, 0x4c1,
+        0x053, 0xfff, 0x418, 0x13c, 0xfff, 0x350, 0xfff, 0x0ae,
+        0xfff, 0xfff, 0x41f, 0xfff, 0x470, 0xfff, 0x4ca, 0xfff,
+        0xfff, 0xfff, 0x02b, 0x450, 0xfff, 0x1f8, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x293, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x411, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x0b8, 0xfff, 0xfff, 0xfff,
+        0x3e1, 0xfff, 0xfff, 0xfff, 0xfff, 0x43c, 0xfff, 0x2b2,
+        0x2ab, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ec,
+        0xfff, 0xfff, 0xfff, 0x3f8, 0x034, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x11a, 0xfff, 0x541, 0x45c, 0x134,
+        0x1cc, 0xfff, 0xfff, 0xfff, 0x469, 0xfff, 0xfff, 0x44b,
+        0x161, 0xfff, 0xfff, 0xfff, 0x055, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x307, 0xfff, 0xfff, 0xfff, 0xfff, 0x2d1, 0xfff,
+        0xfff, 0xfff, 0x124, 0x37b, 0x26b, 0x336, 0xfff, 0xfff,
+        0x2e4, 0x3cb, 0xfff, 0xfff, 0x0f8, 0x3c8, 0xfff, 0xfff,
+        0xfff, 0x461, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4b5,
+        0x2cf, 0xfff, 0xfff, 0xfff, 0x20f, 0xfff, 0x35a, 0xfff,
+        0x490, 0xfff, 0x185, 0xfff, 0xfff, 0xfff, 0xfff, 0x42e,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x54b, 0xfff, 0xfff, 0xfff,
+        0x146, 0xfff, 0x412, 0xfff, 0xfff, 0xfff, 0x1ff, 0xfff,
+        0xfff, 0x3e0, 0xfff, 0xfff, 0xfff, 0xfff, 0x2d5, 0xfff,
+        0x4df, 0x505, 0xfff, 0x413, 0xfff, 0x1a5, 0xfff, 0x3b2,
+        0xfff, 0xfff, 0xfff, 0x35b, 0xfff, 0x116, 0xfff, 0xfff,
+        0x171, 0x4d0, 0xfff, 0x154, 0x12d, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x468, 0x4db, 0xfff,
+        0xfff, 0x1df, 0xfff, 0xfff, 0xfff, 0xfff, 0x05a, 0xfff,
+        0x0f1, 0x403, 0xfff, 0x22b, 0x2e0, 0xfff, 0xfff, 0xfff,
+        0x2b7, 0x373, 0xfff, 0xfff, 0xfff, 0xfff, 0x13e, 0xfff,
+        0xfff, 0xfff, 0x0d0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x329, 0x1d2, 0x3fa, 0x047, 0xfff, 0x2f2, 0xfff, 0xfff,
+        0x141, 0x0ac, 0x1d7, 0xfff, 0x07d, 0xfff, 0xfff, 0xfff,
+        0x1c1, 0xfff, 0x487, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x045, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x288, 0x0cd, 0xfff, 0xfff, 0xfff, 0xfff, 0x226, 0x1d8,
+        0xfff, 0x153, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4cb,
+        0x528, 0xfff, 0xfff, 0xfff, 0x20a, 0x343, 0x3a1, 0xfff,
+        0xfff, 0xfff, 0x2d7, 0x2d3, 0x1aa, 0x4c5, 0xfff, 0xfff,
+        0xfff, 0x42b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3e9, 0xfff, 0x20b, 0x260,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x37c, 0x2fd,
+        0xfff, 0xfff, 0x2c8, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x31e, 0xfff, 0x335, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x135, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x35c, 0x4dd, 0x129, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x1ef, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x34e, 0xfff, 0xfff, 0xfff, 0xfff, 0x407, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3ad, 0xfff, 0xfff, 0xfff,
+        0x379, 0xfff, 0xfff, 0x1d0, 0x38d, 0xfff, 0xfff, 0x1e8,
+        0x184, 0x3c1, 0x1c4, 0xfff, 0x1f9, 0xfff, 0xfff, 0x424,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x1d3, 0x0d4, 0xfff, 0x4e9,
+        0xfff, 0xfff, 0xfff, 0x530, 0x107, 0xfff, 0x106, 0x04f,
+        0xfff, 0xfff, 0x4c7, 0x503, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x15c, 0xfff, 0x23f, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x4f3, 0xfff, 0xfff, 0x3c7,
+        0xfff, 0x278, 0xfff, 0xfff, 0x0a6, 0xfff, 0xfff, 0xfff,
+        0x122, 0x1cf, 0xfff, 0x327, 0xfff, 0x2e5, 0xfff, 0x29d,
+        0xfff, 0xfff, 0x3f1, 0xfff, 0xfff, 0x48d, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x054, 0xfff, 0xfff, 0xfff, 0xfff, 0x178,
+        0x27e, 0x4e0, 0x352, 0x02f, 0x09c, 0xfff, 0x2a0, 0xfff,
+        0xfff, 0x46a, 0x457, 0xfff, 0xfff, 0x501, 0xfff, 0x2ba,
+        0xfff, 0xfff, 0xfff, 0x54e, 0x2e7, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x551, 0xfff, 0xfff, 0x1db, 0x2aa, 0xfff,
+        0xfff, 0x4bc, 0xfff, 0xfff, 0x395, 0xfff, 0x0de, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x455, 0xfff, 0x17e,
+        0xfff, 0x221, 0x4a7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x388, 0xfff, 0xfff, 0xfff, 0x308, 0xfff, 0xfff, 0xfff,
+        0x20e, 0x4b9, 0xfff, 0x273, 0x20c, 0x09e, 0xfff, 0x057,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3f2, 0xfff, 0x1a8, 0x3a6,
+        0x14c, 0xfff, 0xfff, 0x071, 0xfff, 0xfff, 0x53a, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x109, 0xfff, 0xfff, 0x399, 0xfff,
+        0x061, 0x4f0, 0x39e, 0x244, 0xfff, 0x035, 0xfff, 0xfff,
+        0x305, 0x47e, 0x297, 0xfff, 0xfff, 0x2b8, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1bc, 0xfff, 0x2fc,
+        0xfff, 0xfff, 0x554, 0xfff, 0xfff, 0xfff, 0xfff, 0x3b6,
+        0xfff, 0xfff, 0xfff, 0x515, 0x397, 0xfff, 0xfff, 0x12f,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e5,
+        0xfff, 0x4fc, 0xfff, 0xfff, 0x05e, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x0a8, 0x3af, 0x015, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x138, 0xfff, 0xfff, 0xfff, 0x540, 0xfff, 0xfff,
+        0xfff, 0x027, 0x523, 0x2f0, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x16c, 0xfff, 0x27d, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x04c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4dc,
+        0xfff, 0xfff, 0x059, 0x301, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x1a3, 0xfff, 0x15a, 0xfff, 0xfff,
+        0x0a5, 0xfff, 0x435, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x051, 0xfff, 0xfff, 0x131, 0xfff, 0x4f4, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x441, 0xfff, 0x4fb, 0xfff, 0x03b,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ed, 0x274,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d3, 0x55e, 0x1b3,
+        0xfff, 0x0bd, 0xfff, 0xfff, 0xfff, 0xfff, 0x225, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x4b7, 0xfff, 0xfff, 0x2ff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4c3, 0xfff,
+        0x383, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2f6,
+        0xfff, 0xfff, 0x1ee, 0xfff, 0x03d, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x26f, 0x1dc, 0xfff, 0x0db, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x0ce, 0xfff, 0xfff, 0x127, 0x03a,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x311, 0xfff,
+        0xfff, 0x13d, 0x09d, 0x47b, 0x2a6, 0x50d, 0x510, 0x19a,
+        0xfff, 0x354, 0x414, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x44c, 0x3b0, 0xfff, 0x23d, 0x429, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x4c0, 0x416, 0xfff, 0x05b, 0xfff, 0xfff, 0x137, 0xfff,
+        0x25f, 0x49f, 0xfff, 0x279, 0x013, 0xfff, 0xfff, 0xfff,
+        0x269, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3d0, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x077, 0xfff, 0xfff, 0x3fb,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x271, 0x3a0, 0xfff, 0xfff,
+        0x40f, 0xfff, 0xfff, 0x3de, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ab, 0x26a,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x489, 0xfff, 0xfff,
+        0x252, 0xfff, 0xfff, 0xfff, 0xfff, 0x1b7, 0x42f, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x3b7,
+        0xfff, 0x2bb, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x0f7, 0x01d, 0xfff, 0x067, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x4e2, 0xfff, 0xfff, 0x4bb, 0xfff,
+        0xfff, 0xfff, 0x17b, 0xfff, 0x0ee, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x36e, 0xfff, 0xfff, 0xfff, 0x533, 0xfff,
+        0xfff, 0xfff, 0x4d4, 0x356, 0xfff, 0xfff, 0x375, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x4a4, 0x513, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4ff, 0xfff, 0x2af,
+        0xfff, 0xfff, 0x026, 0xfff, 0x0ad, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x26e, 0xfff, 0xfff, 0xfff, 0xfff, 0x493, 0xfff,
+        0x463, 0x4d2, 0x4be, 0xfff, 0xfff, 0xfff, 0xfff, 0x4f2,
+        0x0b6, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x32d, 0x315, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x13a, 0x4a1, 0xfff, 0x27a, 0xfff, 0xfff, 0xfff,
+        0x47a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x334, 0xfff, 0xfff, 0xfff, 0xfff, 0x54c, 0xfff, 0xfff,
+        0xfff, 0x0c9, 0x007, 0xfff, 0xfff, 0x12e, 0xfff, 0x0ff,
+        0xfff, 0xfff, 0x3f5, 0x509, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x1c3, 0x2ad, 0xfff, 0xfff, 0x47c, 0x261, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x152, 0xfff, 0xfff, 0xfff, 0x339,
+        0xfff, 0x243, 0x1c0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x063, 0xfff, 0xfff, 0x254, 0xfff, 0xfff, 0x173, 0xfff,
+        0x0c7, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x362, 0x259, 0x485, 0x374, 0x0dc, 0x3ab, 0xfff,
+        0x1c5, 0x534, 0x544, 0xfff, 0xfff, 0x508, 0xfff, 0x402,
+        0x408, 0xfff, 0x0e7, 0xfff, 0xfff, 0x00a, 0x205, 0xfff,
+        0xfff, 0x2b9, 0xfff, 0xfff, 0xfff, 0x465, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x23a, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x147, 0x19d, 0x115, 0x214, 0xfff, 0x090, 0x368,
+        0xfff, 0x210, 0xfff, 0xfff, 0x280, 0x52a, 0x163, 0x148,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x326, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x2de, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x206, 0x2c1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x189, 0xfff, 0xfff, 0xfff, 0xfff, 0x367, 0xfff, 0x1a4,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x443, 0xfff, 0x27b,
+        0xfff, 0xfff, 0x251, 0x549, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x188, 0x04b, 0xfff, 0xfff, 0xfff, 0x31f,
+        0x4a6, 0xfff, 0x246, 0x1de, 0x156, 0xfff, 0xfff, 0xfff,
+        0x3a9, 0xfff, 0xfff, 0xfff, 0x2fa, 0xfff, 0x128, 0x0d1,
+        0x449, 0x255, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x258, 0xfff, 0xfff, 0xfff,
+        0x532, 0xfff, 0xfff, 0xfff, 0x303, 0x517, 0xfff, 0xfff,
+        0x2a9, 0x24a, 0xfff, 0xfff, 0x231, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x4b6, 0x516, 0xfff, 0xfff, 0x0e4, 0x0eb,
+        0xfff, 0x4e4, 0xfff, 0x275, 0xfff, 0xfff, 0x031, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x025, 0x21a, 0xfff, 0x0cc,
+        0x45f, 0x3d9, 0x289, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x23e, 0xfff, 0xfff, 0xfff, 0x438, 0x097,
+        0x419, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x0a9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x37e, 0x0e0, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x431,
+        0x372, 0xfff, 0xfff, 0xfff, 0x1ba, 0x06e, 0xfff, 0x1b1,
+        0xfff, 0xfff, 0x12a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x193, 0xfff, 0xfff, 0xfff, 0xfff, 0x10a,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x048, 0x1b4,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x295, 0x140, 0x108, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x16f, 0xfff, 0x0a4, 0x37a, 0xfff,
+        0x29a, 0xfff, 0x284, 0xfff, 0xfff, 0xfff, 0xfff, 0x4c6,
+        0x2a2, 0x3a3, 0xfff, 0x201, 0xfff, 0xfff, 0xfff, 0x4bd,
+        0x005, 0x54a, 0x3b5, 0x204, 0x2ee, 0x11d, 0x436, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3ec, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x11f, 0x498, 0x21c, 0xfff,
+        0xfff, 0xfff, 0x3d6, 0xfff, 0x4ab, 0xfff, 0x432, 0x2eb,
+        0x542, 0x4fd, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x4ce, 0xfff, 0xfff, 0x2fb, 0xfff,
+        0xfff, 0x2e1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x1b9, 0x037, 0x0dd,
+        0xfff, 0xfff, 0xfff, 0x2bf, 0x521, 0x496, 0x095, 0xfff,
+        0xfff, 0x328, 0x070, 0x1bf, 0xfff, 0x393, 0xfff, 0xfff,
+        0x102, 0xfff, 0xfff, 0x21b, 0xfff, 0x142, 0x263, 0x519,
+        0xfff, 0x2a5, 0x177, 0xfff, 0x14d, 0x471, 0x4ae, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x1f6, 0xfff, 0x481, 0xfff, 0xfff, 0xfff, 0x151, 0xfff,
+        0xfff, 0xfff, 0x085, 0x33f, 0xfff, 0xfff, 0xfff, 0x084,
+        0xfff, 0xfff, 0xfff, 0x345, 0x3a2, 0xfff, 0xfff, 0x0a0,
+        0x0da, 0x024, 0xfff, 0xfff, 0xfff, 0x1bd, 0xfff, 0x55c,
+        0x467, 0x445, 0xfff, 0xfff, 0xfff, 0x052, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x51e, 0xfff, 0xfff, 0x39d, 0xfff, 0x35f,
+        0xfff, 0x376, 0x3ee, 0xfff, 0xfff, 0xfff, 0xfff, 0x448,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x16a,
+        0xfff, 0x036, 0x38f, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x211,
+        0xfff, 0xfff, 0xfff, 0x230, 0xfff, 0xfff, 0x3ba, 0xfff,
+        0xfff, 0xfff, 0x3ce, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x229, 0xfff, 0x176, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x00b, 0xfff, 0x162, 0x018, 0xfff,
+        0xfff, 0x233, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x400, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x12b, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x3f4, 0xfff, 0x0f0, 0xfff, 0x1ac, 0xfff, 0xfff,
+        0x119, 0xfff, 0x2c0, 0xfff, 0xfff, 0xfff, 0x49b, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x23c, 0xfff,
+        0x4b3, 0x010, 0x064, 0xfff, 0xfff, 0x4ba, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x3c2, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x006, 0x196, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x100, 0x191, 0xfff,
+        0x1ea, 0x29f, 0xfff, 0xfff, 0xfff, 0x276, 0xfff, 0xfff,
+        0x2b1, 0x3b9, 0xfff, 0x03c, 0xfff, 0xfff, 0xfff, 0x180,
+        0xfff, 0x08f, 0xfff, 0xfff, 0x19e, 0x019, 0xfff, 0x0b0,
+        0x0fd, 0x332, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x06b, 0x2e8, 0xfff, 0x446, 0xfff, 0xfff, 0x004,
+        0x247, 0x197, 0xfff, 0x112, 0x169, 0x292, 0xfff, 0x302,
+        0xfff, 0xfff, 0x33b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x287, 0x21f, 0xfff, 0x3ea, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x4e7, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x3a8, 0xfff, 0xfff, 0x2bc, 0xfff,
+        0x484, 0x296, 0xfff, 0x1c9, 0x08c, 0x1e5, 0x48a, 0xfff,
+        0x360, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x1ca, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x10d, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x066, 0x2ea, 0x28b, 0x25b, 0xfff, 0x072,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x2b6, 0xfff, 0xfff, 0x272,
+        0xfff, 0xfff, 0x525, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x2ca, 0xfff, 0xfff, 0xfff, 0x299, 0xfff, 0xfff, 0xfff,
+        0x558, 0x41a, 0xfff, 0x4f7, 0x557, 0xfff, 0x4a0, 0x344,
+        0x12c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x125,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x40e, 0xfff, 0xfff, 0x502, 0xfff, 0x103, 0x3e6, 0xfff,
+        0x527, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x45d, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x44e, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d2, 0x4c9, 0x35e,
+        0x459, 0x2d9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x17d,
+        0x0c4, 0xfff, 0xfff, 0xfff, 0x3ac, 0x390, 0x094, 0xfff,
+        0x483, 0x0ab, 0xfff, 0x253, 0xfff, 0x391, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x123, 0x0ef, 0xfff, 0xfff, 0xfff, 0x330,
+        0x38c, 0xfff, 0xfff, 0x2ae, 0xfff, 0xfff, 0xfff, 0x042,
+        0x012, 0x06d, 0xfff, 0xfff, 0xfff, 0x32a, 0x3db, 0x364,
+        0x2dc, 0xfff, 0x30f, 0x3d7, 0x4a5, 0x050, 0xfff, 0xfff,
+        0x029, 0xfff, 0xfff, 0xfff, 0xfff, 0x1d1, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x480, 0xfff,
+        0x4ed, 0x081, 0x0a1, 0xfff, 0xfff, 0xfff, 0x30e, 0x52f,
+        0x257, 0xfff, 0xfff, 0x447, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x401, 0x3cc, 0xfff, 0xfff, 0x0fb,
+        0x2c9, 0x42a, 0x314, 0x33e, 0x3bd, 0x318, 0xfff, 0x10e,
+        0x2a1, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x24c,
+        0x506, 0xfff, 0x267, 0xfff, 0xfff, 0x219, 0xfff, 0x1eb,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x309, 0x3e2, 0x46c, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x384, 0xfff, 0xfff, 0xfff, 0xfff, 0x50c, 0xfff, 0x24b,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x038,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x194,
+        0x143, 0x3e3, 0xfff, 0xfff, 0xfff, 0x4c2, 0xfff, 0xfff,
+        0x0e1, 0x25c, 0xfff, 0x237, 0xfff, 0x1fe, 0xfff, 0xfff,
+        0xfff, 0x065, 0x2a4, 0xfff, 0x386, 0x55a, 0x11b, 0xfff,
+        0xfff, 0x192, 0xfff, 0x183, 0x00e, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x4b2, 0x18e, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x486, 0x4ef, 0x0c6, 0x380, 0xfff, 0x4a8, 0xfff,
+        0x0c5, 0xfff, 0xfff, 0xfff, 0xfff, 0x093, 0x1b8, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2e6,
+        0xfff, 0x0f3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x28e, 0xfff, 0x53b, 0x420, 0x22a, 0x33a, 0xfff, 0x387,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2a3, 0xfff, 0xfff,
+        0xfff, 0x428, 0x500, 0xfff, 0xfff, 0x120, 0x2c6, 0x290,
+        0x2f5, 0x0e3, 0xfff, 0x0b7, 0xfff, 0x319, 0x474, 0xfff,
+        0xfff, 0xfff, 0x529, 0x014, 0xfff, 0x41b, 0x40a, 0x18b,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x0d9,
+        0xfff, 0x38a, 0xfff, 0xfff, 0xfff, 0xfff, 0x1ce, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3b1, 0xfff, 0xfff, 0x05d,
+        0x2c4, 0xfff, 0xfff, 0x4af, 0xfff, 0x030, 0xfff, 0xfff,
+        0x203, 0xfff, 0x277, 0x256, 0xfff, 0xfff, 0xfff, 0x4f9,
+        0xfff, 0x2c7, 0xfff, 0x466, 0x016, 0x1cd, 0xfff, 0x167,
+        0xfff, 0xfff, 0x0c8, 0xfff, 0x43d, 0xfff, 0xfff, 0x020,
+        0xfff, 0xfff, 0x232, 0x1cb, 0x1e0, 0xfff, 0xfff, 0x347,
+        0xfff, 0x478, 0xfff, 0x365, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x358, 0xfff, 0x10b, 0xfff, 0x35d, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x452, 0x22d, 0xfff, 0xfff, 0x47d, 0xfff,
+        0x2f3, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x460, 0xfff,
+        0xfff, 0xfff, 0x50b, 0xfff, 0xfff, 0xfff, 0x2ec, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x4b1, 0x422, 0xfff, 0xfff,
+        0xfff, 0x2d4, 0xfff, 0x239, 0xfff, 0xfff, 0xfff, 0x439,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x491, 0x075, 0xfff, 0xfff, 0xfff, 0x06c, 0xfff,
+        0xfff, 0x0f9, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x139, 0xfff, 0x4f6, 0xfff, 0xfff, 0x409, 0xfff,
+        0xfff, 0x15b, 0xfff, 0xfff, 0x348, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x4a2, 0x49d, 0xfff, 0x033, 0x175, 0xfff, 0x039,
+        0xfff, 0x312, 0x40c, 0xfff, 0xfff, 0x325, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x4aa, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0x165, 0x3bc, 0x48c, 0x310, 0x096,
+        0xfff, 0xfff, 0x250, 0x1a2, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x20d, 0x2ac, 0xfff, 0xfff, 0x39b, 0xfff, 0x377, 0xfff,
+        0x512, 0x495, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x357, 0x4ea, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x198, 0xfff, 0xfff, 0xfff, 0x434, 0x04a,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x062, 0xfff, 0x1d6, 0x1c8,
+        0xfff, 0x1f3, 0x281, 0xfff, 0x462, 0xfff, 0xfff, 0xfff,
+        0x4b0, 0xfff, 0x207, 0xfff, 0xfff, 0xfff, 0xfff, 0x3dd,
+        0xfff, 0xfff, 0x55d, 0xfff, 0x552, 0x494, 0x1af, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x227, 0xfff, 0xfff, 0x069,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x43e,
+        0x0b5, 0xfff, 0x524, 0x2d2, 0xfff, 0xfff, 0xfff, 0x28f,
+        0xfff, 0x01b, 0x50e, 0xfff, 0xfff, 0x1bb, 0xfff, 0xfff,
+        0x41d, 0xfff, 0x32e, 0x48e, 0xfff, 0x1f7, 0x224, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x394, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x52c, 0xfff, 0xfff, 0xfff, 0x392, 0xfff, 0x1e7,
+        0xfff, 0xfff, 0x3f9, 0x3a7, 0xfff, 0x51f, 0xfff, 0x0bb,
+        0x118, 0x3ca, 0xfff, 0x1dd, 0xfff, 0x48b, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x50f, 0xfff, 0x0d6, 0xfff, 0x1fa, 0xfff,
+        0x11e, 0xfff, 0xfff, 0xfff, 0xfff, 0x4d7, 0xfff, 0x078,
+        0x008, 0xfff, 0x25d, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x032, 0x33c, 0xfff, 0x4d9, 0x160, 0xfff, 0xfff, 0x300,
+        0x0b1, 0xfff, 0x322, 0xfff, 0x4ec, 0xfff, 0xfff, 0x200,
+        0x00c, 0x369, 0x473, 0xfff, 0xfff, 0x32c, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x53e, 0x3d4, 0x417, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x34b, 0x001, 0x39a, 0x02c, 0xfff, 0xfff, 0x2ce, 0x00f,
+        0xfff, 0x0ba, 0xfff, 0xfff, 0xfff, 0xfff, 0x060, 0xfff,
+        0x406, 0xfff, 0xfff, 0xfff, 0x4ee, 0x4ac, 0xfff, 0x43f,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x29b, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x216,
+        0x190, 0xfff, 0x396, 0x464, 0xfff, 0xfff, 0x323, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x2e9, 0xfff, 0x26d,
+        0x2cd, 0x040, 0xfff, 0xfff, 0xfff, 0xfff, 0x38b, 0x3c0,
+        0xfff, 0xfff, 0xfff, 0x1f2, 0xfff, 0x0ea, 0xfff, 0xfff,
+        0x472, 0xfff, 0x1fb, 0xfff, 0xfff, 0x0af, 0x27f, 0xfff,
+        0xfff, 0xfff, 0x479, 0x023, 0xfff, 0x0d8, 0x3b3, 0xfff,
+        0xfff, 0xfff, 0x121, 0xfff, 0xfff, 0x3bf, 0xfff, 0xfff,
+        0x16b, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x45a, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x0be, 0xfff, 0xfff, 0xfff, 0x111, 0xfff, 0x220,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x09b, 0x218, 0xfff, 0x022, 0x202, 0xfff,
+        0x4c8, 0xfff, 0x0ed, 0xfff, 0xfff, 0x182, 0xfff, 0xfff,
+        0xfff, 0x17f, 0x213, 0xfff, 0x321, 0x36a, 0xfff, 0x086,
+        0xfff, 0xfff, 0xfff, 0x43b, 0x088, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x26c, 0xfff, 0x2f8, 0x3b4, 0xfff, 0xfff, 0xfff,
+        0x132, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x333, 0x444,
+        0x0c1, 0x4d8, 0x46d, 0x264, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x426, 0xfff, 0xfff, 0xfff, 0xfff, 0x2fe, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x011, 0xfff, 0x05f, 0xfff, 0xfff, 0xfff,
+        0xfff, 0x10c, 0x101, 0xfff, 0xfff, 0xfff, 0xfff, 0x110,
+        0xfff, 0x044, 0x304, 0x361, 0x404, 0xfff, 0x51b, 0x099,
+        0xfff, 0x440, 0xfff, 0xfff, 0xfff, 0x222, 0xfff, 0xfff,
+        0xfff, 0xfff, 0x1b5, 0xfff, 0x136, 0x430, 0xfff, 0x1da,
+        0xfff, 0xfff, 0xfff, 0x043, 0xfff, 0x17c, 0xfff, 0xfff,
+        0xfff, 0x01c, 0xfff, 0xfff, 0xfff, 0x425, 0x236, 0xfff,
+        0x317, 0xfff, 0xfff, 0x437, 0x3fc, 0xfff, 0x1f1, 0xfff,
+        0x324, 0xfff, 0xfff, 0x0ca, 0x306, 0xfff, 0x548, 0xfff,
+        0x46e, 0xfff, 0xfff, 0xfff, 0x4b8, 0x1c2, 0x286, 0xfff,
+        0xfff, 0x087, 0x18a, 0x19f, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x18c, 0xfff, 0x215, 0xfff, 0xfff, 0xfff, 0xfff, 0x283,
+        0xfff, 0xfff, 0xfff, 0x126, 0xfff, 0xfff, 0x370, 0xfff,
+        0x53f, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0x31c, 0xfff,
+        0x4d1, 0xfff, 0xfff, 0xfff, 0x021, 0xfff, 0x157, 0xfff,
+        0xfff, 0x028, 0x16e, 0xfff, 0x421, 0xfff, 0x1c6, 0xfff,
+        0xfff, 0x511, 0xfff, 0xfff, 0x39c, 0x46f, 0x1b2, 0xfff,
+        0xfff, 0x316, 0xfff, 0xfff, 0x009, 0xfff, 0xfff, 0x195,
+        0xfff, 0x240, 0x546, 0xfff, 0xfff, 0x520, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x454, 0xfff, 0xfff, 0xfff,
+        0x3f3, 0xfff, 0xfff, 0x187, 0xfff, 0x4a9, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x51c, 0x453, 0x1e6, 0xfff,
+        0xfff, 0xfff, 0x1b0, 0xfff, 0x477, 0xfff, 0xfff, 0xfff,
+        0x4fe, 0xfff, 0x32f, 0xfff, 0xfff, 0x15e, 0x1d4, 0xfff,
+        0x0e5, 0xfff, 0xfff, 0xfff, 0x242, 0x14b, 0x046, 0xfff,
+        0x3f6, 0x3bb, 0x3e4, 0xfff, 0xfff, 0x2e3, 0xfff, 0x245,
+        0xfff, 0x149, 0xfff, 0xfff, 0xfff, 0x2db, 0xfff, 0xfff,
+        0x181, 0xfff, 0x089, 0x2c5, 0xfff, 0x1f5, 0xfff, 0x2d6,
+        0x507, 0xfff, 0x42d, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0x080, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff, 0xfff,
+        0xfff, 0xfff, 0xfff, 0xfff, 0x3c3, 0x320, 0xfff, 0x1e1,
+        0xfff, 0x0f5, 0x13b, 0xfff, 0xfff, 0xfff, 0x003, 0x4da,
+        0xfff, 0xfff, 0xfff, 0x42c, 0xfff, 0xfff, 0x0cb, 0xfff,
+        0x536, 0x2c3, 0xfff, 0xfff, 0xfff, 0xfff, 0x199, 0xfff,
+        0xfff, 0x0c0, 0xfff, 0x01e, 0x497, 0xfff, 0xfff, 0x3e5,
+        0xfff, 0xfff, 0xfff, 0x0cf, 0xfff, 0x2bd, 0xfff, 0x223,
+        0xfff, 0x3ff, 0xfff, 0x058, 0x174, 0x3ef, 0xfff, 0x002
+};
+static unsigned short err_pos(unsigned short din)
+{
+        BUG_ON(din > 4096);
+        return err_pos_lut[din];
+}
+static int chk_no_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
+{
+        if ((chk_syndrome_list[0] | chk_syndrome_list[1] |
+             chk_syndrome_list[2] | chk_syndrome_list[3] |
+             chk_syndrome_list[4] | chk_syndrome_list[5] |
+             chk_syndrome_list[6] | chk_syndrome_list[7]) != 0x0) {
+                return -EINVAL;
+        } else {
+                err_info[0] = 0x0;
+                return 0;
+        }
+}
+static int chk_1_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
+{
+        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6;
+        tmp0 = gf4096_mul(chk_syndrome_list[1], gf4096_inv(chk_syndrome_list[0]));
+        tmp1 = gf4096_mul(chk_syndrome_list[2], gf4096_inv(chk_syndrome_list[1]));
+        tmp2 = gf4096_mul(chk_syndrome_list[3], gf4096_inv(chk_syndrome_list[2]));
+        tmp3 = gf4096_mul(chk_syndrome_list[4], gf4096_inv(chk_syndrome_list[3]));
+        tmp4 = gf4096_mul(chk_syndrome_list[5], gf4096_inv(chk_syndrome_list[4]));
+        tmp5 = gf4096_mul(chk_syndrome_list[6], gf4096_inv(chk_syndrome_list[5]));
+        tmp6 = gf4096_mul(chk_syndrome_list[7], gf4096_inv(chk_syndrome_list[6]));
+        if ((tmp0 == tmp1) & (tmp1 == tmp2) & (tmp2 == tmp3) & (tmp3 == tmp4) & (tmp4 == tmp5) & (tmp5 == tmp6)) {
+                err_info[0] = 0x1;      // encode 1-symbol error as 0x1
+                err_info[1] = err_pos(tmp0);
+                err_info[1] = (unsigned short)(0x55e - err_info[1]);
+                err_info[5] = chk_syndrome_list[0];
+                return 0;
+        } else
+                return -EINVAL;
+}
+static int chk_2_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
+{
+        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
+        unsigned short coefs[4];
+        unsigned short err_pats[4];
+        int found_num_root = 0;
+        unsigned short bit2_root0, bit2_root1;
+        unsigned short bit2_root0_inv, bit2_root1_inv;
+        unsigned short err_loc_eqn, test_root;
+        unsigned short bit2_loc0, bit2_loc1;
+        unsigned short bit2_pat0, bit2_pat1;
+        find_2x2_soln(chk_syndrome_list[1],
+                      chk_syndrome_list[0],
+                      chk_syndrome_list[2], chk_syndrome_list[1], chk_syndrome_list[2], chk_syndrome_list[3], coefs);
+        for (test_root = 0x1; test_root < 0xfff; test_root++) {
+                err_loc_eqn =
+                    gf4096_mul(coefs[1], gf4096_mul(test_root, test_root)) ^ gf4096_mul(coefs[0], test_root) ^ 0x1;
+                if (err_loc_eqn == 0x0) {
+                        if (found_num_root == 0) {
+                                bit2_root0 = test_root;
+                                found_num_root = 1;
+                        } else if (found_num_root == 1) {
+                                bit2_root1 = test_root;
+                                found_num_root = 2;
+                                break;
+                        }
+                }
+        }
+        if (found_num_root != 2)
+                return -EINVAL;
+        else {
+                bit2_root0_inv = gf4096_inv(bit2_root0);
+                bit2_root1_inv = gf4096_inv(bit2_root1);
+                find_2bit_err_pats(chk_syndrome_list[0],
+                                   chk_syndrome_list[1], bit2_root0_inv, bit2_root1_inv, err_pats);
+                bit2_pat0 = err_pats[0];
+                bit2_pat1 = err_pats[1];
+                //for(x+1)
+                tmp0 = gf4096_mul(gf4096_mul(bit2_root0_inv, bit2_root0_inv), gf4096_mul(bit2_root0_inv, bit2_root0_inv));      //rinv0^4
+                tmp1 = gf4096_mul(bit2_root0_inv, tmp0);        //rinv0^5
+                tmp2 = gf4096_mul(bit2_root0_inv, tmp1);        //rinv0^6
+                tmp3 = gf4096_mul(bit2_root0_inv, tmp2);        //rinv0^7
+                tmp4 = gf4096_mul(gf4096_mul(bit2_root1_inv, bit2_root1_inv), gf4096_mul(bit2_root1_inv, bit2_root1_inv));      //rinv1^4
+                tmp5 = gf4096_mul(bit2_root1_inv, tmp4);        //rinv1^5
+                tmp6 = gf4096_mul(bit2_root1_inv, tmp5);        //rinv1^6
+                tmp7 = gf4096_mul(bit2_root1_inv, tmp6);        //rinv1^7
+                //check if only 2-bit error
+                if ((chk_syndrome_list[4] ==
+                     (gf4096_mul(bit2_pat0, tmp0) ^
+                      gf4096_mul(bit2_pat1,
+                                 tmp4))) & (chk_syndrome_list[5] ==
+                                            (gf4096_mul(bit2_pat0, tmp1) ^
+                                             gf4096_mul(bit2_pat1,
+                                                        tmp5))) &
+                    (chk_syndrome_list[6] ==
+                     (gf4096_mul(bit2_pat0, tmp2) ^
+                      gf4096_mul(bit2_pat1,
+                                 tmp6))) & (chk_syndrome_list[7] ==
+                                            (gf4096_mul(bit2_pat0, tmp3) ^ gf4096_mul(bit2_pat1, tmp7)))) {
+                        if ((err_pos(bit2_root0_inv) == 0xfff) | (err_pos(bit2_root1_inv) == 0xfff)) {
+                                return -EINVAL;
+                        } else {
+                                bit2_loc0 = 0x55e - err_pos(bit2_root0_inv);
+                                bit2_loc1 = 0x55e - err_pos(bit2_root1_inv);
+                                err_info[0] = 0x2;      // encode 2-symbol error as 0x2
+                                err_info[1] = bit2_loc0;
+                                err_info[2] = bit2_loc1;
+                                err_info[5] = bit2_pat0;
+                                err_info[6] = bit2_pat1;
+                                return 0;
+                        }
+                } else
+                        return -EINVAL;
+        }
+}
+static int chk_3_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
+{
+        unsigned short tmp0, tmp1, tmp2, tmp3, tmp4, tmp5;
+        unsigned short coefs[4];
+        unsigned short err_pats[4];
+        int found_num_root = 0;
+        unsigned short bit3_root0, bit3_root1, bit3_root2;
+        unsigned short bit3_root0_inv, bit3_root1_inv, bit3_root2_inv;
+        unsigned short err_loc_eqn, test_root;
+        find_3bit_err_coefs(chk_syndrome_list[0], chk_syndrome_list[1],
+                            chk_syndrome_list[2], chk_syndrome_list[3],
+                            chk_syndrome_list[4], chk_syndrome_list[5], coefs);
+        for (test_root = 0x1; test_root < 0xfff; test_root++) {
+                err_loc_eqn = gf4096_mul(coefs[2],
+                                         gf4096_mul(gf4096_mul(test_root, test_root),
+                                                    test_root)) ^ gf4096_mul(coefs[1], gf4096_mul(test_root, test_root))
+                        ^ gf4096_mul(coefs[0], test_root) ^ 0x1;
+                if (err_loc_eqn == 0x0) {
+                        if (found_num_root == 0) {
+                                bit3_root0 = test_root;
+                                found_num_root = 1;
+                        } else if (found_num_root == 1) {
+                                bit3_root1 = test_root;
+                                found_num_root = 2;
+                        } else if (found_num_root == 2) {
+                                bit3_root2 = test_root;
+                                found_num_root = 3;
+                                break;
+                        }
+                }
+        }
+        if (found_num_root != 3)
+                return -EINVAL;
+        else {
+                bit3_root0_inv = gf4096_inv(bit3_root0);
+                bit3_root1_inv = gf4096_inv(bit3_root1);
+                bit3_root2_inv = gf4096_inv(bit3_root2);
+                find_3bit_err_pats(chk_syndrome_list[0], chk_syndrome_list[1],
+                                   chk_syndrome_list[2], bit3_root0_inv,
+                                   bit3_root1_inv, bit3_root2_inv, err_pats);
+                //check if only 3-bit error
+                tmp0 = gf4096_mul(bit3_root0_inv, bit3_root0_inv);
+                tmp0 = gf4096_mul(tmp0, tmp0);
+                tmp0 = gf4096_mul(tmp0, bit3_root0_inv);
+                tmp0 = gf4096_mul(tmp0, bit3_root0_inv);        //rinv0^6
+                tmp1 = gf4096_mul(tmp0, bit3_root0_inv);        //rinv0^7
+                tmp2 = gf4096_mul(bit3_root1_inv, bit3_root1_inv);
+                tmp2 = gf4096_mul(tmp2, tmp2);
+                tmp2 = gf4096_mul(tmp2, bit3_root1_inv);
+                tmp2 = gf4096_mul(tmp2, bit3_root1_inv);        //rinv1^6
+                tmp3 = gf4096_mul(tmp2, bit3_root1_inv);        //rinv1^7
+                tmp4 = gf4096_mul(bit3_root2_inv, bit3_root2_inv);
+                tmp4 = gf4096_mul(tmp4, tmp4);
+                tmp4 = gf4096_mul(tmp4, bit3_root2_inv);
+                tmp4 = gf4096_mul(tmp4, bit3_root2_inv);        //rinv2^6
+                tmp5 = gf4096_mul(tmp4, bit3_root2_inv);        //rinv2^7
+                //check if only 3 errors
+                if ((chk_syndrome_list[6] == (gf4096_mul(err_pats[0], tmp0) ^
+                                              gf4096_mul(err_pats[1], tmp2) ^
+                                              gf4096_mul(err_pats[2], tmp4))) &
+                    (chk_syndrome_list[7] == (gf4096_mul(err_pats[0], tmp1) ^
+                                              gf4096_mul(err_pats[1], tmp3) ^ gf4096_mul(err_pats[2], tmp5)))) {
+                        if ((err_pos(bit3_root0_inv) == 0xfff) |
+                            (err_pos(bit3_root1_inv) == 0xfff) | (err_pos(bit3_root2_inv) == 0xfff)) {
+                                return -EINVAL;
+                        } else {
+                                err_info[0] = 0x3;
+                                err_info[1] = (0x55e - err_pos(bit3_root0_inv));
+                                err_info[2] = (0x55e - err_pos(bit3_root1_inv));
+                                err_info[3] = (0x55e - err_pos(bit3_root2_inv));
+                                err_info[5] = err_pats[0];
+                                err_info[6] = err_pats[1];
+                                err_info[7] = err_pats[2];
+                                return 0;
+                        }
+                } else
+                        return -EINVAL;
+        }
+}
+static int chk_4_err_only(unsigned short *chk_syndrome_list, unsigned short *err_info)
+{
+        unsigned short coefs[4];
+        unsigned short err_pats[4];
+        int found_num_root = 0;
+        unsigned short bit4_root0, bit4_root1, bit4_root2, bit4_root3;
+        unsigned short bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv;
+        unsigned short err_loc_eqn, test_root;
+        find_4bit_err_coefs(chk_syndrome_list[0],
+                            chk_syndrome_list[1],
+                            chk_syndrome_list[2],
+                            chk_syndrome_list[3],
+                            chk_syndrome_list[4],
+                            chk_syndrome_list[5], chk_syndrome_list[6], chk_syndrome_list[7], coefs);
+        for (test_root = 0x1; test_root < 0xfff; test_root++) {
+                err_loc_eqn =
+                    gf4096_mul(coefs[3],
+                               gf4096_mul(gf4096_mul
+                                          (gf4096_mul(test_root, test_root),
+                                           test_root),
+                                          test_root)) ^ gf4096_mul(coefs[2],
+                                                                   gf4096_mul
+                                                                   (gf4096_mul(test_root, test_root), test_root))
+                    ^ gf4096_mul(coefs[1], gf4096_mul(test_root, test_root)) ^ gf4096_mul(coefs[0], test_root)
+                    ^ 0x1;
+                if (err_loc_eqn == 0x0) {
+                        if (found_num_root == 0) {
+                                bit4_root0 = test_root;
+                                found_num_root = 1;
+                        } else if (found_num_root == 1) {
+                                bit4_root1 = test_root;
+                                found_num_root = 2;
+                        } else if (found_num_root == 2) {
+                                bit4_root2 = test_root;
+                                found_num_root = 3;
+                        } else {
+                                found_num_root = 4;
+                                bit4_root3 = test_root;
+                                break;
+                        }
+                }
+        }
+        if (found_num_root != 4) {
+                return -EINVAL;
+        } else {
+                bit4_root0_inv = gf4096_inv(bit4_root0);
+                bit4_root1_inv = gf4096_inv(bit4_root1);
+                bit4_root2_inv = gf4096_inv(bit4_root2);
+                bit4_root3_inv = gf4096_inv(bit4_root3);
+                find_4bit_err_pats(chk_syndrome_list[0],
+                                   chk_syndrome_list[1],
+                                   chk_syndrome_list[2],
+                                   chk_syndrome_list[3],
+                                   bit4_root0_inv, bit4_root1_inv, bit4_root2_inv, bit4_root3_inv, err_pats);
+                err_info[0] = 0x4;
+                err_info[1] = (0x55e - err_pos(bit4_root0_inv));
+                err_info[2] = (0x55e - err_pos(bit4_root1_inv));
+                err_info[3] = (0x55e - err_pos(bit4_root2_inv));
+                err_info[4] = (0x55e - err_pos(bit4_root3_inv));
+                err_info[5] = err_pats[0];
+                err_info[6] = err_pats[1];
+                err_info[7] = err_pats[2];
+                err_info[8] = err_pats[3];
+                return 0;
+        }
+}
+void correct_12bit_symbol(unsigned char *buf, unsigned short sym,
+                          unsigned short val)
+{
+        if (unlikely(sym > 1366)) {
+                printk(KERN_ERR "Error: symbol %d out of range; cannot correct\n", sym);
+        } else if (sym == 0) {
+                buf[0] ^= val;
+        } else if (sym & 1) {
+                buf[1+(3*(sym-1))/2] ^= (val >> 4);
+                buf[2+(3*(sym-1))/2] ^= ((val & 0xf) << 4);
+        } else {
+                buf[2+(3*(sym-2))/2] ^= (val >> 8);
+                buf[3+(3*(sym-2))/2] ^= (val & 0xff);
+        }
+}
+static int debugecc = 0;
+module_param(debugecc, int, 0644);
+int cafe_correct_ecc(unsigned char *buf,
+                     unsigned short *chk_syndrome_list)
+{
+        unsigned short err_info[9];
+        int i;
+        if (debugecc) {
+                printk(KERN_WARNING "cafe_correct_ecc invoked. Syndromes %x %x %x %x %x %x %x %x\n",
+                       chk_syndrome_list[0], chk_syndrome_list[1],
+                       chk_syndrome_list[2], chk_syndrome_list[3],
+                       chk_syndrome_list[4], chk_syndrome_list[5],
+                       chk_syndrome_list[6], chk_syndrome_list[7]);
+                for (i=0; i < 2048; i+=16) {
+                        printk(KERN_WARNING "D %04x: %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x\n",
+                               i,
+                               buf[i], buf[i+1], buf[i+2], buf[i+3],
+                               buf[i+4], buf[i+5], buf[i+6], buf[i+7],
+                               buf[i+8], buf[i+9], buf[i+10], buf[i+11],
+                               buf[i+12], buf[i+13], buf[i+14], buf[i+15]);
+                }
+                for ( ; i < 2112; i+=16) {
+                        printk(KERN_WARNING "O   %02x: %02x %02x %02x %02x %02x %02x %02x %02x  %02x %02x %02x %02x %02x %02x %02x %02x\n",
+                               i - 2048,
+                               buf[i], buf[i+1], buf[i+2], buf[i+3],
+                               buf[i+4], buf[i+5], buf[i+6], buf[i+7],
+                               buf[i+8], buf[i+9], buf[i+10], buf[i+11],
+                               buf[i+12], buf[i+13], buf[i+14], buf[i+15]);
+                }
+        }
+        if (chk_no_err_only(chk_syndrome_list, err_info) &&
+            chk_1_err_only(chk_syndrome_list, err_info) &&
+            chk_2_err_only(chk_syndrome_list, err_info) &&
+            chk_3_err_only(chk_syndrome_list, err_info) &&
+            chk_4_err_only(chk_syndrome_list, err_info)) {
+                return -EIO;
+        }
+        for (i=0; i < err_info[0]; i++) {
+                if (debugecc)
+                        printk(KERN_WARNING "Correct symbol %d with 0x%03x\n",
+                               err_info[1+i], err_info[5+i]);
+                correct_12bit_symbol(buf, err_info[1+i], err_info[5+i]);
+        }
+        return err_info[0];
+}
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 94924d52a9b9..8296305c8297 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -11,7 +11,7 @@
 * published by the Free Software Foundation.
 *
 *  Overview:
- *   This is a device driver for the NAND flash controller found on 
+ *   This is a device driver for the NAND flash controller found on
 *   the AMD CS5535/CS5536 companion chipsets for the Geode processor.
 *
 */
@@ -303,7 +303,7 @@ static int __init cs553x_init(void)
                        err = cs553x_init_one(i, !!(val & FLSH_MEM_IO), val & 0xFFFFFFFF);
        }
-        /* Register all devices together here. This means we can easily hack it to 
+        /* Register all devices together here. This means we can easily hack it to
           do mtdconcat etc. if we want to. */
        for (i = 0; i < NR_CS553X_CONTROLLERS; i++) {
                if (cs553x_mtd[i]) {
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index 6107f532855b..12608c13cce5 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1635,13 +1635,12 @@ static int __init doc_probe(unsigned long physadr)
        len = sizeof(struct mtd_info) +
            sizeof(struct nand_chip) + sizeof(struct doc_priv) + (2 * sizeof(struct nand_bbt_descr));
-        mtd = kmalloc(len, GFP_KERNEL);
+        mtd = kzalloc(len, GFP_KERNEL);
        if (!mtd) {
                printk(KERN_ERR "DiskOnChip kmalloc (%d bytes) failed!\n", len);
                ret = -ENOMEM;
                goto fail;
        }
-        memset(mtd, 0, len);
        nand                    = (struct nand_chip *) (mtd + 1);
        doc                     = (struct doc_priv *) (nand + 1);
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 41bfcae1fbf4..dfe56e03e48b 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -362,7 +362,7 @@ static int nand_default_block_markbad(struct mtd_info *mtd, loff_t ofs)
                 * access
                 */
                ofs += mtd->oobsize;
-                chip->ops.len = 2;
+                chip->ops.len = chip->ops.ooblen = 2;
                chip->ops.datbuf = NULL;
                chip->ops.oobbuf = buf;
                chip->ops.ooboffs = chip->badblockpos & ~0x01;
@@ -755,7 +755,7 @@ static int nand_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_read_page_swecc - {REPLACABLE] software ecc based page read function
+ * nand_read_page_swecc - [REPLACABLE] software ecc based page read function
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        buffer to store read data
@@ -795,7 +795,7 @@ static int nand_read_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_read_page_hwecc - {REPLACABLE] hardware ecc based page read function
+ * nand_read_page_hwecc - [REPLACABLE] hardware ecc based page read function
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        buffer to store read data
@@ -839,7 +839,7 @@ static int nand_read_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_read_page_syndrome - {REPLACABLE] hardware ecc syndrom based page read
+ * nand_read_page_syndrome - [REPLACABLE] hardware ecc syndrom based page read
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        buffer to store read data
@@ -897,12 +897,11 @@ static int nand_read_page_syndrome(struct mtd_info *mtd, struct nand_chip *chip,
 * @chip:       nand chip structure
 * @oob:        oob destination address
 * @ops:        oob ops structure
+ * @len:        size of oob to transfer
 */
 static uint8_t *nand_transfer_oob(struct nand_chip *chip, uint8_t *oob,
-                                  struct mtd_oob_ops *ops)
+                                  struct mtd_oob_ops *ops, size_t len)
 {
-        size_t len = ops->ooblen;
        switch(ops->mode) {
        case MTD_OOB_PLACE:
@@ -960,6 +959,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
        int sndcmd = 1;
        int ret = 0;
        uint32_t readlen = ops->len;
+        uint32_t oobreadlen = ops->ooblen;
        uint8_t *bufpoi, *oob, *buf;
        stats = mtd->ecc_stats;
@@ -971,7 +971,6 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
        page = realpage & chip->pagemask;
        col = (int)(from & (mtd->writesize - 1));
-        chip->oob_poi = chip->buffers->oobrbuf;
        buf = ops->datbuf;
        oob = ops->oobbuf;
@@ -1007,10 +1006,17 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
                        if (unlikely(oob)) {
                                /* Raw mode does data:oob:data:oob */
-                                if (ops->mode != MTD_OOB_RAW)
+                                if (ops->mode != MTD_OOB_RAW) {
-                                        oob = nand_transfer_oob(chip, oob, ops);
+                                        int toread = min(oobreadlen,
-                                else
+                                                chip->ecc.layout->oobavail);
-                                        buf = nand_transfer_oob(chip, buf, ops);
+                                        if (toread) {
+                                                oob = nand_transfer_oob(chip,
+                                                        oob, ops, toread);
+                                                oobreadlen -= toread;
+                                        }
+                                } else
+                                        buf = nand_transfer_oob(chip,
+                                                buf, ops, mtd->oobsize);
                        }
                        if (!(chip->options & NAND_NO_READRDY)) {
@@ -1057,6 +1063,8 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from,
        }
        ops->retlen = ops->len - (size_t) readlen;
+        if (oob)
+                ops->oobretlen = ops->ooblen - oobreadlen;
        if (ret)
                return ret;
@@ -1257,12 +1265,18 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        int page, realpage, chipnr, sndcmd = 1;
        struct nand_chip *chip = mtd->priv;
        int blkcheck = (1 << (chip->phys_erase_shift - chip->page_shift)) - 1;
-        int readlen = ops->len;
+        int readlen = ops->ooblen;
+        int len;
        uint8_t *buf = ops->oobbuf;
        DEBUG(MTD_DEBUG_LEVEL3, "nand_read_oob: from = 0x%08Lx, len = %i\n",
              (unsigned long long)from, readlen);
+        if (ops->mode == MTD_OOB_RAW)
+                len = mtd->oobsize;
+        else
+                len = chip->ecc.layout->oobavail;
        chipnr = (int)(from >> chip->chip_shift);
        chip->select_chip(mtd, chipnr);
@@ -1270,11 +1284,11 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
        realpage = (int)(from >> chip->page_shift);
        page = realpage & chip->pagemask;
-        chip->oob_poi = chip->buffers->oobrbuf;
        while(1) {
                sndcmd = chip->ecc.read_oob(mtd, chip, page, sndcmd);
-                buf = nand_transfer_oob(chip, buf, ops);
+                len = min(len, readlen);
+                buf = nand_transfer_oob(chip, buf, ops, len);
                if (!(chip->options & NAND_NO_READRDY)) {
                        /*
@@ -1289,7 +1303,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                                nand_wait_ready(mtd);
                }
-                readlen -= ops->ooblen;
+                readlen -= len;
                if (!readlen)
                        break;
@@ -1311,7 +1325,7 @@ static int nand_do_read_oob(struct mtd_info *mtd, loff_t from,
                        sndcmd = 1;
        }
-        ops->retlen = ops->len;
+        ops->oobretlen = ops->ooblen;
        return 0;
 }
@@ -1332,7 +1346,7 @@ static int nand_read_oob(struct mtd_info *mtd, loff_t from,
        ops->retlen = 0;
        /* Do not allow reads past end of device */
-        if ((from + ops->len) > mtd->size) {
+        if (ops->datbuf && (from + ops->len) > mtd->size) {
                DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
                      "Attempt read beyond end of device\n");
                return -EINVAL;
@@ -1375,7 +1389,7 @@ static void nand_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_write_page_swecc - {REPLACABLE] software ecc based page write function
+ * nand_write_page_swecc - [REPLACABLE] software ecc based page write function
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        data buffer
@@ -1401,7 +1415,7 @@ static void nand_write_page_swecc(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_write_page_hwecc - {REPLACABLE] hardware ecc based page write function
+ * nand_write_page_hwecc - [REPLACABLE] hardware ecc based page write function
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        data buffer
@@ -1429,7 +1443,7 @@ static void nand_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *chip,
 }
 /**
- * nand_write_page_syndrome - {REPLACABLE] hardware ecc syndrom based page write
+ * nand_write_page_syndrome - [REPLACABLE] hardware ecc syndrom based page write
 * @mtd:        mtd info structure
 * @chip:       nand chip info structure
 * @buf:        data buffer
@@ -1577,7 +1591,7 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
        return NULL;
 }
-#define NOTALIGNED(x) (x & (mtd->writesize-1)) != 0
+#define NOTALIGNED(x)   (x & (chip->subpagesize - 1)) != 0
 /**
 * nand_do_write_ops - [Internal] NAND write with ECC
@@ -1590,15 +1604,16 @@ static uint8_t *nand_fill_oob(struct nand_chip *chip, uint8_t *oob,
 static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                             struct mtd_oob_ops *ops)
 {
-        int chipnr, realpage, page, blockmask;
+        int chipnr, realpage, page, blockmask, column;
        struct nand_chip *chip = mtd->priv;
        uint32_t writelen = ops->len;
        uint8_t *oob = ops->oobbuf;
        uint8_t *buf = ops->datbuf;
-        int bytes = mtd->writesize;
+        int ret, subpage;
-        int ret;
        ops->retlen = 0;
+        if (!writelen)
+                return 0;
        /* reject writes, which are not page aligned */
        if (NOTALIGNED(to) || NOTALIGNED(ops->len)) {
@@ -1607,8 +1622,11 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                return -EINVAL;
        }
-        if (!writelen)
+        column = to & (mtd->writesize - 1);
-                return 0;
+        subpage = column || (writelen & (mtd->writesize - 1));
+        if (subpage && oob)
+                return -EINVAL;
        chipnr = (int)(to >> chip->chip_shift);
        chip->select_chip(mtd, chipnr);
@@ -1626,15 +1644,29 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
            (chip->pagebuf << chip->page_shift) < (to + ops->len))
                chip->pagebuf = -1;
-        chip->oob_poi = chip->buffers->oobwbuf;
+        /* If we're not given explicit OOB data, let it be 0xFF */
+        if (likely(!oob))
+                memset(chip->oob_poi, 0xff, mtd->oobsize);
        while(1) {
+                int bytes = mtd->writesize;
                int cached = writelen > bytes && page != blockmask;
+                uint8_t *wbuf = buf;
+                /* Partial page write ? */
+                if (unlikely(column || writelen < (mtd->writesize - 1))) {
+                        cached = 0;
+                        bytes = min_t(int, bytes - column, (int) writelen);
+                        chip->pagebuf = -1;
+                        memset(chip->buffers->databuf, 0xff, mtd->writesize);
+                        memcpy(&chip->buffers->databuf[column], buf, bytes);
+                        wbuf = chip->buffers->databuf;
+                }
                if (unlikely(oob))
                        oob = nand_fill_oob(chip, oob, ops);
-                ret = chip->write_page(mtd, chip, buf, page, cached,
+                ret = chip->write_page(mtd, chip, wbuf, page, cached,
                                       (ops->mode == MTD_OOB_RAW));
                if (ret)
                        break;
@@ -1643,6 +1675,7 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                if (!writelen)
                        break;
+                column = 0;
                buf += bytes;
                realpage++;
@@ -1655,10 +1688,9 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
                }
        }
-        if (unlikely(oob))
-                memset(chip->oob_poi, 0xff, mtd->oobsize);
        ops->retlen = ops->len - writelen;
+        if (unlikely(oob))
+                ops->oobretlen = ops->ooblen;
        return ret;
 }
@@ -1714,10 +1746,10 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
        struct nand_chip *chip = mtd->priv;
        DEBUG(MTD_DEBUG_LEVEL3, "nand_write_oob: to = 0x%08x, len = %i\n",
-              (unsigned int)to, (int)ops->len);
+              (unsigned int)to, (int)ops->ooblen);
        /* Do not allow write past end of page */
-        if ((ops->ooboffs + ops->len) > mtd->oobsize) {
+        if ((ops->ooboffs + ops->ooblen) > mtd->oobsize) {
                DEBUG(MTD_DEBUG_LEVEL0, "nand_write_oob: "
                      "Attempt to write past end of page\n");
                return -EINVAL;
@@ -1745,7 +1777,6 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
        if (page == chip->pagebuf)
                chip->pagebuf = -1;
-        chip->oob_poi = chip->buffers->oobwbuf;
        memset(chip->oob_poi, 0xff, mtd->oobsize);
        nand_fill_oob(chip, ops->oobbuf, ops);
        status = chip->ecc.write_oob(mtd, chip, page & chip->pagemask);
@@ -1754,7 +1785,7 @@ static int nand_do_write_oob(struct mtd_info *mtd, loff_t to,
        if (status)
                return status;
-        ops->retlen = ops->len;
+        ops->oobretlen = ops->ooblen;
        return 0;
 }
@@ -1774,7 +1805,7 @@ static int nand_write_oob(struct mtd_info *mtd, loff_t to,
        ops->retlen = 0;
        /* Do not allow writes past end of device */
-        if ((to + ops->len) > mtd->size) {
+        if (ops->datbuf && (to + ops->len) > mtd->size) {
                DEBUG(MTD_DEBUG_LEVEL0, "nand_read_oob: "
                      "Attempt read beyond end of device\n");
                return -EINVAL;
@@ -2188,8 +2219,8 @@ static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
        /* Newer devices have all the information in additional id bytes */
        if (!type->pagesize) {
                int extid;
-                /* The 3rd id byte contains non relevant data ATM */
+                /* The 3rd id byte holds MLC / multichip data */
-                extid = chip->read_byte(mtd);
+                chip->cellinfo = chip->read_byte(mtd);
                /* The 4th id byte is the important one */
                extid = chip->read_byte(mtd);
                /* Calc pagesize */
@@ -2349,8 +2380,8 @@ int nand_scan_tail(struct mtd_info *mtd)
        if (!chip->buffers)
                return -ENOMEM;
-        /* Preset the internal oob write buffer */
+        /* Set the internal oob buffer location, just after the page data */
-        memset(chip->buffers->oobwbuf, 0xff, mtd->oobsize);
+        chip->oob_poi = chip->buffers->databuf + mtd->writesize;
        /*
         * If no default placement scheme is given, select an appropriate one
@@ -2469,6 +2500,24 @@ int nand_scan_tail(struct mtd_info *mtd)
        }
        chip->ecc.total = chip->ecc.steps * chip->ecc.bytes;
+        /*
+         * Allow subpage writes up to ecc.steps. Not possible for MLC
+         * FLASH.
+         */
+        if (!(chip->options & NAND_NO_SUBPAGE_WRITE) &&
+            !(chip->cellinfo & NAND_CI_CELLTYPE_MSK)) {
+                switch(chip->ecc.steps) {
+                case 2:
+                        mtd->subpage_sft = 1;
+                        break;
+                case 4:
+                case 8:
+                        mtd->subpage_sft = 2;
+                        break;
+                }
+        }
+        chip->subpagesize = mtd->writesize >> mtd->subpage_sft;
        /* Initialize state */
        chip->state = FL_READY;
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 9402653eb09b..5e121ceaa598 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -333,7 +333,6 @@ static int scan_block_fast(struct mtd_info *mtd, struct nand_bbt_descr *bd,
        struct mtd_oob_ops ops;
        int j, ret;
-        ops.len = mtd->oobsize;
        ops.ooblen = mtd->oobsize;
        ops.oobbuf = buf;
        ops.ooboffs = 0;
@@ -676,10 +675,10 @@ static int write_bbt(struct mtd_info *mtd, uint8_t *buf,
                                       "bad block table\n");
                        }
                        /* Read oob data */
-                        ops.len = (len >> this->page_shift) * mtd->oobsize;
+                        ops.ooblen = (len >> this->page_shift) * mtd->oobsize;
                        ops.oobbuf = &buf[len];
                        res = mtd->read_oob(mtd, to + mtd->writesize, &ops);
-                        if (res < 0 || ops.retlen != ops.len)
+                        if (res < 0 || ops.oobretlen != ops.ooblen)
                                goto outerr;
                        /* Calc the byte offset in the buffer */
@@ -961,14 +960,12 @@ int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        struct nand_bbt_descr *md = this->bbt_md;
        len = mtd->size >> (this->bbt_erase_shift + 2);
-        /* Allocate memory (2bit per block) */
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
-        this->bbt = kmalloc(len, GFP_KERNEL);
+        this->bbt = kzalloc(len, GFP_KERNEL);
        if (!this->bbt) {
                printk(KERN_ERR "nand_scan_bbt: Out of memory\n");
                return -ENOMEM;
        }
-        /* Clear the memory bad block table */
-        memset(this->bbt, 0x00, len);
        /* If no primary table decriptor is given, scan the device
         * to build a memory based bad block table
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index dd438ca47d9a..fde593e5e634 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -112,7 +112,7 @@ int nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
        tmp2 |= (reg2 & 0x01) << 0; /* B7 -> B0 */
        /* Calculate final ECC code */
-#ifdef CONFIG_NAND_ECC_SMC
+#ifdef CONFIG_MTD_NAND_ECC_SMC
        ecc_code[0] = ~tmp2;
        ecc_code[1] = ~tmp1;
 #else
@@ -148,7 +148,7 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat,
 {
        uint8_t s0, s1, s2;
-#ifdef CONFIG_NAND_ECC_SMC
+#ifdef CONFIG_MTD_NAND_ECC_SMC
        s0 = calc_ecc[0] ^ read_ecc[0];
        s1 = calc_ecc[1] ^ read_ecc[1];
        s2 = calc_ecc[2] ^ read_ecc[2];
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 545ff252d81e..c3bca9590ad2 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -37,10 +37,6 @@
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#ifdef CONFIG_NS_ABS_POS
-#include <asm/io.h>
-#endif
 /* Default simulator parameters values */
 #if !defined(CONFIG_NANDSIM_FIRST_ID_BYTE)  || \
@@ -164,7 +160,7 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
 /* After a command is input, the simulator goes to one of the following states */
 #define STATE_CMD_READ0        0x00000001 /* read data from the beginning of page */
 #define STATE_CMD_READ1        0x00000002 /* read data from the second half of page */
-#define STATE_CMD_READSTART      0x00000003 /* read data second command (large page devices) */
+#define STATE_CMD_READSTART    0x00000003 /* read data second command (large page devices) */
 #define STATE_CMD_PAGEPROG     0x00000004 /* start page programm */
 #define STATE_CMD_READOOB      0x00000005 /* read OOB area */
 #define STATE_CMD_ERASE1       0x00000006 /* sector erase first command */
@@ -231,6 +227,14 @@ MODULE_PARM_DESC(dbg,            "Output debug information if not zero");
 #define NS_MAX_PREVSTATES 1
 /*
+ * A union to represent flash memory contents and flash buffer.
+ */
+union ns_mem {
+        u_char *byte;    /* for byte access */
+        uint16_t *word;  /* for 16-bit word access */
+};
+/*
 * The structure which describes all the internal simulator data.
 */
 struct nandsim {
@@ -247,17 +251,11 @@ struct nandsim {
        uint16_t npstates;      /* number of previous states saved */
        uint16_t stateidx;      /* current state index */
-        /* The simulated NAND flash image */
+        /* The simulated NAND flash pages array */
-        union flash_media {
+        union ns_mem *pages;
-                u_char *byte;
-                uint16_t    *word;
-        } mem;
        /* Internal buffer of page + OOB size bytes */
-        union internal_buffer {
+        union ns_mem buf;
-                u_char *byte;    /* for byte access */
-                uint16_t *word;  /* for 16-bit word access */
-        } buf;
        /* NAND flash "geometry" */
        struct nandsin_geometry {
@@ -346,12 +344,49 @@ static struct mtd_info *nsmtd;
 static u_char ns_verify_buf[NS_LARGEST_PAGE_SIZE];
 /*
+ * Allocate array of page pointers and initialize the array to NULL
+ * pointers.
+ *
+ * RETURNS: 0 if success, -ENOMEM if memory alloc fails.
+ */
+static int alloc_device(struct nandsim *ns)
+{
+        int i;
+        ns->pages = vmalloc(ns->geom.pgnum * sizeof(union ns_mem));
+        if (!ns->pages) {
+                NS_ERR("alloc_map: unable to allocate page array\n");
+                return -ENOMEM;
+        }
+        for (i = 0; i < ns->geom.pgnum; i++) {
+                ns->pages[i].byte = NULL;
+        }
+        return 0;
+}
+/*
+ * Free any allocated pages, and free the array of page pointers.
+ */
+static void free_device(struct nandsim *ns)
+{
+        int i;
+        if (ns->pages) {
+                for (i = 0; i < ns->geom.pgnum; i++) {
+                        if (ns->pages[i].byte)
+                                kfree(ns->pages[i].byte);
+                }
+                vfree(ns->pages);
+        }
+}
+/*
 * Initialize the nandsim structure.
 *
 * RETURNS: 0 if success, -ERRNO if failure.
 */
-static int
+static int init_nandsim(struct mtd_info *mtd)
-init_nandsim(struct mtd_info *mtd)
 {
        struct nand_chip *chip = (struct nand_chip *)mtd->priv;
        struct nandsim   *ns   = (struct nandsim *)(chip->priv);
@@ -405,7 +440,7 @@ init_nandsim(struct mtd_info *mtd)
                }
        } else {
                if (ns->geom.totsz <= (128 << 20)) {
-                        ns->geom.pgaddrbytes  = 5;
+                        ns->geom.pgaddrbytes  = 4;
                        ns->geom.secaddrbytes = 2;
                } else {
                        ns->geom.pgaddrbytes  = 5;
@@ -439,23 +474,8 @@ init_nandsim(struct mtd_info *mtd)
        printk("sector address bytes: %u\n",    ns->geom.secaddrbytes);
        printk("options: %#x\n",                ns->options);
-        /* Map / allocate and initialize the flash image */
+        if (alloc_device(ns) != 0)
-#ifdef CONFIG_NS_ABS_POS
+                goto error;
-        ns->mem.byte = ioremap(CONFIG_NS_ABS_POS, ns->geom.totszoob);
-        if (!ns->mem.byte) {
-                NS_ERR("init_nandsim: failed to map the NAND flash image at address %p\n",
-                        (void *)CONFIG_NS_ABS_POS);
-                return -ENOMEM;
-        }
-#else
-        ns->mem.byte = vmalloc(ns->geom.totszoob);
-        if (!ns->mem.byte) {
-                NS_ERR("init_nandsim: unable to allocate %u bytes for flash image\n",
-                        ns->geom.totszoob);
-                return -ENOMEM;
-        }
-        memset(ns->mem.byte, 0xFF, ns->geom.totszoob);
-#endif
        /* Allocate / initialize the internal buffer */
        ns->buf.byte = kmalloc(ns->geom.pgszoob, GFP_KERNEL);
@@ -474,11 +494,7 @@ init_nandsim(struct mtd_info *mtd)
        return 0;
 error:
-#ifdef CONFIG_NS_ABS_POS
+        free_device(ns);
-        iounmap(ns->mem.byte);
-#else
-        vfree(ns->mem.byte);
-#endif
        return -ENOMEM;
 }
@@ -486,16 +502,10 @@ error:
 /*
 * Free the nandsim structure.
 */
-static void
+static void free_nandsim(struct nandsim *ns)
-free_nandsim(struct nandsim *ns)
 {
        kfree(ns->buf.byte);
+        free_device(ns);
-#ifdef CONFIG_NS_ABS_POS
-        iounmap(ns->mem.byte);
-#else
-        vfree(ns->mem.byte);
-#endif
        return;
 }
@@ -503,8 +513,7 @@ free_nandsim(struct nandsim *ns)
 /*
 * Returns the string representation of 'state' state.
 */
-static char *
+static char *get_state_name(uint32_t state)
-get_state_name(uint32_t state)
 {
        switch (NS_STATE(state)) {
                case STATE_CMD_READ0:
@@ -562,8 +571,7 @@ get_state_name(uint32_t state)
 *
 * RETURNS: 1 if wrong command, 0 if right.
 */
-static int
+static int check_command(int cmd)
-check_command(int cmd)
 {
        switch (cmd) {
@@ -589,8 +597,7 @@ check_command(int cmd)
 /*
 * Returns state after command is accepted by command number.
 */
-static uint32_t
+static uint32_t get_state_by_command(unsigned command)
-get_state_by_command(unsigned command)
 {
        switch (command) {
                case NAND_CMD_READ0:
@@ -626,8 +633,7 @@ get_state_by_command(unsigned command)
 /*
 * Move an address byte to the correspondent internal register.
 */
-static inline void
+static inline void accept_addr_byte(struct nandsim *ns, u_char bt)
-accept_addr_byte(struct nandsim *ns, u_char bt)
 {
        uint byte = (uint)bt;
@@ -645,8 +651,7 @@ accept_addr_byte(struct nandsim *ns, u_char bt)
 /*
 * Switch to STATE_READY state.
 */
-static inline void
+static inline void switch_to_ready_state(struct nandsim *ns, u_char status)
-switch_to_ready_state(struct nandsim *ns, u_char status)
 {
        NS_DBG("switch_to_ready_state: switch to %s state\n", get_state_name(STATE_READY));
@@ -705,8 +710,7 @@ switch_to_ready_state(struct nandsim *ns, u_char status)
 *          -1 - several matches.
 *           0 - operation is found.
 */
-static int
+static int find_operation(struct nandsim *ns, uint32_t flag)
-find_operation(struct nandsim *ns, uint32_t flag)
 {
        int opsfound = 0;
        int i, j, idx = 0;
@@ -791,14 +795,93 @@ find_operation(struct nandsim *ns, uint32_t flag)
 }
 /*
+ * Returns a pointer to the current page.
+ */
+static inline union ns_mem *NS_GET_PAGE(struct nandsim *ns)
+{
+        return &(ns->pages[ns->regs.row]);
+}
+/*
+ * Retuns a pointer to the current byte, within the current page.
+ */
+static inline u_char *NS_PAGE_BYTE_OFF(struct nandsim *ns)
+{
+        return NS_GET_PAGE(ns)->byte + ns->regs.column + ns->regs.off;
+}
+/*
+ * Fill the NAND buffer with data read from the specified page.
+ */
+static void read_page(struct nandsim *ns, int num)
+{
+        union ns_mem *mypage;
+        mypage = NS_GET_PAGE(ns);
+        if (mypage->byte == NULL) {
+                NS_DBG("read_page: page %d not allocated\n", ns->regs.row);
+                memset(ns->buf.byte, 0xFF, num);
+        } else {
+                NS_DBG("read_page: page %d allocated, reading from %d\n",
+                        ns->regs.row, ns->regs.column + ns->regs.off);
+                memcpy(ns->buf.byte, NS_PAGE_BYTE_OFF(ns), num);
+        }
+}
+/*
+ * Erase all pages in the specified sector.
+ */
+static void erase_sector(struct nandsim *ns)
+{
+        union ns_mem *mypage;
+        int i;
+        mypage = NS_GET_PAGE(ns);
+        for (i = 0; i < ns->geom.pgsec; i++) {
+                if (mypage->byte != NULL) {
+                        NS_DBG("erase_sector: freeing page %d\n", ns->regs.row+i);
+                        kfree(mypage->byte);
+                        mypage->byte = NULL;
+                }
+                mypage++;
+        }
+}
+/*
+ * Program the specified page with the contents from the NAND buffer.
+ */
+static int prog_page(struct nandsim *ns, int num)
+{
+        int i;
+        union ns_mem *mypage;
+        u_char *pg_off;
+        mypage = NS_GET_PAGE(ns);
+        if (mypage->byte == NULL) {
+                NS_DBG("prog_page: allocating page %d\n", ns->regs.row);
+                mypage->byte = kmalloc(ns->geom.pgszoob, GFP_KERNEL);
+                if (mypage->byte == NULL) {
+                        NS_ERR("prog_page: error allocating memory for page %d\n", ns->regs.row);
+                        return -1;
+                }
+                memset(mypage->byte, 0xFF, ns->geom.pgszoob);
+        }
+        pg_off = NS_PAGE_BYTE_OFF(ns);
+        for (i = 0; i < num; i++)
+                pg_off[i] &= ns->buf.byte[i];
+        return 0;
+}
+/*
 * If state has any action bit, perform this action.
 *
 * RETURNS: 0 if success, -1 if error.
 */
-static int
+static int do_state_action(struct nandsim *ns, uint32_t action)
-do_state_action(struct nandsim *ns, uint32_t action)
 {
-        int i, num;
+        int num;
        int busdiv = ns->busw == 8 ? 1 : 2;
        action &= ACTION_MASK;
@@ -822,7 +905,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
                        break;
                }
                num = ns->geom.pgszoob - ns->regs.off - ns->regs.column;
-                memcpy(ns->buf.byte, ns->mem.byte + NS_RAW_OFFSET(ns) + ns->regs.off, num);
+                read_page(ns, num);
                NS_DBG("do_state_action: (ACTION_CPY:) copy %d bytes to int buf, raw offset %d\n",
                        num, NS_RAW_OFFSET(ns) + ns->regs.off);
@@ -863,7 +946,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
                                ns->regs.row, NS_RAW_OFFSET(ns));
                NS_LOG("erase sector %d\n", ns->regs.row >> (ns->geom.secshift - ns->geom.pgshift));
-                memset(ns->mem.byte + NS_RAW_OFFSET(ns), 0xFF, ns->geom.secszoob);
+                erase_sector(ns);
                NS_MDELAY(erase_delay);
@@ -886,8 +969,8 @@ do_state_action(struct nandsim *ns, uint32_t action)
                        return -1;
                }
-                for (i = 0; i < num; i++)
+                if (prog_page(ns, num) == -1)
-                        ns->mem.byte[NS_RAW_OFFSET(ns) + ns->regs.off + i] &= ns->buf.byte[i];
+                        return -1;
                NS_DBG("do_state_action: copy %d bytes from int buf to (%#x, %#x), raw off = %d\n",
                        num, ns->regs.row, ns->regs.column, NS_RAW_OFFSET(ns) + ns->regs.off);
@@ -928,8 +1011,7 @@ do_state_action(struct nandsim *ns, uint32_t action)
 /*
 * Switch simulator's state.
 */
-static void
+static void switch_state(struct nandsim *ns)
-switch_state(struct nandsim *ns)
 {
        if (ns->op) {
                /*
@@ -1070,8 +1152,7 @@ switch_state(struct nandsim *ns)
        }
 }
-static u_char
+static u_char ns_nand_read_byte(struct mtd_info *mtd)
-ns_nand_read_byte(struct mtd_info *mtd)
 {
        struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
        u_char outb = 0x00;
@@ -1144,8 +1225,7 @@ ns_nand_read_byte(struct mtd_info *mtd)
        return outb;
 }
-static void
+static void ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
-ns_nand_write_byte(struct mtd_info *mtd, u_char byte)
 {
        struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1308,15 +1388,13 @@ static void ns_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int bitmask)
                ns_nand_write_byte(mtd, cmd);
 }
-static int
+static int ns_device_ready(struct mtd_info *mtd)
-ns_device_ready(struct mtd_info *mtd)
 {
        NS_DBG("device_ready\n");
        return 1;
 }
-static uint16_t
+static uint16_t ns_nand_read_word(struct mtd_info *mtd)
-ns_nand_read_word(struct mtd_info *mtd)
 {
        struct nand_chip *chip = (struct nand_chip *)mtd->priv;
@@ -1325,8 +1403,7 @@ ns_nand_read_word(struct mtd_info *mtd)
        return chip->read_byte(mtd) | (chip->read_byte(mtd) << 8);
 }
-static void
+static void ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
-ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
        struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1353,8 +1430,7 @@ ns_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
        }
 }
-static void
+static void ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
-ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 {
        struct nandsim *ns = (struct nandsim *)((struct nand_chip *)mtd->priv)->priv;
@@ -1407,8 +1483,7 @@ ns_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
        return;
 }
-static int
+static int ns_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-ns_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
        ns_nand_read_buf(mtd, (u_char *)&ns_verify_buf[0], len);
@@ -1436,14 +1511,12 @@ static int __init ns_init_module(void)
        }
        /* Allocate and initialize mtd_info, nand_chip and nandsim structures */
-        nsmtd = kmalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
+        nsmtd = kzalloc(sizeof(struct mtd_info) + sizeof(struct nand_chip)
                                + sizeof(struct nandsim), GFP_KERNEL);
        if (!nsmtd) {
                NS_ERR("unable to allocate core structures.\n");
                return -ENOMEM;
        }
-        memset(nsmtd, 0, sizeof(struct mtd_info) + sizeof(struct nand_chip) +
-                        sizeof(struct nandsim));
        chip        = (struct nand_chip *)(nsmtd + 1);
        nsmtd->priv = (void *)chip;
        nand        = (struct nandsim *)(chip + 1);
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 039c759cfbfc..fd7a8d5ba29a 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -56,7 +56,7 @@ static void ndfc_select_chip(struct mtd_info *mtd, int chip)
                ccr |= NDFC_CCR_BS(chip + pchip->chip_offset);
        } else
                ccr |= NDFC_CCR_RESET_CE;
-        writel(ccr, ndfc->ndfcbase + NDFC_CCR);
+        __raw_writel(ccr, ndfc->ndfcbase + NDFC_CCR);
 }
 static void ndfc_hwcontrol(struct mtd_info *mtd, int cmd, unsigned int ctrl)
diff --git a/drivers/mtd/nand/rtc_from4.c b/drivers/mtd/nand/rtc_from4.c
index f8c49645324d..9189ec8f243e 100644
--- a/drivers/mtd/nand/rtc_from4.c
+++ b/drivers/mtd/nand/rtc_from4.c
@@ -24,6 +24,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/rslib.h>
+#include <linux/bitrev.h>
 #include <linux/module.h>
 #include <linux/mtd/compatmac.h>
 #include <linux/mtd/mtd.h>
@@ -152,47 +153,6 @@ static struct nand_ecclayout rtc_from4_nand_oobinfo = {
        .oobfree = {{32, 32}}
 };
-/* Aargh. I missed the reversed bit order, when I
- * was talking to Renesas about the FPGA.
- *
- * The table is used for bit reordering and inversion
- * of the ecc byte which we get from the FPGA
- */
-static uint8_t revbits[256] = {
-        0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0,
-        0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0,
-        0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8,
-        0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8,
-        0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4,
-        0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4,
-        0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec,
-        0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc,
-        0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2,
-        0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2,
-        0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea,
-        0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa,
-        0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6,
-        0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6,
-        0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee,
-        0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe,
-        0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1,
-        0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1,
-        0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9,
-        0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9,
-        0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5,
-        0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5,
-        0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed,
-        0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd,
-        0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3,
-        0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3,
-        0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb,
-        0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb,
-        0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7,
-        0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7,
-        0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef,
-        0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff,
-};
 #endif
 /*
@@ -397,7 +357,7 @@ static int rtc_from4_correct_data(struct mtd_info *mtd, const u_char *buf, u_cha
        /* Read the syndrom pattern from the FPGA and correct the bitorder */
        rs_ecc = (volatile unsigned short *)(rtc_from4_fio_base + RTC_FROM4_RS_ECC);
        for (i = 0; i < 8; i++) {
-                ecc[i] = revbits[(*rs_ecc) & 0xFF];
+                ecc[i] = bitrev8(*rs_ecc);
                rs_ecc++;
        }
@@ -496,7 +456,7 @@ static int rtc_from4_errstat(struct mtd_info *mtd, struct nand_chip *this,
                rtn = nand_do_read(mtd, page, len, &retlen, buf);
                /* if read failed or > 1-bit error corrected */
-                if (rtn || (mtd->ecc_stats.corrected - corrected) > 1) {
+                if (rtn || (mtd->ecc_stats.corrected - corrected) > 1)
                        er_stat |= 1 << 1;
                kfree(buf);
        }
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index ff5cef24d5bb..8b3203571eeb 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -283,7 +283,7 @@ static void s3c2410_nand_hwcontrol(struct mtd_info *mtd, int cmd,
                                   unsigned int ctrl)
 {
        struct s3c2410_nand_info *info = s3c2410_nand_mtd_toinfo(mtd);
-        
        if (cmd == NAND_CMD_NONE)
                return;
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index b5a5f8da4722..4b1ba4fcfcd3 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -57,17 +57,16 @@ static void nftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
        DEBUG(MTD_DEBUG_LEVEL1, "NFTL: add_mtd for %s\n", mtd->name);
-        nftl = kmalloc(sizeof(struct NFTLrecord), GFP_KERNEL);
+        nftl = kzalloc(sizeof(struct NFTLrecord), GFP_KERNEL);
        if (!nftl) {
                printk(KERN_WARNING "NFTL: out of memory for data structures\n");
                return;
        }
-        memset(nftl, 0, sizeof(*nftl));
        nftl->mbd.mtd = mtd;
        nftl->mbd.devnum = -1;
-        nftl->mbd.blksize = 512;
        nftl->mbd.tr = tr;
        if (NFTL_mount(nftl) < 0) {
@@ -147,10 +146,9 @@ int nftl_read_oob(struct mtd_info *mtd, loff_t offs, size_t len,
        ops.ooblen = len;
        ops.oobbuf = buf;
        ops.datbuf = NULL;
-        ops.len = len;
        res = mtd->read_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
-        *retlen = ops.retlen;
+        *retlen = ops.oobretlen;
        return res;
 }
@@ -168,10 +166,9 @@ int nftl_write_oob(struct mtd_info *mtd, loff_t offs, size_t len,
        ops.ooblen = len;
        ops.oobbuf = buf;
        ops.datbuf = NULL;
-        ops.len = len;
        res = mtd->write_oob(mtd, offs & ~(mtd->writesize - 1), &ops);
-        *retlen = ops.retlen;
+        *retlen = ops.oobretlen;
        return res;
 }
@@ -797,6 +794,7 @@ static struct mtd_blktrans_ops nftl_tr = {
        .name           = "nftl",
        .major          = NFTL_MAJOR,
        .part_bits      = NFTL_PARTN_BITS,
+        .blksize        = 512,
        .getgeo         = nftl_getgeo,
        .readsect       = nftl_readblock,
 #ifdef CONFIG_NFTL_RW
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index af06a80f44de..3d44d040a47d 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -45,12 +45,10 @@ static int __devinit generic_onenand_probe(struct device *dev)
        unsigned long size = res->end - res->start + 1;
        int err;
-        info = kmalloc(sizeof(struct onenand_info), GFP_KERNEL);
+        info = kzalloc(sizeof(struct onenand_info), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-        memset(info, 0, sizeof(struct onenand_info));
        if (!request_mem_region(res->start, size, dev->driver->name)) {
                err = -EBUSY;
                goto out_free_info;
@@ -63,6 +61,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
        }
        info->onenand.mmcontrol = pdata->mmcontrol;
+        info->onenand.irq = platform_get_irq(pdev, 0);
        info->mtd.name = pdev->dev.bus_id;
        info->mtd.priv = &info->onenand;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 8ed68b28afe3..2da6bb26353e 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/interrupt.h>
 #include <linux/jiffies.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
@@ -191,8 +192,6 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
        struct onenand_chip *this = mtd->priv;
        int value, readcmd = 0, block_cmd = 0;
        int block, page;
-        /* Now we use page size operation */
-        int sectors = 4, count = 4;
        /* Address translation */
        switch (cmd) {
@@ -244,6 +243,8 @@ static int onenand_command(struct mtd_info *mtd, int cmd, loff_t addr, size_t le
        }
        if (page != -1) {
+                /* Now we use page size operation */
+                int sectors = 4, count = 4;
                int dataram;
                switch (cmd) {
@@ -297,7 +298,7 @@ static int onenand_wait(struct mtd_info *mtd, int state)
        unsigned long timeout;
        unsigned int flags = ONENAND_INT_MASTER;
        unsigned int interrupt = 0;
-        unsigned int ctrl, ecc;
+        unsigned int ctrl;
        /* The 20 msec is enough */
        timeout = jiffies + msecs_to_jiffies(20);
@@ -309,7 +310,6 @@ static int onenand_wait(struct mtd_info *mtd, int state)
                if (state != FL_READING)
                        cond_resched();
-                touch_softlockup_watchdog();
        }
        /* To get correct interrupt status in timeout case */
        interrupt = this->read_word(this->base + ONENAND_REG_INTERRUPT);
@@ -317,28 +317,126 @@ static int onenand_wait(struct mtd_info *mtd, int state)
        ctrl = this->read_word(this->base + ONENAND_REG_CTRL_STATUS);
        if (ctrl & ONENAND_CTRL_ERROR) {
-                /* It maybe occur at initial bad block */
                DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: controller error = 0x%04x\n", ctrl);
-                /* Clear other interrupt bits for preventing ECC error */
+                if (ctrl & ONENAND_CTRL_LOCK)
-                interrupt &= ONENAND_INT_MASTER;
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error.\n");
-        }
+                return ctrl;
-        if (ctrl & ONENAND_CTRL_LOCK) {
-                DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: it's locked error = 0x%04x\n", ctrl);
-                return -EACCES;
        }
        if (interrupt & ONENAND_INT_READ) {
-                ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS);
+                int ecc = this->read_word(this->base + ONENAND_REG_ECC_STATUS);
-                if (ecc & ONENAND_ECC_2BIT_ALL) {
+                if (ecc) {
                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_wait: ECC error = 0x%04x\n", ecc);
-                        return -EBADMSG;
+                        if (ecc & ONENAND_ECC_2BIT_ALL) {
+                                mtd->ecc_stats.failed++;
+                                return ecc;
+                        } else if (ecc & ONENAND_ECC_1BIT_ALL)
+                                mtd->ecc_stats.corrected++;
                }
        }
        return 0;
 }
+/*
+ * onenand_interrupt - [DEFAULT] onenand interrupt handler
+ * @param irq           onenand interrupt number
+ * @param dev_id        interrupt data
+ *
+ * complete the work
+ */
+static irqreturn_t onenand_interrupt(int irq, void *data)
+{
+        struct onenand_chip *this = (struct onenand_chip *) data;
+        /* To handle shared interrupt */
+        if (!this->complete.done)
+                complete(&this->complete);
+        return IRQ_HANDLED;
+}
+/*
+ * onenand_interrupt_wait - [DEFAULT] wait until the command is done
+ * @param mtd           MTD device structure
+ * @param state         state to select the max. timeout value
+ *
+ * Wait for command done.
+ */
+static int onenand_interrupt_wait(struct mtd_info *mtd, int state)
+{
+        struct onenand_chip *this = mtd->priv;
+        wait_for_completion(&this->complete);
+        return onenand_wait(mtd, state);
+}
+/*
+ * onenand_try_interrupt_wait - [DEFAULT] try interrupt wait
+ * @param mtd           MTD device structure
+ * @param state         state to select the max. timeout value
+ *
+ * Try interrupt based wait (It is used one-time)
+ */
+static int onenand_try_interrupt_wait(struct mtd_info *mtd, int state)
+{
+        struct onenand_chip *this = mtd->priv;
+        unsigned long remain, timeout;
+        /* We use interrupt wait first */
+        this->wait = onenand_interrupt_wait;
+        timeout = msecs_to_jiffies(100);
+        remain = wait_for_completion_timeout(&this->complete, timeout);
+        if (!remain) {
+                printk(KERN_INFO "OneNAND: There's no interrupt. "
+                                "We use the normal wait\n");
+                /* Release the irq */
+                free_irq(this->irq, this);
+                this->wait = onenand_wait;
+        }
+        return onenand_wait(mtd, state);
+}
+/*
+ * onenand_setup_wait - [OneNAND Interface] setup onenand wait method
+ * @param mtd           MTD device structure
+ *
+ * There's two method to wait onenand work
+ * 1. polling - read interrupt status register
+ * 2. interrupt - use the kernel interrupt method
+ */
+static void onenand_setup_wait(struct mtd_info *mtd)
+{
+        struct onenand_chip *this = mtd->priv;
+        int syscfg;
+        init_completion(&this->complete);
+        if (this->irq <= 0) {
+                this->wait = onenand_wait;
+                return;
+        }
+        if (request_irq(this->irq, &onenand_interrupt,
+                                IRQF_SHARED, "onenand", this)) {
+                /* If we can't get irq, use the normal wait */
+                this->wait = onenand_wait;
+                return;
+        }
+        /* Enable interrupt */
+        syscfg = this->read_word(this->base + ONENAND_REG_SYS_CFG1);
+        syscfg |= ONENAND_SYS_CFG1_IOBE;
+        this->write_word(syscfg, this->base + ONENAND_REG_SYS_CFG1);
+        this->wait = onenand_try_interrupt_wait;
+}
 /**
 * onenand_bufferram_offset - [DEFAULT] BufferRAM offset
 * @param mtd           MTD data structure
@@ -609,9 +707,10 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
        size_t *retlen, u_char *buf)
 {
        struct onenand_chip *this = mtd->priv;
+        struct mtd_ecc_stats stats;
        int read = 0, column;
        int thislen;
-        int ret = 0;
+        int ret = 0, boundary = 0;
        DEBUG(MTD_DEBUG_LEVEL3, "onenand_read: from = 0x%08x, len = %i\n", (unsigned int) from, (int) len);
@@ -627,38 +726,61 @@ static int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,
        /* TODO handling oob */
-        while (read < len) {
+        stats = mtd->ecc_stats;
-                thislen = min_t(int, mtd->writesize, len - read);
+        /* Read-while-load method */
-                column = from & (mtd->writesize - 1);
-                if (column + thislen > mtd->writesize)
+        /* Do first load to bufferRAM */
-                        thislen = mtd->writesize - column;
+        if (read < len) {
+                if (!onenand_check_bufferram(mtd, from)) {
-                if (!onenand_check_bufferram(mtd, from)) {
+                        this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
-                        this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
+                        ret = this->wait(mtd, FL_READING);
+                        onenand_update_bufferram(mtd, from, !ret);
-                        ret = this->wait(mtd, FL_READING);
+                }
-                        /* First copy data and check return value for ECC handling */
+        }
-                        onenand_update_bufferram(mtd, from, 1);
-                }
+        thislen = min_t(int, mtd->writesize, len - read);
+        column = from & (mtd->writesize - 1);
-                this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
+        if (column + thislen > mtd->writesize)
+                thislen = mtd->writesize - column;
-                read += thislen;
+        while (!ret) {
-                if (read == len)
+                /* If there is more to load then start next load */
-                        break;
+                from += thislen;
+                if (read + thislen < len) {
-                if (ret) {
+                        this->command(mtd, ONENAND_CMD_READ, from, mtd->writesize);
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read: read failed = %d\n", ret);
+                        /*
-                        goto out;
+                         * Chip boundary handling in DDP
-                }
+                         * Now we issued chip 1 read and pointed chip 1
+                         * bufferam so we have to point chip 0 bufferam.
-                from += thislen;
+                         */
-                buf += thislen;
+                        if (this->device_id & ONENAND_DEVICE_IS_DDP &&
-        }
+                                        unlikely(from == (this->chipsize >> 1))) {
+                                this->write_word(0, this->base + ONENAND_REG_START_ADDRESS2);
+                                boundary = 1;
+                        } else
+                                boundary = 0;
+                        ONENAND_SET_PREV_BUFFERRAM(this);
+                }
+                /* While load is going, read from last bufferRAM */
+                this->read_bufferram(mtd, ONENAND_DATARAM, buf, column, thislen);
+                /* See if we are done */
+                read += thislen;
+                if (read == len)
+                        break;
+                /* Set up for next read from bufferRAM */
+                if (unlikely(boundary))
+                        this->write_word(0x8000, this->base + ONENAND_REG_START_ADDRESS2);
+                ONENAND_SET_NEXT_BUFFERRAM(this);
+                buf += thislen;
+                thislen = min_t(int, mtd->writesize, len - read);
+                column = 0;
+                cond_resched();
+                /* Now wait for load */
+                ret = this->wait(mtd, FL_READING);
+                onenand_update_bufferram(mtd, from, !ret);
+        }
-out:
        /* Deselect and wake up anyone waiting on the device */
        onenand_release_device(mtd);
@@ -668,7 +790,14 @@ out:
         * retlen == desired len and result == -EBADMSG
         */
        *retlen = read;
-        return ret;
+        if (mtd->ecc_stats.failed - stats.failed)
+                return -EBADMSG;
+        if (ret)
+                return ret;
+        return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0;
 }
 /**
@@ -705,6 +834,8 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
        column = from & (mtd->oobsize - 1);
        while (read < len) {
+                cond_resched();
                thislen = mtd->oobsize - column;
                thislen = min_t(int, thislen, len);
@@ -717,16 +848,16 @@ int onenand_do_read_oob(struct mtd_info *mtd, loff_t from, size_t len,
                this->read_bufferram(mtd, ONENAND_SPARERAM, buf, column, thislen);
+                if (ret) {
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = 0x%x\n", ret);
+                        goto out;
+                }
                read += thislen;
                if (read == len)
                        break;
-                if (ret) {
-                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_read_oob: read failed = %d\n", ret);
-                        goto out;
-                }
                buf += thislen;
                /* Read more? */
@@ -756,8 +887,8 @@ static int onenand_read_oob(struct mtd_info *mtd, loff_t from,
 {
        BUG_ON(ops->mode != MTD_OOB_PLACE);
-        return onenand_do_read_oob(mtd, from + ops->ooboffs, ops->len,
+        return onenand_do_read_oob(mtd, from + ops->ooboffs, ops->ooblen,
-                                   &ops->retlen, ops->oobbuf);
+                                   &ops->oobretlen, ops->oobbuf);
 }
 #ifdef CONFIG_MTD_ONENAND_VERIFY_WRITE
@@ -804,6 +935,10 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
        void __iomem *dataram0, *dataram1;
        int ret = 0;
+        /* In partial page write, just skip it */
+        if ((addr & (mtd->writesize - 1)) != 0)
+                return 0;
        this->command(mtd, ONENAND_CMD_READ, addr, mtd->writesize);
        ret = this->wait(mtd, FL_READING);
@@ -826,7 +961,7 @@ static int onenand_verify_page(struct mtd_info *mtd, u_char *buf, loff_t addr)
 #define onenand_verify_oob(...)         (0)
 #endif
-#define NOTALIGNED(x)   ((x & (mtd->writesize - 1)) != 0)
+#define NOTALIGNED(x)   ((x & (this->subpagesize - 1)) != 0)
 /**
 * onenand_write - [MTD Interface] write buffer to FLASH
@@ -844,6 +979,7 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
        struct onenand_chip *this = mtd->priv;
        int written = 0;
        int ret = 0;
+        int column, subpage;
        DEBUG(MTD_DEBUG_LEVEL3, "onenand_write: to = 0x%08x, len = %i\n", (unsigned int) to, (int) len);
@@ -862,45 +998,63 @@ static int onenand_write(struct mtd_info *mtd, loff_t to, size_t len,
                return -EINVAL;
        }
+        column = to & (mtd->writesize - 1);
+        subpage = column || (len & (mtd->writesize - 1));
        /* Grab the lock and see if the device is available */
        onenand_get_device(mtd, FL_WRITING);
        /* Loop until all data write */
        while (written < len) {
-                int thislen = min_t(int, mtd->writesize, len - written);
+                int bytes = mtd->writesize;
+                int thislen = min_t(int, bytes, len - written);
-                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->writesize);
+                u_char *wbuf = (u_char *) buf;
+                cond_resched();
+                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, bytes);
+                /* Partial page write */
+                if (subpage) {
+                        bytes = min_t(int, bytes - column, (int) len);
+                        memset(this->page_buf, 0xff, mtd->writesize);
+                        memcpy(this->page_buf + column, buf, bytes);
+                        wbuf = this->page_buf;
+                        /* Even though partial write, we need page size */
+                        thislen = mtd->writesize;
+                }
-                this->write_bufferram(mtd, ONENAND_DATARAM, buf, 0, thislen);
+                this->write_bufferram(mtd, ONENAND_DATARAM, wbuf, 0, thislen);
                this->write_bufferram(mtd, ONENAND_SPARERAM, ffchars, 0, mtd->oobsize);
                this->command(mtd, ONENAND_CMD_PROG, to, mtd->writesize);
-                onenand_update_bufferram(mtd, to, 1);
+                /* In partial page write we don't update bufferram */
+                onenand_update_bufferram(mtd, to, !subpage);
                ret = this->wait(mtd, FL_WRITING);
                if (ret) {
                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: write filaed %d\n", ret);
-                        goto out;
+                        break;
                }
-                written += thislen;
                /* Only check verify write turn on */
-                ret = onenand_verify_page(mtd, (u_char *) buf, to);
+                ret = onenand_verify_page(mtd, (u_char *) wbuf, to);
                if (ret) {
                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_write: verify failed %d\n", ret);
-                        goto out;
+                        break;
                }
+                written += thislen;
                if (written == len)
                        break;
+                column = 0;
                to += thislen;
                buf += thislen;
        }
-out:
        /* Deselect and wake up anyone waiting on the device */
        onenand_release_device(mtd);
@@ -944,6 +1098,8 @@ static int onenand_do_write_oob(struct mtd_info *mtd, loff_t to, size_t len,
        while (written < len) {
                int thislen = min_t(int, mtd->oobsize, len - written);
+                cond_resched();
                column = to & (mtd->oobsize - 1);
                this->command(mtd, ONENAND_CMD_BUFFERRAM, to, mtd->oobsize);
@@ -999,8 +1155,8 @@ static int onenand_write_oob(struct mtd_info *mtd, loff_t to,
 {
        BUG_ON(ops->mode != MTD_OOB_PLACE);
-        return onenand_do_write_oob(mtd, to + ops->ooboffs, ops->len,
+        return onenand_do_write_oob(mtd, to + ops->ooboffs, ops->ooblen,
-                                    &ops->retlen, ops->oobbuf);
+                                    &ops->oobretlen, ops->oobbuf);
 }
 /**
@@ -1071,6 +1227,7 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
        instr->state = MTD_ERASING;
        while (len) {
+                cond_resched();
                /* Check if we have a bad block, we do not erase bad blocks */
                if (onenand_block_checkbad(mtd, addr, 0, 0)) {
@@ -1084,10 +1241,7 @@ static int onenand_erase(struct mtd_info *mtd, struct erase_info *instr)
                ret = this->wait(mtd, FL_ERASING);
                /* Check, if it is write protected */
                if (ret) {
-                        if (ret == -EPERM)
+                        DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift));
-                                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Device is write protected!!!\n");
-                        else
-                                DEBUG(MTD_DEBUG_LEVEL0, "onenand_erase: Failed erase, block %d\n", (unsigned) (addr >> this->erase_shift));
                        instr->state = MTD_ERASE_FAILED;
                        instr->fail_addr = addr;
                        goto erase_exit;
@@ -1129,7 +1283,6 @@ static void onenand_sync(struct mtd_info *mtd)
        onenand_release_device(mtd);
 }
 /**
 * onenand_block_isbad - [MTD Interface] Check whether the block at the given offset is bad
 * @param mtd           MTD device structure
@@ -1196,32 +1349,38 @@ static int onenand_block_markbad(struct mtd_info *mtd, loff_t ofs)
 }
 /**
- * onenand_unlock - [MTD Interface] Unlock block(s)
+ * onenand_do_lock_cmd - [OneNAND Interface] Lock or unlock block(s)
 * @param mtd           MTD device structure
 * @param ofs           offset relative to mtd start
- * @param len           number of bytes to unlock
+ * @param len           number of bytes to lock or unlock
 *
- * Unlock one or more blocks
+ * Lock or unlock one or more blocks
 */
-static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
+static int onenand_do_lock_cmd(struct mtd_info *mtd, loff_t ofs, size_t len, int cmd)
 {
        struct onenand_chip *this = mtd->priv;
        int start, end, block, value, status;
+        int wp_status_mask;
        start = ofs >> this->erase_shift;
        end = len >> this->erase_shift;
+        if (cmd == ONENAND_CMD_LOCK)
+                wp_status_mask = ONENAND_WP_LS;
+        else
+                wp_status_mask = ONENAND_WP_US;
        /* Continuous lock scheme */
        if (this->options & ONENAND_HAS_CONT_LOCK) {
                /* Set start block address */
                this->write_word(start, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
                /* Set end block address */
                this->write_word(start + end - 1, this->base + ONENAND_REG_END_BLOCK_ADDRESS);
-                /* Write unlock command */
+                /* Write lock command */
-                this->command(mtd, ONENAND_CMD_UNLOCK, 0, 0);
+                this->command(mtd, cmd, 0, 0);
                /* There's no return value */
-                this->wait(mtd, FL_UNLOCKING);
+                this->wait(mtd, FL_LOCKING);
                /* Sanity check */
                while (this->read_word(this->base + ONENAND_REG_CTRL_STATUS)
@@ -1230,7 +1389,7 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
                /* Check lock status */
                status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
-                if (!(status & ONENAND_WP_US))
+                if (!(status & wp_status_mask))
                        printk(KERN_ERR "wp status = 0x%x\n", status);
                return 0;
@@ -1246,11 +1405,11 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
                /* Set start block address */
                this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
-                /* Write unlock command */
+                /* Write lock command */
-                this->command(mtd, ONENAND_CMD_UNLOCK, 0, 0);
+                this->command(mtd, cmd, 0, 0);
                /* There's no return value */
-                this->wait(mtd, FL_UNLOCKING);
+                this->wait(mtd, FL_LOCKING);
                /* Sanity check */
                while (this->read_word(this->base + ONENAND_REG_CTRL_STATUS)
@@ -1259,7 +1418,7 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
                /* Check lock status */
                status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
-                if (!(status & ONENAND_WP_US))
+                if (!(status & wp_status_mask))
                        printk(KERN_ERR "block = %d, wp status = 0x%x\n", block, status);
        }
@@ -1267,6 +1426,32 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
 }
 /**
+ * onenand_lock - [MTD Interface] Lock block(s)
+ * @param mtd           MTD device structure
+ * @param ofs           offset relative to mtd start
+ * @param len           number of bytes to unlock
+ *
+ * Lock one or more blocks
+ */
+static int onenand_lock(struct mtd_info *mtd, loff_t ofs, size_t len)
+{
+        return onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_LOCK);
+}
+/**
+ * onenand_unlock - [MTD Interface] Unlock block(s)
+ * @param mtd           MTD device structure
+ * @param ofs           offset relative to mtd start
+ * @param len           number of bytes to unlock
+ *
+ * Unlock one or more blocks
+ */
+static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
+{
+        return onenand_do_lock_cmd(mtd, ofs, len, ONENAND_CMD_UNLOCK);
+}
+/**
 * onenand_check_lock_status - [OneNAND Interface] Check lock status
 * @param this          onenand chip data structure
 *
@@ -1310,7 +1495,7 @@ static int onenand_unlock_all(struct mtd_info *mtd)
                this->command(mtd, ONENAND_CMD_UNLOCK_ALL, 0, 0);
                /* There's no return value */
-                this->wait(mtd, FL_UNLOCKING);
+                this->wait(mtd, FL_LOCKING);
                /* Sanity check */
                while (this->read_word(this->base + ONENAND_REG_CTRL_STATUS)
@@ -1334,7 +1519,7 @@ static int onenand_unlock_all(struct mtd_info *mtd)
                return 0;
        }
-        mtd->unlock(mtd, 0x0, this->chipsize);
+        onenand_unlock(mtd, 0x0, this->chipsize);
        return 0;
 }
@@ -1762,7 +1947,7 @@ static int onenand_probe(struct mtd_info *mtd)
        /* Read manufacturer and device IDs from Register */
        maf_id = this->read_word(this->base + ONENAND_REG_MANUFACTURER_ID);
        dev_id = this->read_word(this->base + ONENAND_REG_DEVICE_ID);
-        ver_id= this->read_word(this->base + ONENAND_REG_VERSION_ID);
+        ver_id = this->read_word(this->base + ONENAND_REG_VERSION_ID);
        /* Check OneNAND device */
        if (maf_id != bram_maf_id || dev_id != bram_dev_id)
@@ -1846,7 +2031,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        if (!this->command)
                this->command = onenand_command;
        if (!this->wait)
-                this->wait = onenand_wait;
+                onenand_setup_wait(mtd);
        if (!this->read_bufferram)
                this->read_bufferram = onenand_read_bufferram;
@@ -1883,23 +2068,30 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        init_waitqueue_head(&this->wq);
        spin_lock_init(&this->chip_lock);
+        /*
+         * Allow subpage writes up to oobsize.
+         */
        switch (mtd->oobsize) {
        case 64:
                this->ecclayout = &onenand_oob_64;
+                mtd->subpage_sft = 2;
                break;
        case 32:
                this->ecclayout = &onenand_oob_32;
+                mtd->subpage_sft = 1;
                break;
        default:
                printk(KERN_WARNING "No OOB scheme defined for oobsize %d\n",
                        mtd->oobsize);
+                mtd->subpage_sft = 0;
                /* To prevent kernel oops */
                this->ecclayout = &onenand_oob_32;
                break;
        }
+        this->subpagesize = mtd->writesize >> mtd->subpage_sft;
        mtd->ecclayout = this->ecclayout;
        /* Fill in remaining MTD driver data */
@@ -1922,7 +2114,7 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
        mtd->lock_user_prot_reg = onenand_lock_user_prot_reg;
 #endif
        mtd->sync = onenand_sync;
-        mtd->lock = NULL;
+        mtd->lock = onenand_lock;
        mtd->unlock = onenand_unlock;
        mtd->suspend = onenand_suspend;
        mtd->resume = onenand_resume;
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index 1b00dac3d7d6..98f8fd1c6375 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -93,13 +93,15 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
                        ret = onenand_do_read_oob(mtd, from + j * mtd->writesize + bd->offs,
                                                  readlen, &retlen, &buf[0]);
-                        if (ret)
+                        /* If it is a initial bad block, just ignore it */
+                        if (ret && !(ret & ONENAND_CTRL_LOAD))
                                return ret;
                        if (check_short_pattern(&buf[j * scanlen], scanlen, mtd->writesize, bd)) {
                                bbm->bbt[i >> 3] |= 0x03 << (i & 0x6);
                                printk(KERN_WARNING "Bad eraseblock %d at 0x%08x\n",
                                        i >> 1, (unsigned int) from);
+                                mtd->ecc_stats.badblocks++;
                                break;
                        }
                }
@@ -177,14 +179,12 @@ int onenand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd)
        int len, ret = 0;
        len = mtd->size >> (this->erase_shift + 2);
-        /* Allocate memory (2bit per block) */
+        /* Allocate memory (2bit per block) and clear the memory bad block table */
-        bbm->bbt = kmalloc(len, GFP_KERNEL);
+        bbm->bbt = kzalloc(len, GFP_KERNEL);
        if (!bbm->bbt) {
                printk(KERN_ERR "onenand_scan_bbt: Out of memory\n");
                return -ENOMEM;
        }
-        /* Clear the memory bad block table */
-        memset(bbm->bbt, 0x00, len);
        /* Set the bad block position */
        bbm->badblockpos = ONENAND_BADBLOCK_POS;
@@ -230,14 +230,12 @@ int onenand_default_bbt(struct mtd_info *mtd)
        struct onenand_chip *this = mtd->priv;
        struct bbm_info *bbm;
-        this->bbm = kmalloc(sizeof(struct bbm_info), GFP_KERNEL);
+        this->bbm = kzalloc(sizeof(struct bbm_info), GFP_KERNEL);
        if (!this->bbm)
                return -ENOMEM;
        bbm = this->bbm;
-        memset(bbm, 0, sizeof(struct bbm_info));
        /* 1KB page has same configuration as 2KB page */
        if (!bbm->badblock_pattern)
                bbm->badblock_pattern = &largepage_memorybased;
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c
index 5b58523e4d4e..035cd9b0cc08 100644
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -96,7 +96,19 @@ static int parse_redboot_partitions(struct mtd_info *master,
                         */
                        if (swab32(buf[i].size) == master->erasesize) {
                                int j;
-                                for (j = 0; j < numslots && buf[j].name[0] != 0xff; ++j) {
+                                for (j = 0; j < numslots; ++j) {
+                                        /* A single 0xff denotes a deleted entry.
+                                         * Two of them in a row is the end of the table.
+                                         */
+                                        if (buf[j].name[0] == 0xff) {
+                                                if (buf[j].name[1] == 0xff) {
+                                                        break;
+                                                } else {
+                                                        continue;
+                                                }
+                                        }
                                        /* The unsigned long fields were written with the
                                         * wrong byte sex, name and pad have no byte sex.
                                         */
@@ -110,6 +122,9 @@ static int parse_redboot_partitions(struct mtd_info *master,
                                }
                        }
                        break;
+                } else {
+                        /* re-calculate of real numslots */
+                        numslots = buf[i].size / sizeof(struct fis_image_desc);
                }
        }
        if (i == numslots) {
@@ -123,8 +138,13 @@ static int parse_redboot_partitions(struct mtd_info *master,
        for (i = 0; i < numslots; i++) {
                struct fis_list *new_fl, **prev;
-                if (buf[i].name[0] == 0xff)
+                if (buf[i].name[0] == 0xff) {
-                        continue;
+                        if (buf[i].name[1] == 0xff) {
+                                break;
+                        } else {
+                                continue;
+                        }
+                }
                if (!redboot_checksum(&buf[i]))
                        break;
@@ -165,15 +185,13 @@ static int parse_redboot_partitions(struct mtd_info *master,
                }
        }
 #endif
-        parts = kmalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
+        parts = kzalloc(sizeof(*parts)*nrparts + nulllen + namelen, GFP_KERNEL);
        if (!parts) {
                ret = -ENOMEM;
                goto out;
        }
-        memset(parts, 0, sizeof(*parts)*nrparts + nulllen + namelen);
        nullname = (char *)&parts[nrparts];
 #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED
        if (nulllen > 0) {
diff --git a/drivers/mtd/rfd_ftl.c b/drivers/mtd/rfd_ftl.c
index 0f3baa5d9c2a..d4b1ba8f23ef 100644
--- a/drivers/mtd/rfd_ftl.c
+++ b/drivers/mtd/rfd_ftl.c
@@ -787,7 +787,6 @@ static void rfd_ftl_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
        if (scan_header(part) == 0) {
                part->mbd.size = part->sector_count;
-                part->mbd.blksize = SECTOR_SIZE;
                part->mbd.tr = tr;
                part->mbd.devnum = -1;
                if (!(mtd->flags & MTD_WRITEABLE))
@@ -829,6 +828,8 @@ struct mtd_blktrans_ops rfd_ftl_tr = {
        .name           = "rfd",
        .major          = RFD_FTL_MAJOR,
        .part_bits      = PART_BITS,
+        .blksize        = SECTOR_SIZE,
        .readsect       = rfd_ftl_readsect,
        .writesect      = rfd_ftl_writesect,
        .getgeo         = rfd_ftl_getgeo,
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 79d3bb659bfe..a5f3d60047d4 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -172,13 +172,12 @@ static int read_raw_oob(struct mtd_info *mtd, loff_t offs, uint8_t *buf)
        ops.mode = MTD_OOB_RAW;
        ops.ooboffs = 0;
-        ops.ooblen = mtd->oobsize;
+        ops.ooblen = OOB_SIZE;
-        ops.len = OOB_SIZE;
        ops.oobbuf = buf;
        ops.datbuf = NULL;
        ret = mtd->read_oob(mtd, offs, &ops);
-        if (ret < 0 || ops.retlen != OOB_SIZE)
+        if (ret < 0 || ops.oobretlen != OOB_SIZE)
                return -1;
        return 0;
@@ -312,7 +311,6 @@ static void ssfdcr_add_mtd(struct mtd_blktrans_ops *tr, struct mtd_info *mtd)
        ssfdc->mbd.mtd = mtd;
        ssfdc->mbd.devnum = -1;
-        ssfdc->mbd.blksize = SECTOR_SIZE;
        ssfdc->mbd.tr = tr;
        ssfdc->mbd.readonly = 1;
@@ -447,6 +445,7 @@ static struct mtd_blktrans_ops ssfdcr_tr = {
        .name           = "ssfdc",
        .major          = SSFDCR_MAJOR,
        .part_bits      = SSFDCR_PARTN_BITS,
+        .blksize        = SECTOR_SIZE,
        .getgeo         = ssfdcr_getgeo,
        .readsect       = ssfdcr_readsect,
        .add_mtd        = ssfdcr_add_mtd,
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index e2cb19b582a1..6f93a765e564 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -765,17 +765,18 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
        struct cp_private *cp = netdev_priv(dev);
        unsigned entry;
        u32 eor, flags;
+        unsigned long intr_flags;
 #if CP_VLAN_TAG_USED
        u32 vlan_tag = 0;
 #endif
        int mss = 0;
-        spin_lock_irq(&cp->lock);
+        spin_lock_irqsave(&cp->lock, intr_flags);
        /* This is a hard error, log it. */
        if (TX_BUFFS_AVAIL(cp) <= (skb_shinfo(skb)->nr_frags + 1)) {
                netif_stop_queue(dev);
-                spin_unlock_irq(&cp->lock);
+                spin_unlock_irqrestore(&cp->lock, intr_flags);
                printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",
                       dev->name);
                return 1;
@@ -908,7 +909,7 @@ static int cp_start_xmit (struct sk_buff *skb, struct net_device *dev)
        if (TX_BUFFS_AVAIL(cp) <= (MAX_SKB_FRAGS + 1))
                netif_stop_queue(dev);
-        spin_unlock_irq(&cp->lock);
+        spin_unlock_irqrestore(&cp->lock, intr_flags);
        cpw8(TxPoll, NormalTxPoll);
        dev->trans_start = jiffies;
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 39ad9f73d1ec..be10a3a26b5b 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -39,7 +39,7 @@
 #include <asm/io.h>
 #define DRV_NAME        "ehea"
-#define DRV_VERSION     "EHEA_0043"
+#define DRV_VERSION     "EHEA_0044"
 #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \
        | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 83fa32f72398..1072e69ef85d 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -558,12 +558,12 @@ static irqreturn_t ehea_qp_aff_irq_handler(int irq, void *param)
        u32 qp_token;
        eqe = ehea_poll_eq(port->qp_eq);
-        ehea_debug("eqe=%p", eqe);
        while (eqe) {
-                ehea_debug("*eqe=%lx", *(u64*)eqe);
-                eqe = ehea_poll_eq(port->qp_eq);
                qp_token = EHEA_BMASK_GET(EHEA_EQE_QP_TOKEN, eqe->entry);
-                ehea_debug("next eqe=%p", eqe);
+                ehea_error("QP aff_err: entry=0x%lx, token=0x%x",
+                           eqe->entry, qp_token);
+                eqe = ehea_poll_eq(port->qp_eq);
        }
        return IRQ_HANDLED;
@@ -575,8 +575,9 @@ static struct ehea_port *ehea_get_port(struct ehea_adapter *adapter,
        int i;
        for (i = 0; i < adapter->num_ports; i++)
-                if (adapter->port[i]->logical_port_id == logical_port)
+                if (adapter->port[i])
-                        return adapter->port[i];
+                        if (adapter->port[i]->logical_port_id == logical_port)
+                                return adapter->port[i];
        return NULL;
 }
@@ -642,6 +643,8 @@ int ehea_sense_port_attr(struct ehea_port *port)
                break;
        }
+        port->autoneg = 1;
        /* Number of default QPs */
        port->num_def_qps = cb0->num_default_qps;
@@ -728,10 +731,7 @@ int ehea_set_portspeed(struct ehea_port *port, u32 port_speed)
                }
        } else {
                if (hret == H_AUTHORITY) {
-                        ehea_info("Hypervisor denied setting port speed. Either"
+                        ehea_info("Hypervisor denied setting port speed");
-                                  " this partition is not authorized to set "
-                                  "port speed or another partition has modified"
-                                  " port speed first.");
                        ret = -EPERM;
                } else {
                        ret = -EIO;
@@ -998,7 +998,7 @@ static int ehea_configure_port(struct ehea_port *port)
                     | EHEA_BMASK_SET(PXLY_RC_JUMBO_FRAME, 1);
        for (i = 0; i < port->num_def_qps; i++)
-                cb0->default_qpn_arr[i] = port->port_res[i].qp->init_attr.qp_nr;
+                cb0->default_qpn_arr[i] = port->port_res[0].qp->init_attr.qp_nr;
        if (netif_msg_ifup(port))
                ehea_dump(cb0, sizeof(*cb0), "ehea_configure_port");
@@ -1485,11 +1485,12 @@ out:
 static void ehea_promiscuous_error(u64 hret, int enable)
 {
-        ehea_info("Hypervisor denied %sabling promiscuous mode.%s",
+        if (hret == H_AUTHORITY)
-                  enable == 1 ? "en" : "dis",
+                ehea_info("Hypervisor denied %sabling promiscuous mode",
-                  hret != H_AUTHORITY ? "" : " Another partition owning a "
+                          enable == 1 ? "en" : "dis");
-                  "logical port on the same physical port might have altered "
+        else
-                  "promiscuous mode first.");
+                ehea_error("failed %sabling promiscuous mode",
+                           enable == 1 ? "en" : "dis");
 }
 static void ehea_promiscuous(struct net_device *dev, int enable)
@@ -2267,6 +2268,8 @@ static void ehea_tx_watchdog(struct net_device *dev)
 int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
 {
        struct hcp_query_ehea *cb;
+        struct device_node *lhea_dn = NULL;
+        struct device_node *eth_dn = NULL;
        u64 hret;
        int ret;
@@ -2283,7 +2286,18 @@ int ehea_sense_adapter_attr(struct ehea_adapter *adapter)
                goto out_herr;
        }
-        adapter->num_ports = cb->num_ports;
+        /* Determine the number of available logical ports
+         * by counting the child nodes of the lhea OFDT entry
+         */
+        adapter->num_ports = 0;
+        lhea_dn = of_find_node_by_name(lhea_dn, "lhea");
+        do {
+                eth_dn = of_get_next_child(lhea_dn, eth_dn);
+                if (eth_dn)
+                        adapter->num_ports++;
+        } while ( eth_dn );
+        of_node_put(lhea_dn);
        adapter->max_mc_mac = cb->max_mc_mac - 1;
        ret = 0;
@@ -2334,8 +2348,6 @@ static int ehea_setup_single_port(struct ehea_port *port,
        INIT_LIST_HEAD(&port->mc_list->list);
-        ehea_set_portspeed(port, EHEA_SPEED_AUTONEG);
        ret = ehea_sense_port_attr(port);
        if (ret)
                goto out;
@@ -2471,14 +2483,16 @@ static int __devinit ehea_probe(struct ibmebus_dev *dev,
        adapter_handle = (u64*)get_property(dev->ofdev.node, "ibm,hea-handle",
                                            NULL);
-        if (!adapter_handle) {
+        if (adapter_handle)
+                adapter->handle = *adapter_handle;
+        if (!adapter->handle) {
                dev_err(&dev->ofdev.dev, "failed getting handle for adapter"
                        " '%s'\n", dev->ofdev.node->full_name);
                ret = -ENODEV;
                goto out_free_ad;
        }
-        adapter->handle = *adapter_handle;
        adapter->pd = EHEA_PD_ID;
        dev->ofdev.dev.driver_data = adapter;
diff --git a/drivers/net/ehea/ehea_phyp.c b/drivers/net/ehea/ehea_phyp.c
index 0cfc2bc1a27b..37716e05e808 100644
--- a/drivers/net/ehea/ehea_phyp.c
+++ b/drivers/net/ehea/ehea_phyp.c
@@ -94,6 +94,7 @@ static long ehea_plpar_hcall9(unsigned long opcode,
 {
        long ret;
        int i, sleep_msecs;
+        u8 cb_cat;
        for (i = 0; i < 5; i++) {
                ret = plpar_hcall9(opcode, outs,
@@ -106,7 +107,13 @@ static long ehea_plpar_hcall9(unsigned long opcode,
                        continue;
                }
-                if (ret < H_SUCCESS)
+                cb_cat = EHEA_BMASK_GET(H_MEHEAPORT_CAT, arg2);
+                if ((ret < H_SUCCESS) && !(((ret == H_AUTHORITY)
+                    && (opcode == H_MODIFY_HEA_PORT))
+                    && (((cb_cat == H_PORT_CB4) && ((arg3 == H_PORT_CB4_JUMBO)
+                    || (arg3 == H_PORT_CB4_SPEED))) || ((cb_cat == H_PORT_CB7)
+                    && (arg3 == H_PORT_CB7_DUCQPN)))))
                        ehea_error("opcode=%lx ret=%lx"
                                   " arg1=%lx arg2=%lx arg3=%lx arg4=%lx"
                                   " arg5=%lx arg6=%lx arg7=%lx arg8=%lx"
@@ -120,7 +127,6 @@ static long ehea_plpar_hcall9(unsigned long opcode,
                                   outs[0], outs[1], outs[2], outs[3],
                                   outs[4], outs[5], outs[6], outs[7],
                                   outs[8]);
                return ret;
        }
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 3ca1082ec776..340ee99652eb 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -441,25 +441,13 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
                goto drop;
        }
-        /* Make sure there is room for IrDA-USB header. The actual
+        memcpy(self->tx_buff + self->header_length, skb->data, skb->len);
-         * allocation will be done lower in skb_push().
-         * Also, we don't use directly skb_cow(), because it require
-         * headroom >= 16, which force unnecessary copies - Jean II */
-        if (skb_headroom(skb) < self->header_length) {
-                IRDA_DEBUG(0, "%s(), Insuficient skb headroom.\n", __FUNCTION__);
-                if (skb_cow(skb, self->header_length)) {
-                        IRDA_WARNING("%s(), failed skb_cow() !!!\n", __FUNCTION__);
-                        goto drop;
-                }
-        }
        /* Change setting for next frame */
        if (self->capability & IUC_STIR421X) {
                __u8 turnaround_time;
-                __u8* frame;
+                __u8* frame = self->tx_buff;
                turnaround_time = get_turnaround_time( skb );
-                frame= skb_push(skb, self->header_length);
                irda_usb_build_header(self, frame, 0);
                frame[2] = turnaround_time;
                if ((skb->len != 0) &&
@@ -472,17 +460,17 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
                        frame[1] = 0;
                }
        } else {
-                irda_usb_build_header(self, skb_push(skb, self->header_length), 0);
+                irda_usb_build_header(self, self->tx_buff, 0);
        }
        /* FIXME: Make macro out of this one */
        ((struct irda_skb_cb *)skb->cb)->context = self;
-        usb_fill_bulk_urb(urb, self->usbdev, 
+        usb_fill_bulk_urb(urb, self->usbdev,
                      usb_sndbulkpipe(self->usbdev, self->bulk_out_ep),
-                      skb->data, IRDA_SKB_MAX_MTU,
+                      self->tx_buff, skb->len + self->header_length,
                      write_bulk_callback, skb);
-        urb->transfer_buffer_length = skb->len;
        /* This flag (URB_ZERO_PACKET) indicates that what we send is not
         * a continuous stream of data but separate packets.
         * In this case, the USB layer will insert an empty USB frame (TD)
@@ -1455,6 +1443,9 @@ static inline void irda_usb_close(struct irda_usb_cb *self)
        /* Remove the speed buffer */
        kfree(self->speed_buff);
        self->speed_buff = NULL;
+        kfree(self->tx_buff);
+        self->tx_buff = NULL;
 }
 /********************** USB CONFIG SUBROUTINES **********************/
@@ -1524,8 +1515,6 @@ static inline int irda_usb_parse_endpoints(struct irda_usb_cb *self, struct usb_
        IRDA_DEBUG(0, "%s(), And our endpoints are : in=%02X, out=%02X (%d), int=%02X\n",
                __FUNCTION__, self->bulk_in_ep, self->bulk_out_ep, self->bulk_out_mtu, self->bulk_int_ep);
-        /* Should be 8, 16, 32 or 64 bytes */
-        IRDA_ASSERT(self->bulk_out_mtu == 64, ;);
        return((self->bulk_in_ep != 0) && (self->bulk_out_ep != 0));
 }
@@ -1753,9 +1742,14 @@ static int irda_usb_probe(struct usb_interface *intf,
        memset(self->speed_buff, 0, IRDA_USB_SPEED_MTU);
+        self->tx_buff = kzalloc(IRDA_SKB_MAX_MTU + self->header_length,
+                                GFP_KERNEL);
+        if (self->tx_buff == NULL)
+                goto err_out_4;
        ret = irda_usb_open(self);
        if (ret) 
-                goto err_out_4;
+                goto err_out_5;
        IRDA_MESSAGE("IrDA: Registered device %s\n", net->name);
        usb_set_intfdata(intf, self);
@@ -1766,14 +1760,14 @@ static int irda_usb_probe(struct usb_interface *intf,
                self->needspatch = (ret < 0);
                if (self->needspatch) {
                        IRDA_ERROR("STIR421X: Couldn't upload patch\n");
-                        goto err_out_5;
+                        goto err_out_6;
                }
                /* replace IrDA class descriptor with what patched device is now reporting */
                irda_desc = irda_usb_find_class_desc (self->usbintf);
                if (irda_desc == NULL) {
                        ret = -ENODEV;
-                        goto err_out_5;
+                        goto err_out_6;
                }
                if (self->irda_desc)
                        kfree (self->irda_desc);
@@ -1782,9 +1776,10 @@ static int irda_usb_probe(struct usb_interface *intf,
        }
        return 0;
+err_out_6:
-err_out_5:
        unregister_netdev(self->netdev);
+err_out_5:
+        kfree(self->tx_buff);
 err_out_4:
        kfree(self->speed_buff);
 err_out_3:
diff --git a/drivers/net/irda/irda-usb.h b/drivers/net/irda/irda-usb.h
index 6b2271f18e77..e846c38224a3 100644
--- a/drivers/net/irda/irda-usb.h
+++ b/drivers/net/irda/irda-usb.h
@@ -156,6 +156,7 @@ struct irda_usb_cb {
        struct irlap_cb   *irlap;       /* The link layer we are binded to */
        struct qos_info qos;
        char *speed_buff;               /* Buffer for speed changes */
+        char *tx_buff;
        struct timeval stamp;
        struct timeval now;
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index c14a74634fd5..20d306fea4cb 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -59,7 +59,7 @@
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
-MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
+MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
 MODULE_DESCRIPTION("IrDA-USB Dongle Driver for SigmaTel STIr4200");
 MODULE_LICENSE("GPL");
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 18c68193bf14..e2b1af618450 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -166,7 +166,7 @@ static void vlsi_proc_pdev(struct seq_file *seq, struct pci_dev *pdev)
        unsigned i;
        seq_printf(seq, "\n%s (vid/did: %04x/%04x)\n",
-                   PCIDEV_NAME(pdev), (int)pdev->vendor, (int)pdev->device);
+                   pci_name(pdev), (int)pdev->vendor, (int)pdev->device);
        seq_printf(seq, "pci-power-state: %u\n", (unsigned) pdev->current_state);
        seq_printf(seq, "resources: irq=%u / io=0x%04x / dma_mask=0x%016Lx\n",
                   pdev->irq, (unsigned)pci_resource_start(pdev, 0), (unsigned long long)pdev->dma_mask);
@@ -1401,7 +1401,7 @@ static void vlsi_tx_timeout(struct net_device *ndev)
        if (vlsi_start_hw(idev))
                IRDA_ERROR("%s: failed to restart hw - %s(%s) unusable!\n",
-                           __FUNCTION__, PCIDEV_NAME(idev->pdev), ndev->name);
+                           __FUNCTION__, pci_name(idev->pdev), ndev->name);
        else
                netif_start_queue(ndev);
 }
@@ -1643,7 +1643,7 @@ vlsi_irda_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                pdev->current_state = 0; /* hw must be running now */
        IRDA_MESSAGE("%s: IrDA PCI controller %s detected\n",
-                     drivername, PCIDEV_NAME(pdev));
+                     drivername, pci_name(pdev));
        if ( !pci_resource_start(pdev,0)
             || !(pci_resource_flags(pdev,0) & IORESOURCE_IO) ) {
@@ -1728,7 +1728,7 @@ static void __devexit vlsi_irda_remove(struct pci_dev *pdev)
        pci_set_drvdata(pdev, NULL);
-        IRDA_MESSAGE("%s: %s removed\n", drivername, PCIDEV_NAME(pdev));
+        IRDA_MESSAGE("%s: %s removed\n", drivername, pci_name(pdev));
 }
 #ifdef CONFIG_PM
@@ -1748,7 +1748,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
        if (!ndev) {
                IRDA_ERROR("%s - %s: no netdevice \n",
-                           __FUNCTION__, PCIDEV_NAME(pdev));
+                           __FUNCTION__, pci_name(pdev));
                return 0;
        }
        idev = ndev->priv;      
@@ -1759,7 +1759,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
                        pdev->current_state = state.event;
                }
                else
-                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state.event);
+                        IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, pci_name(pdev), pdev->current_state, state.event);
                up(&idev->sem);
                return 0;
        }
@@ -1787,7 +1787,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
        if (!ndev) {
                IRDA_ERROR("%s - %s: no netdevice \n",
-                           __FUNCTION__, PCIDEV_NAME(pdev));
+                           __FUNCTION__, pci_name(pdev));
                return 0;
        }
        idev = ndev->priv;      
@@ -1795,7 +1795,7 @@ static int vlsi_irda_resume(struct pci_dev *pdev)
        if (pdev->current_state == 0) {
                up(&idev->sem);
                IRDA_WARNING("%s - %s: already resumed\n",
-                             __FUNCTION__, PCIDEV_NAME(pdev));
+                             __FUNCTION__, pci_name(pdev));
                return 0;
        }
        
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index c37f0bc4c7f9..2d3b773d8e35 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -41,39 +41,6 @@
 #define PCI_CLASS_SUBCLASS_MASK         0xffff
 #endif
-/* in recent 2.5 interrupt handlers have non-void return value */
-#ifndef IRQ_RETVAL
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-/* some stuff need to check kernelversion. Not all 2.5 stuff was present
- * in early 2.5.x - the test is merely to separate 2.4 from 2.5
- */
-#include <linux/version.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-/* PDE() introduced in 2.5.4 */
-#ifdef CONFIG_PROC_FS
-#define PDE(inode) ((inode)->i_private)
-#endif
-/* irda crc16 calculation exported in 2.5.42 */
-#define irda_calc_crc16(fcs,buf,len)    (GOOD_FCS)
-/* we use this for unified pci device name access */
-#define PCIDEV_NAME(pdev)       ((pdev)->name)
-#else /* 2.5 or later */
-/* whatever we get from the associated struct device - bus:slot:dev.fn id */
-#define PCIDEV_NAME(pdev)       (pci_name(pdev))
-#endif
 /* ================================================================ */
 /* non-standard PCI registers */
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 07cf574197e5..61cbd4a60446 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -71,7 +71,7 @@
 #include "myri10ge_mcp.h"
 #include "myri10ge_mcp_gen_header.h"
-#define MYRI10GE_VERSION_STR "1.1.0"
+#define MYRI10GE_VERSION_STR "1.2.0"
 MODULE_DESCRIPTION("Myricom 10G driver (10GbE)");
 MODULE_AUTHOR("Maintainer: help@myri.com");
@@ -274,6 +274,10 @@ static int myri10ge_fill_thresh = 256;
 module_param(myri10ge_fill_thresh, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(myri10ge_fill_thresh, "Number of empty rx slots allowed\n");
+static int myri10ge_wcfifo = 1;
+module_param(myri10ge_wcfifo, int, S_IRUGO);
+MODULE_PARM_DESC(myri10ge_wcfifo, "Enable WC Fifo when WC is enabled\n");
 #define MYRI10GE_FW_OFFSET 1024*1024
 #define MYRI10GE_HIGHPART_TO_U32(X) \
 (sizeof (X) == 8) ? ((u32)((u64)(X) >> 32)) : (0)
@@ -1714,7 +1718,7 @@ static int myri10ge_open(struct net_device *dev)
                goto abort_with_irq;
        }
-        if (mgp->mtrr >= 0) {
+        if (myri10ge_wcfifo && mgp->mtrr >= 0) {
                mgp->tx.wc_fifo = (u8 __iomem *) mgp->sram + MXGEFW_ETH_SEND_4;
                mgp->rx_small.wc_fifo =
                    (u8 __iomem *) mgp->sram + MXGEFW_ETH_RECV_SMALL;
@@ -2878,7 +2882,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->hard_start_xmit = myri10ge_xmit;
        netdev->get_stats = myri10ge_get_stats;
        netdev->base_addr = mgp->iomem_base;
-        netdev->irq = pdev->irq;
        netdev->change_mtu = myri10ge_change_mtu;
        netdev->set_multicast_list = myri10ge_set_multicast_list;
        netdev->set_mac_address = myri10ge_set_mac_address;
@@ -2888,6 +2891,15 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netdev->poll = myri10ge_poll;
        netdev->weight = myri10ge_napi_weight;
+        /* make sure we can get an irq, and that MSI can be
+         * setup (if available).  Also ensure netdev->irq
+         * is set to correct value if MSI is enabled */
+        status = myri10ge_request_irq(mgp);
+        if (status != 0)
+                goto abort_with_firmware;
+        netdev->irq = pdev->irq;
+        myri10ge_free_irq(mgp);
        /* Save configuration space to be restored if the
         * nic resets due to a parity error */
        pci_save_state(pdev);
@@ -2903,8 +2915,9 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                dev_err(&pdev->dev, "register_netdev failed: %d\n", status);
                goto abort_with_state;
        }
-        dev_info(dev, "%d, tx bndry %d, fw %s, WC %s\n",
+        dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",
-                 pdev->irq, mgp->tx.boundary, mgp->fw_name,
+                 (mgp->msi_enabled ? "MSI" : "xPIC"),
+                 netdev->irq, mgp->tx.boundary, mgp->fw_name,
                 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));
        return 0;
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 6490acf05305..59324b1693d6 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -63,12 +63,11 @@
 #include "netxen_nic_hw.h"
-#define NETXEN_NIC_BUILD_NO     "4"
+#define NETXEN_NIC_BUILD_NO     "2"
 #define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 3
-#define _NETXEN_NIC_LINUX_SUBVERSION 2
+#define _NETXEN_NIC_LINUX_SUBVERSION 3
-#define NETXEN_NIC_LINUX_VERSIONID  "3.3.2" "-" NETXEN_NIC_BUILD_NO
+#define NETXEN_NIC_LINUX_VERSIONID  "3.3.3" "-" NETXEN_NIC_BUILD_NO
-#define NETXEN_NIC_FW_VERSIONID "3.3.2"
 #define RCV_DESC_RINGSIZE       \
        (sizeof(struct rcv_desc) * adapter->max_rx_desc_count)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index c0c31d1914a7..191e2336e323 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -984,7 +984,8 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
                       _NETXEN_NIC_LINUX_MAJOR, fw_major);
                adapter->driver_mismatch = 1;
        }
-        if (fw_minor != _NETXEN_NIC_LINUX_MINOR) {
+        if (fw_minor != _NETXEN_NIC_LINUX_MINOR &&
+                        fw_minor != (_NETXEN_NIC_LINUX_MINOR + 1)) {
                printk(KERN_ERR "The mismatch in driver version and firmware "
                       "version minor number\n"
                       "Driver version minor number = %d \t"
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 8a5792fea774..96e1bee19ba0 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1144,7 +1144,7 @@ static int __init netxen_init_module(void)
        if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0)
                return -ENOMEM;
-        return pci_module_init(&netxen_driver);
+        return pci_register_driver(&netxen_driver);
 }
 module_init(netxen_init_module);
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 342f4062de0b..461e8274ef69 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -606,11 +606,14 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
    kio_addr_t ioaddr = dev->base_addr;
    struct el3_private *priv = netdev_priv(dev);
+    unsigned long flags;
    DEBUG(3, "%s: el3_start_xmit(length = %ld) called, "
          "status %4.4x.\n", dev->name, (long)skb->len,
          inw(ioaddr + EL3_STATUS));
+    spin_lock_irqsave(&priv->lock, flags);    
    priv->stats.tx_bytes += skb->len;
    /* Put out the doubleword header... */
@@ -628,6 +631,7 @@ static int el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
    dev_kfree_skb(skb);
    pop_tx_status(dev);
+    spin_unlock_irqrestore(&priv->lock, flags);    
    
    return 0;
 }
@@ -729,14 +733,13 @@ static void media_check(unsigned long arg)
    if (!netif_device_present(dev)) goto reschedule;
-    EL3WINDOW(1);
    /* Check for pending interrupt with expired latency timer: with
       this, we can limp along even if the interrupt is blocked */
    if ((inw(ioaddr + EL3_STATUS) & IntLatch) &&
        (inb(ioaddr + EL3_TIMER) == 0xff)) {
        if (!lp->fast_poll)
            printk(KERN_WARNING "%s: interrupt(s) dropped!\n", dev->name);
-        el3_interrupt(dev->irq, lp);
+        el3_interrupt(dev->irq, dev);
        lp->fast_poll = HZ;
    }
    if (lp->fast_poll) {
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index e175f3910b18..9765fa661467 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -286,6 +286,7 @@ int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd)
        return 0;
 }
+EXPORT_SYMBOL(phy_ethtool_sset);
 int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
 {
@@ -302,7 +303,7 @@ int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd)
        return 0;
 }
+EXPORT_SYMBOL(phy_ethtool_gset);
 /* Note that this function is currently incompatible with the
 * PHYCONTROL layer.  It changes registers without regard to
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 250cdbeefdfd..1dd66b8ea0fa 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -556,10 +556,9 @@ static int init_shared_mem(struct s2io_nic *nic)
                }
        }
-        nic->ufo_in_band_v = kmalloc((sizeof(u64) * size), GFP_KERNEL);
+        nic->ufo_in_band_v = kcalloc(size, sizeof(u64), GFP_KERNEL);
        if (!nic->ufo_in_band_v)
                return -ENOMEM;
-        memset(nic->ufo_in_band_v, 0, size);
        /* Allocation and initialization of RXDs in Rings */
        size = 0;
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index b70ed79d4121..45d91b159100 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1562,7 +1562,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
        for (i = 0; i < MAC_ADDR_LEN / 2; i++) {
                __le16 w = sis190_read_eeprom(ioaddr, EEPROMMACAddr + i);
-                ((u16 *)dev->dev_addr)[0] = le16_to_cpu(w);
+                ((u16 *)dev->dev_addr)[i] = le16_to_cpu(w);
        }
        sis190_set_rgmii(tp, sis190_read_eeprom(ioaddr, EEPROMInfo));
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index deedfd5f8226..45283f3f95e4 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -60,7 +60,7 @@
 #define LINK_HZ                 (HZ/2)
 MODULE_DESCRIPTION("SysKonnect Gigabit Ethernet driver");
-MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
+MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index a6601e8d423c..a2e804ddca6c 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -3691,6 +3691,6 @@ module_init(sky2_init_module);
 module_exit(sky2_cleanup_module);
 MODULE_DESCRIPTION("Marvell Yukon 2 Gigabit Ethernet driver");
-MODULE_AUTHOR("Stephen Hemminger <shemminger@osdl.org>");
+MODULE_AUTHOR("Stephen Hemminger <shemminger@linux-foundation.org>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 8243150f5b05..7e4b23c7c1ba 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -29,6 +29,7 @@
 #include <linux/fsl_devices.h>
 #include <linux/ethtool.h>
 #include <linux/mii.h>
+#include <linux/workqueue.h>
 #include <asm/of_platform.h>
 #include <asm/uaccess.h>
@@ -472,7 +473,7 @@ static void put_enet_addr_container(struct enet_addr_container *enet_addr_cont)
        kfree(enet_addr_cont);
 }
-static int set_mac_addr(__be16 __iomem *reg, u8 *mac)
+static void set_mac_addr(__be16 __iomem *reg, u8 *mac)
 {
        out_be16(&reg[0], ((u16)mac[5] << 8) | mac[4]);
        out_be16(&reg[1], ((u16)mac[3] << 8) | mac[2]);
@@ -3920,10 +3921,11 @@ static irqreturn_t phy_interrupt(int irq, void *dev_id)
 }
 /* Scheduled by the phy_interrupt/timer to handle PHY changes */
-static void ugeth_phy_change(void *data)
+static void ugeth_phy_change(struct work_struct *work)
 {
-        struct net_device *dev = (struct net_device *)data;
+        struct ucc_geth_private *ugeth =
-        struct ucc_geth_private *ugeth = netdev_priv(dev);
+                container_of(work, struct ucc_geth_private, tq);
+        struct net_device *dev = ugeth->dev;
        struct ucc_geth *ug_regs;
        int result = 0;
@@ -4080,7 +4082,7 @@ static int ucc_geth_open(struct net_device *dev)
 #endif                          /* CONFIG_UGETH_NAPI */
        /* Set up the PHY change work queue */
-        INIT_WORK(&ugeth->tq, ugeth_phy_change, dev);
+        INIT_WORK(&ugeth->tq, ugeth_phy_change);
        init_timer(&ugeth->phy_info_timer);
        ugeth->phy_info_timer.function = &ugeth_phy_startup_timer;
diff --git a/drivers/net/ucc_geth_phy.c b/drivers/net/ucc_geth_phy.c
index 5360ec05eaa3..3c86592ce03c 100644
--- a/drivers/net/ucc_geth_phy.c
+++ b/drivers/net/ucc_geth_phy.c
@@ -68,8 +68,31 @@ static int gbit_config_aneg(struct ugeth_mii_info *mii_info);
 static int genmii_config_aneg(struct ugeth_mii_info *mii_info);
 static int genmii_update_link(struct ugeth_mii_info *mii_info);
 static int genmii_read_status(struct ugeth_mii_info *mii_info);
-u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum);
-void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val);
+static u16 ucc_geth_phy_read(struct ugeth_mii_info *mii_info, u16 regnum)
+{
+        u16 retval;
+        unsigned long flags;
+        ugphy_vdbg("%s: IN", __FUNCTION__);
+        spin_lock_irqsave(&mii_info->mdio_lock, flags);
+        retval = mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum);
+        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
+        return retval;
+}
+static void ucc_geth_phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val)
+{
+        unsigned long flags;
+        ugphy_vdbg("%s: IN", __FUNCTION__);
+        spin_lock_irqsave(&mii_info->mdio_lock, flags);
+        mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val);
+        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
+}
 /* Write value to the PHY for this device to the register at regnum, */
 /* waiting until the write is done before it returns.  All PHY */
@@ -184,7 +207,7 @@ static void config_genmii_advert(struct ugeth_mii_info *mii_info)
        advertise = mii_info->advertising;
        /* Setup standard advertisement */
-        adv = phy_read(mii_info, MII_ADVERTISE);
+        adv = ucc_geth_phy_read(mii_info, MII_ADVERTISE);
        adv &= ~(ADVERTISE_ALL | ADVERTISE_100BASE4);
        if (advertise & ADVERTISED_10baseT_Half)
                adv |= ADVERTISE_10HALF;
@@ -194,7 +217,7 @@ static void config_genmii_advert(struct ugeth_mii_info *mii_info)
                adv |= ADVERTISE_100HALF;
        if (advertise & ADVERTISED_100baseT_Full)
                adv |= ADVERTISE_100FULL;
-        phy_write(mii_info, MII_ADVERTISE, adv);
+        ucc_geth_phy_write(mii_info, MII_ADVERTISE, adv);
 }
 static void genmii_setup_forced(struct ugeth_mii_info *mii_info)
@@ -204,7 +227,7 @@ static void genmii_setup_forced(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
-        ctrl = phy_read(mii_info, MII_BMCR);
+        ctrl = ucc_geth_phy_read(mii_info, MII_BMCR);
        ctrl &=
            ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE);
@@ -234,7 +257,7 @@ static void genmii_setup_forced(struct ugeth_mii_info *mii_info)
                break;
        }
-        phy_write(mii_info, MII_BMCR, ctrl);
+        ucc_geth_phy_write(mii_info, MII_BMCR, ctrl);
 }
 /* Enable and Restart Autonegotiation */
@@ -244,9 +267,9 @@ static void genmii_restart_aneg(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
-        ctl = phy_read(mii_info, MII_BMCR);
+        ctl = ucc_geth_phy_read(mii_info, MII_BMCR);
        ctl |= (BMCR_ANENABLE | BMCR_ANRESTART);
-        phy_write(mii_info, MII_BMCR, ctl);
+        ucc_geth_phy_write(mii_info, MII_BMCR, ctl);
 }
 static int gbit_config_aneg(struct ugeth_mii_info *mii_info)
@@ -261,14 +284,14 @@ static int gbit_config_aneg(struct ugeth_mii_info *mii_info)
                config_genmii_advert(mii_info);
                advertise = mii_info->advertising;
-                adv = phy_read(mii_info, MII_1000BASETCONTROL);
+                adv = ucc_geth_phy_read(mii_info, MII_1000BASETCONTROL);
                adv &= ~(MII_1000BASETCONTROL_FULLDUPLEXCAP |
                         MII_1000BASETCONTROL_HALFDUPLEXCAP);
                if (advertise & SUPPORTED_1000baseT_Half)
                        adv |= MII_1000BASETCONTROL_HALFDUPLEXCAP;
                if (advertise & SUPPORTED_1000baseT_Full)
                        adv |= MII_1000BASETCONTROL_FULLDUPLEXCAP;
-                phy_write(mii_info, MII_1000BASETCONTROL, adv);
+                ucc_geth_phy_write(mii_info, MII_1000BASETCONTROL, adv);
                /* Start/Restart aneg */
                genmii_restart_aneg(mii_info);
@@ -298,10 +321,10 @@ static int genmii_update_link(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        /* Do a fake read */
-        phy_read(mii_info, MII_BMSR);
+        ucc_geth_phy_read(mii_info, MII_BMSR);
        /* Read link and autonegotiation status */
-        status = phy_read(mii_info, MII_BMSR);
+        status = ucc_geth_phy_read(mii_info, MII_BMSR);
        if ((status & BMSR_LSTATUS) == 0)
                mii_info->link = 0;
        else
@@ -329,7 +352,7 @@ static int genmii_read_status(struct ugeth_mii_info *mii_info)
                return err;
        if (mii_info->autoneg) {
-                status = phy_read(mii_info, MII_LPA);
+                status = ucc_geth_phy_read(mii_info, MII_LPA);
                if (status & (LPA_10FULL | LPA_100FULL))
                        mii_info->duplex = DUPLEX_FULL;
@@ -352,9 +375,9 @@ static int marvell_init(struct ugeth_mii_info *mii_info)
 {
        ugphy_vdbg("%s: IN", __FUNCTION__);
-        phy_write(mii_info, 0x14, 0x0cd2);
+        ucc_geth_phy_write(mii_info, 0x14, 0x0cd2);
-        phy_write(mii_info, MII_BMCR,
+        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  phy_read(mii_info, MII_BMCR) | BMCR_RESET);
+                  ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET);
        msleep(4000);
        return 0;
@@ -367,13 +390,13 @@ static int marvell_config_aneg(struct ugeth_mii_info *mii_info)
        /* The Marvell PHY has an errata which requires
         * that certain registers get written in order
         * to restart autonegotiation */
-        phy_write(mii_info, MII_BMCR, BMCR_RESET);
+        ucc_geth_phy_write(mii_info, MII_BMCR, BMCR_RESET);
-        phy_write(mii_info, 0x1d, 0x1f);
+        ucc_geth_phy_write(mii_info, 0x1d, 0x1f);
-        phy_write(mii_info, 0x1e, 0x200c);
+        ucc_geth_phy_write(mii_info, 0x1e, 0x200c);
-        phy_write(mii_info, 0x1d, 0x5);
+        ucc_geth_phy_write(mii_info, 0x1d, 0x5);
-        phy_write(mii_info, 0x1e, 0);
+        ucc_geth_phy_write(mii_info, 0x1e, 0);
-        phy_write(mii_info, 0x1e, 0x100);
+        ucc_geth_phy_write(mii_info, 0x1e, 0x100);
        gbit_config_aneg(mii_info);
@@ -398,7 +421,7 @@ static int marvell_read_status(struct ugeth_mii_info *mii_info)
         * are as set */
        if (mii_info->autoneg && mii_info->link) {
                int speed;
-                status = phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS);
+                status = ucc_geth_phy_read(mii_info, MII_M1011_PHY_SPEC_STATUS);
                /* Get the duplexity */
                if (status & MII_M1011_PHY_SPEC_STATUS_FULLDUPLEX)
@@ -430,7 +453,7 @@ static int marvell_ack_interrupt(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        /* Clear the interrupts by reading the reg */
-        phy_read(mii_info, MII_M1011_IEVENT);
+        ucc_geth_phy_read(mii_info, MII_M1011_IEVENT);
        return 0;
 }
@@ -440,9 +463,9 @@ static int marvell_config_intr(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT);
+                ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_INIT);
        else
-                phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR);
+                ucc_geth_phy_write(mii_info, MII_M1011_IMASK, MII_M1011_IMASK_CLEAR);
        return 0;
 }
@@ -451,9 +474,9 @@ static int cis820x_init(struct ugeth_mii_info *mii_info)
 {
        ugphy_vdbg("%s: IN", __FUNCTION__);
-        phy_write(mii_info, MII_CIS8201_AUX_CONSTAT,
+        ucc_geth_phy_write(mii_info, MII_CIS8201_AUX_CONSTAT,
                  MII_CIS8201_AUXCONSTAT_INIT);
-        phy_write(mii_info, MII_CIS8201_EXT_CON1, MII_CIS8201_EXTCON1_INIT);
+        ucc_geth_phy_write(mii_info, MII_CIS8201_EXT_CON1, MII_CIS8201_EXTCON1_INIT);
        return 0;
 }
@@ -477,7 +500,7 @@ static int cis820x_read_status(struct ugeth_mii_info *mii_info)
        if (mii_info->autoneg && mii_info->link) {
                int speed;
-                status = phy_read(mii_info, MII_CIS8201_AUX_CONSTAT);
+                status = ucc_geth_phy_read(mii_info, MII_CIS8201_AUX_CONSTAT);
                if (status & MII_CIS8201_AUXCONSTAT_DUPLEX)
                        mii_info->duplex = DUPLEX_FULL;
                else
@@ -505,7 +528,7 @@ static int cis820x_ack_interrupt(struct ugeth_mii_info *mii_info)
 {
        ugphy_vdbg("%s: IN", __FUNCTION__);
-        phy_read(mii_info, MII_CIS8201_ISTAT);
+        ucc_geth_phy_read(mii_info, MII_CIS8201_ISTAT);
        return 0;
 }
@@ -515,9 +538,9 @@ static int cis820x_config_intr(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                phy_write(mii_info, MII_CIS8201_IMASK, MII_CIS8201_IMASK_MASK);
+                ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, MII_CIS8201_IMASK_MASK);
        else
-                phy_write(mii_info, MII_CIS8201_IMASK, 0);
+                ucc_geth_phy_write(mii_info, MII_CIS8201_IMASK, 0);
        return 0;
 }
@@ -541,7 +564,7 @@ static int dm9161_read_status(struct ugeth_mii_info *mii_info)
        /* If we aren't autonegotiating, assume speeds
         * are as set */
        if (mii_info->autoneg && mii_info->link) {
-                status = phy_read(mii_info, MII_DM9161_SCSR);
+                status = ucc_geth_phy_read(mii_info, MII_DM9161_SCSR);
                if (status & (MII_DM9161_SCSR_100F | MII_DM9161_SCSR_100H))
                        mii_info->speed = SPEED_100;
                else
@@ -572,7 +595,7 @@ static void dm9161_timer(unsigned long data)
 {
        struct ugeth_mii_info *mii_info = (struct ugeth_mii_info *)data;
        struct dm9161_private *priv = mii_info->priv;
-        u16 status = phy_read(mii_info, MII_BMSR);
+        u16 status = ucc_geth_phy_read(mii_info, MII_BMSR);
        ugphy_vdbg("%s: IN", __FUNCTION__);
@@ -599,11 +622,11 @@ static int dm9161_init(struct ugeth_mii_info *mii_info)
        /* Reset is not done yet */
        priv->resetdone = 0;
-        phy_write(mii_info, MII_BMCR,
+        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  phy_read(mii_info, MII_BMCR) | BMCR_RESET);
+                  ucc_geth_phy_read(mii_info, MII_BMCR) | BMCR_RESET);
-        phy_write(mii_info, MII_BMCR,
+        ucc_geth_phy_write(mii_info, MII_BMCR,
-                  phy_read(mii_info, MII_BMCR) & ~BMCR_ISOLATE);
+                  ucc_geth_phy_read(mii_info, MII_BMCR) & ~BMCR_ISOLATE);
        config_genmii_advert(mii_info);
        /* Start/Restart aneg */
@@ -634,7 +657,7 @@ static int dm9161_ack_interrupt(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        /* Clear the interrupts by reading the reg */
-        phy_read(mii_info, MII_DM9161_INTR);
+        ucc_geth_phy_read(mii_info, MII_DM9161_INTR);
        return 0;
@@ -645,9 +668,9 @@ static int dm9161_config_intr(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        if (mii_info->interrupts == MII_INTERRUPT_ENABLED)
-                phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT);
+                ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_INIT);
        else
-                phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP);
+                ucc_geth_phy_write(mii_info, MII_DM9161_INTR, MII_DM9161_INTR_STOP);
        return 0;
 }
@@ -718,31 +741,6 @@ static struct phy_info *phy_info[] = {
        NULL
 };
-u16 phy_read(struct ugeth_mii_info *mii_info, u16 regnum)
-{
-        u16 retval;
-        unsigned long flags;
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-        spin_lock_irqsave(&mii_info->mdio_lock, flags);
-        retval = mii_info->mdio_read(mii_info->dev, mii_info->mii_id, regnum);
-        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
-        return retval;
-}
-void phy_write(struct ugeth_mii_info *mii_info, u16 regnum, u16 val)
-{
-        unsigned long flags;
-        ugphy_vdbg("%s: IN", __FUNCTION__);
-        spin_lock_irqsave(&mii_info->mdio_lock, flags);
-        mii_info->mdio_write(mii_info->dev, mii_info->mii_id, regnum, val);
-        spin_unlock_irqrestore(&mii_info->mdio_lock, flags);
-}
 /* Use the PHY ID registers to determine what type of PHY is attached
 * to device dev.  return a struct phy_info structure describing that PHY
 */
@@ -757,11 +755,11 @@ struct phy_info *get_phy_info(struct ugeth_mii_info *mii_info)
        ugphy_vdbg("%s: IN", __FUNCTION__);
        /* Grab the bits from PHYIR1, and put them in the upper half */
-        phy_reg = phy_read(mii_info, MII_PHYSID1);
+        phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID1);
        phy_ID = (phy_reg & 0xffff) << 16;
        /* Grab the bits from PHYIR2, and put them in the lower half */
-        phy_reg = phy_read(mii_info, MII_PHYSID2);
+        phy_reg = ucc_geth_phy_read(mii_info, MII_PHYSID2);
        phy_ID |= (phy_reg & 0xffff);
        /* loop through all the known PHY types, and find one that */
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 2ec2e5afce67..91b752e3d07e 100644
--- a/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -2701,8 +2701,8 @@ static int bcm43xx_probe_cores(struct bcm43xx_private *bcm)
                sb_id_hi = bcm43xx_read32(bcm, BCM43xx_CIR_SB_ID_HI);
                /* extract core_id, core_rev, core_vendor */
-                core_id = (sb_id_hi & 0xFFF0) >> 4;
+                core_id = (sb_id_hi & 0x8FF0) >> 4;
-                core_rev = (sb_id_hi & 0xF);
+                core_rev = ((sb_id_hi & 0xF) | ((sb_id_hi & 0x7000) >> 8));
                core_vendor = (sb_id_hi & 0xFFFF0000) >> 16;
                dprintk(KERN_INFO PFX "Core %d: ID 0x%x, rev 0x%x, vendor 0x%x\n",
@@ -2873,7 +2873,10 @@ static int bcm43xx_wireless_core_init(struct bcm43xx_private *bcm,
                sbimconfiglow = bcm43xx_read32(bcm, BCM43xx_CIR_SBIMCONFIGLOW);
                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_REQUEST_TOUT_MASK;
                sbimconfiglow &= ~ BCM43xx_SBIMCONFIGLOW_SERVICE_TOUT_MASK;
-                sbimconfiglow |= 0x32;
+                if (bcm->bustype == BCM43xx_BUSTYPE_PCI)
+                        sbimconfiglow |= 0x32;
+                else
+                        sbimconfiglow |= 0x53;
                bcm43xx_write32(bcm, BCM43xx_CIR_SBIMCONFIGLOW, sbimconfiglow);
        }
@@ -3077,7 +3080,7 @@ static int bcm43xx_setup_backplane_pci_connection(struct bcm43xx_private *bcm,
        if (err)
                goto out;
-        if (bcm->current_core->rev < 6 ||
+        if (bcm->current_core->rev < 6 &&
                bcm->current_core->id == BCM43xx_COREID_PCI) {
                value = bcm43xx_read32(bcm, BCM43xx_CIR_SBINTVEC);
                value |= (1 << backplane_flag_nr);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index b8d2385e29bc..92d5e8db0de7 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -150,8 +150,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
 }
 /**
- * pci_match_device - Tell if a PCI device structure has a matching
+ * pci_match_device - Tell if a PCI device structure has a matching PCI device id structure
- *                    PCI device id structure
 * @drv: the PCI driver to match against
 * @dev: the PCI device structure to match against
 *
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 0a70943f8bb6..ef882a8a094e 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -1002,6 +1002,11 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev)
                        case 0x186a: /* M6Ne notebook */
                                asus_hides_smbus = 1;
                        }
+                if (dev->device == PCI_DEVICE_ID_INTEL_82865_HB)
+                        switch (dev->subsystem_device) {
+                        case 0x80f2: /* P4P800-X */
+                                asus_hides_smbus = 1;
+                        }
                if (dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB) {
                        switch (dev->subsystem_device) {
                        case 0x1882: /* M6V notebook */
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index e9e0934380b8..198b9f22fbff 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -492,10 +492,10 @@ static int sh_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
        spin_lock_irq(&rtc->lock);
-        /* disable alarm interrupt and clear flag */
+        /* disable alarm interrupt and clear the alarm flag */
        rcr1 = readb(rtc->regbase + RCR1);
-        rcr1 &= ~RCR1_AF;
+        rcr1 &= ~(RCR1_AF|RCR1_AIE);
-        writeb(rcr1 & ~RCR1_AIE, rtc->regbase + RCR1);
+        writeb(rcr1, rtc->regbase + RCR1);
        rtc->rearm_aie = 0;
@@ -510,8 +510,10 @@ static int sh_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *wkalrm)
                mon += 1;
        sh_rtc_write_alarm_value(rtc, mon, RMONAR);
-        /* Restore interrupt activation status */
+        if (wkalrm->enabled) {
-        writeb(rcr1, rtc->regbase + RCR1);
+                rcr1 |= RCR1_AIE;
+                writeb(rcr1, rtc->regbase + RCR1);
+        }
        spin_unlock_irq(&rtc->lock);
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 99a259c5a0c0..e1b44d6c0c32 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -6,7 +6,7 @@
                     Arnaldo Carvalho de Melo <acme@conectiva.com.br>
                     Brad Strand <linux@3ware.com>
-   Copyright (C) 1999-2005 3ware Inc.
+   Copyright (C) 1999-2007 3ware Inc.
   Kernel compatiblity By:      Andre Hedrick <andre@suse.com>
   Non-Copyright (C) 2000       Andre Hedrick <andre@suse.com>
@@ -191,6 +191,9 @@
                 before shutting down card.
                 Change to new 'change_queue_depth' api.
                 Fix 'handled=1' ISR usage, remove bogus IRQ check.
+   1.26.02.002 - Free irq handler in __tw_shutdown().
+                 Turn on RCD bit for caching mode page.
+                 Serialize reset code.
 */
 #include <linux/module.h>
@@ -214,7 +217,7 @@
 #include "3w-xxxx.h"
 /* Globals */
-#define TW_DRIVER_VERSION "1.26.02.001"
+#define TW_DRIVER_VERSION "1.26.02.002"
 static TW_Device_Extension *tw_device_extension_list[TW_MAX_SLOT];
 static int tw_device_extension_count = 0;
 static int twe_major = -1;
@@ -226,7 +229,7 @@ MODULE_LICENSE("GPL");
 MODULE_VERSION(TW_DRIVER_VERSION);
 /* Function prototypes */
-static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset);
+static int tw_reset_device_extension(TW_Device_Extension *tw_dev);
 /* Functions */
@@ -984,24 +987,12 @@ static int tw_chrdev_ioctl(struct inode *inode, struct file *file, unsigned int
                        /* Now wait for the command to complete */
                        timeout = wait_event_timeout(tw_dev->ioctl_wqueue, tw_dev->chrdev_request_id == TW_IOCTL_CHRDEV_FREE, timeout);
-                        /* See if we reset while waiting for the ioctl to complete */
-                        if (test_bit(TW_IN_RESET, &tw_dev->flags)) {
-                                clear_bit(TW_IN_RESET, &tw_dev->flags);
-                                retval = -ERESTARTSYS;
-                                goto out2;
-                        }
                        /* We timed out, and didn't get an interrupt */
                        if (tw_dev->chrdev_request_id != TW_IOCTL_CHRDEV_FREE) {
                                /* Now we need to reset the board */
                                printk(KERN_WARNING "3w-xxxx: scsi%d: Character ioctl (0x%x) timed out, resetting card.\n", tw_dev->host->host_no, cmd);
                                retval = -EIO;
-                                spin_lock_irqsave(tw_dev->host->host_lock, flags);
+                                if (tw_reset_device_extension(tw_dev)) {
-                                tw_dev->state[request_id] = TW_S_COMPLETED;
-                                tw_state_request_finish(tw_dev, request_id);
-                                tw_dev->posted_request_count--;
-                                spin_unlock_irqrestore(tw_dev->host->host_lock, flags);
-                                if (tw_reset_device_extension(tw_dev, 1)) {
                                        printk(KERN_WARNING "3w-xxxx: tw_chrdev_ioctl(): Reset failed for card %d.\n", tw_dev->host->host_no);
                                }
                                goto out2;
@@ -1336,7 +1327,7 @@ static void tw_unmap_scsi_data(struct pci_dev *pdev, struct scsi_cmnd *cmd)
 } /* End tw_unmap_scsi_data() */
 /* This function will reset a device extension */
-static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_reset) 
+static int tw_reset_device_extension(TW_Device_Extension *tw_dev)
 {
        int i = 0;
        struct scsi_cmnd *srb;
@@ -1382,15 +1373,10 @@ static int tw_reset_device_extension(TW_Device_Extension *tw_dev, int ioctl_rese
                printk(KERN_WARNING "3w-xxxx: scsi%d: Reset sequence failed.\n", tw_dev->host->host_no);
                return 1;
        }
-        TW_ENABLE_AND_CLEAR_INTERRUPTS(tw_dev);
-        /* Wake up any ioctl that was pending before the reset */
+        TW_ENABLE_AND_CLEAR_INTERRUPTS(tw_dev);
-        if ((tw_dev->chrdev_request_id == TW_IOCTL_CHRDEV_FREE) || (ioctl_reset)) {
+        clear_bit(TW_IN_RESET, &tw_dev->flags);
-                clear_bit(TW_IN_RESET, &tw_dev->flags);
+        tw_dev->chrdev_request_id = TW_IOCTL_CHRDEV_FREE;
-        } else {
-                tw_dev->chrdev_request_id = TW_IOCTL_CHRDEV_FREE;
-                wake_up(&tw_dev->ioctl_wqueue);
-        }
        return 0;
 } /* End tw_reset_device_extension() */
@@ -1437,14 +1423,18 @@ static int tw_scsi_eh_reset(struct scsi_cmnd *SCpnt)
                "WARNING: Command (0x%x) timed out, resetting card.\n",
                SCpnt->cmnd[0]);
+        /* Make sure we are not issuing an ioctl or resetting from ioctl */
+        mutex_lock(&tw_dev->ioctl_lock);
        /* Now reset the card and some of the device extension data */
-        if (tw_reset_device_extension(tw_dev, 0)) {
+        if (tw_reset_device_extension(tw_dev)) {
                printk(KERN_WARNING "3w-xxxx: scsi%d: Reset failed.\n", tw_dev->host->host_no);
                goto out;
        }
        retval = SUCCESS;
 out:
+        mutex_unlock(&tw_dev->ioctl_lock);
        return retval;
 } /* End tw_scsi_eh_reset() */
@@ -1660,9 +1650,9 @@ static int tw_scsiop_mode_sense_complete(TW_Device_Extension *tw_dev, int reques
        request_buffer[4] = 0x8;        /* caching page */
        request_buffer[5] = 0xa;        /* page length */
        if (*flags & 0x1)
-                request_buffer[6] = 0x4;        /* WCE on */
+                request_buffer[6] = 0x5;        /* WCE on, RCD on */
        else
-                request_buffer[6] = 0x0;        /* WCE off */
+                request_buffer[6] = 0x1;        /* WCE off, RCD on */
        tw_transfer_internal(tw_dev, request_id, request_buffer,
                             sizeof(request_buffer));
@@ -2012,6 +2002,10 @@ static int tw_scsi_queue(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd
        int retval = 1;
        TW_Device_Extension *tw_dev = (TW_Device_Extension *)SCpnt->device->host->hostdata;
+        /* If we are resetting due to timed out ioctl, report as busy */
+        if (test_bit(TW_IN_RESET, &tw_dev->flags))
+                return SCSI_MLQUEUE_HOST_BUSY;
        /* Save done function into Scsi_Cmnd struct */
        SCpnt->scsi_done = done;
                 
@@ -2100,6 +2094,10 @@ static irqreturn_t tw_interrupt(int irq, void *dev_instance)
        handled = 1;
+        /* If we are resetting, bail */
+        if (test_bit(TW_IN_RESET, &tw_dev->flags))
+                goto tw_interrupt_bail;
        /* Check controller for errors */
        if (tw_check_bits(status_reg_value)) {
                dprintk(KERN_WARNING "3w-xxxx: tw_interrupt(): Unexpected bits.\n");
@@ -2276,6 +2274,9 @@ static void __tw_shutdown(TW_Device_Extension *tw_dev)
        /* Disable interrupts */
        TW_DISABLE_INTERRUPTS(tw_dev);
+        /* Free up the IRQ */
+        free_irq(tw_dev->tw_pci_dev->irq, tw_dev);
        printk(KERN_WARNING "3w-xxxx: Shutting down host %d.\n", tw_dev->host->host_no);
        /* Tell the card we are shutting down */
@@ -2444,9 +2445,6 @@ static void tw_remove(struct pci_dev *pdev)
                twe_major = -1;
        }
-        /* Free up the IRQ */
-        free_irq(tw_dev->tw_pci_dev->irq, tw_dev);
        /* Shutdown the card */
        __tw_shutdown(tw_dev);
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index bbd654a2b9b1..0742e6846656 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -6,7 +6,7 @@
                     Arnaldo Carvalho de Melo <acme@conectiva.com.br>
                     Brad Strand <linux@3ware.com>
-   Copyright (C) 1999-2005 3ware Inc.
+   Copyright (C) 1999-2007 3ware Inc.
   Kernel compatiblity By:      Andre Hedrick <andre@suse.com>
   Non-Copyright (C) 2000       Andre Hedrick <andre@suse.com>
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 60f582727185..7869c34a4a3e 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1303,7 +1303,7 @@ config SCSI_LPFC
 config SCSI_SEAGATE
        tristate "Seagate ST-02 and Future Domain TMC-8xx SCSI support"
-        depends on X86 && ISA && SCSI && BROKEN
+        depends on X86 && ISA && SCSI
        ---help---
          These are 8-bit SCSI controllers; the ST-01 is also supported by
          this driver.  It is explained in section 3.9 of the SCSI-HOWTO,
diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 359e7ddfdb47..d2cf875af59b 100644
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -117,8 +117,8 @@ static struct pci_device_id aac_pci_tbl[] = {
        { 0x9005, 0x0286, 0x9005, 0x029b, 0, 0, 22 }, /* AAR-2820SA (Intruder) */
        { 0x9005, 0x0286, 0x9005, 0x029c, 0, 0, 23 }, /* AAR-2620SA (Intruder) */
        { 0x9005, 0x0286, 0x9005, 0x029d, 0, 0, 24 }, /* AAR-2420SA (Intruder) */
-        { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024R0 (Lancer) */
+        { 0x9005, 0x0286, 0x9005, 0x029e, 0, 0, 25 }, /* ICP9024RO (Lancer) */
-        { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014R0 (Lancer) */
+        { 0x9005, 0x0286, 0x9005, 0x029f, 0, 0, 26 }, /* ICP9014RO (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a0, 0, 0, 27 }, /* ICP9047MA (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a1, 0, 0, 28 }, /* ICP9087MA (Lancer) */
        { 0x9005, 0x0286, 0x9005, 0x02a3, 0, 0, 29 }, /* ICP5445AU (Hurricane44) */
@@ -137,15 +137,15 @@ static struct pci_device_id aac_pci_tbl[] = {
        { 0x9005, 0x0285, 0x9005, 0x0294, 0, 0, 41 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
        { 0x9005, 0x0285, 0x103C, 0x3227, 0, 0, 42 }, /* AAR-2610SA PCI SATA 6ch */
        { 0x9005, 0x0285, 0x9005, 0x0296, 0, 0, 43 }, /* ASR-2240S (SabreExpress) */
-        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005SAS */
+        { 0x9005, 0x0285, 0x9005, 0x0297, 0, 0, 44 }, /* ASR-4005 */
        { 0x9005, 0x0285, 0x1014, 0x02F2, 0, 0, 45 }, /* IBM 8i (AvonPark) */
        { 0x9005, 0x0285, 0x1014, 0x0312, 0, 0, 45 }, /* IBM 8i (AvonPark Lite) */
        { 0x9005, 0x0286, 0x1014, 0x9580, 0, 0, 46 }, /* IBM 8k/8k-l8 (Aurora) */
        { 0x9005, 0x0286, 0x1014, 0x9540, 0, 0, 47 }, /* IBM 8k/8k-l4 (Aurora Lite) */
-        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000SAS (BlackBird) */
+        { 0x9005, 0x0285, 0x9005, 0x0298, 0, 0, 48 }, /* ASR-4000 (BlackBird) */
        { 0x9005, 0x0285, 0x9005, 0x0299, 0, 0, 49 }, /* ASR-4800SAS (Marauder-X) */
        { 0x9005, 0x0285, 0x9005, 0x029a, 0, 0, 50 }, /* ASR-4805SAS (Marauder-E) */
-        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800SAS (Hurricane44) */
+        { 0x9005, 0x0286, 0x9005, 0x02a2, 0, 0, 51 }, /* ASR-3800 (Hurricane44) */
        { 0x9005, 0x0285, 0x1028, 0x0287, 0, 0, 52 }, /* Perc 320/DC*/
        { 0x1011, 0x0046, 0x9005, 0x0365, 0, 0, 53 }, /* Adaptec 5400S (Mustang)*/
@@ -193,8 +193,8 @@ static struct aac_driver_ident aac_drivers[] = {
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2820SA      ", 1 }, /* AAR-2820SA (Intruder) */
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2620SA      ", 1 }, /* AAR-2620SA (Intruder) */
        { aac_rkt_init, "aacraid",  "ADAPTEC ", "AAR-2420SA      ", 1 }, /* AAR-2420SA (Intruder) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9024R0       ", 2 }, /* ICP9024R0 (Lancer) */
+        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9024RO       ", 2 }, /* ICP9024RO (Lancer) */
-        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9014R0       ", 1 }, /* ICP9014R0 (Lancer) */
+        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9014RO       ", 1 }, /* ICP9014RO (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9047MA       ", 1 }, /* ICP9047MA (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP9087MA       ", 1 }, /* ICP9087MA (Lancer) */
        { aac_rkt_init, "aacraid",  "ICP     ", "ICP5445AU       ", 1 }, /* ICP5445AU (Hurricane44) */
@@ -212,14 +212,14 @@ static struct aac_driver_ident aac_drivers[] = {
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2026ZCR     ", 1 }, /* ESD SO-DIMM PCI-X SATA ZCR (Prowler) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "AAR-2610SA      ", 1 }, /* SATA 6Ch (Bearcat) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-2240S       ", 1 }, /* ASR-2240S (SabreExpress) */
-        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005SAS     ", 1 }, /* ASR-4005SAS */
+        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4005        ", 1 }, /* ASR-4005 */
        { aac_rx_init, "ServeRAID","IBM     ", "ServeRAID 8i    ", 1 }, /* IBM 8i (AvonPark) */
        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l8 ", 1 }, /* IBM 8k/8k-l8 (Aurora) */
        { aac_rkt_init, "ServeRAID","IBM     ", "ServeRAID 8k-l4 ", 1 }, /* IBM 8k/8k-l4 (Aurora Lite) */
-        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000SAS     ", 1 }, /* ASR-4000SAS (BlackBird & AvonPark) */
+        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4000        ", 1 }, /* ASR-4000 (BlackBird & AvonPark) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4800SAS     ", 1 }, /* ASR-4800SAS (Marauder-X) */
        { aac_rx_init, "aacraid",  "ADAPTEC ", "ASR-4805SAS     ", 1 }, /* ASR-4805SAS (Marauder-E) */
-        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800SAS     ", 1 }, /* ASR-3800SAS (Hurricane44) */
+        { aac_rkt_init, "aacraid",  "ADAPTEC ", "ASR-3800        ", 1 }, /* ASR-3800 (Hurricane44) */
        { aac_rx_init, "percraid", "DELL    ", "PERC 320/DC     ", 2, AAC_QUIRK_31BIT | AAC_QUIRK_34SG }, /* Perc 320/DC*/
        { aac_sa_init, "aacraid",  "ADAPTEC ", "Adaptec 5400S   ", 4, AAC_QUIRK_34SG }, /* Adaptec 5400S (Mustang)*/
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 2b344356a29e..306bec355e45 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -18215,6 +18215,7 @@ AdvInquiryHandling(
 }
 MODULE_LICENSE("Dual BSD/GPL");
+#ifdef CONFIG_PCI
 /* PCI Devices supported by this driver */
 static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
        { PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A,
@@ -18232,4 +18233,4 @@ static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
        { }
 };
 MODULE_DEVICE_TABLE(pci, advansys_pci_tbl);
+#endif /* CONFIG_PCI */
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index d0b139cccbbc..437684084377 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -749,7 +749,7 @@ static int iscsi_scsi_data_in(struct iscsi_conn *conn)
                                if (!offset)
                                        crypto_hash_update(
                                                        &tcp_conn->rx_hash,
-                                                        &sg[i], 1);
+                                                        &sg[i], sg[i].length);
                                else
                                        partial_sg_digest_update(
                                                        &tcp_conn->rx_hash,
@@ -1777,13 +1777,13 @@ iscsi_tcp_conn_create(struct iscsi_cls_session *cls_session, uint32_t conn_idx)
        tcp_conn->tx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                  CRYPTO_ALG_ASYNC);
        tcp_conn->tx_hash.flags = 0;
-        if (!tcp_conn->tx_hash.tfm)
+        if (IS_ERR(tcp_conn->tx_hash.tfm))
                goto free_tcp_conn;
        tcp_conn->rx_hash.tfm = crypto_alloc_hash("crc32c", 0,
                                                  CRYPTO_ALG_ASYNC);
        tcp_conn->rx_hash.flags = 0;
-        if (!tcp_conn->rx_hash.tfm)
+        if (IS_ERR(tcp_conn->rx_hash.tfm))
                goto free_tx_tfm;
        return cls_conn;
@@ -2044,13 +2044,11 @@ iscsi_tcp_conn_get_param(struct iscsi_cls_conn *cls_conn,
                sk = tcp_conn->sock->sk;
                if (sk->sk_family == PF_INET) {
                        inet = inet_sk(sk);
-                        len = sprintf(buf, "%u.%u.%u.%u\n",
+                        len = sprintf(buf, NIPQUAD_FMT "\n",
                                      NIPQUAD(inet->daddr));
                } else {
                        np = inet6_sk(sk);
-                        len = sprintf(buf,
+                        len = sprintf(buf, NIP6_FMT "\n", NIP6(np->daddr));
-                                "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-                                NIP6(np->daddr));
                }
                mutex_unlock(&conn->xmitmutex);
                break;
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index e11b23c641e2..d37048c96eab 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -260,7 +260,7 @@ static int iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
        }
        if (rhdr->cmd_status == SAM_STAT_CHECK_CONDITION) {
-                int senselen;
+                uint16_t senselen;
                if (datalen < 2) {
 invalid_datalen:
@@ -270,12 +270,12 @@ invalid_datalen:
                        goto out;
                }
-                senselen = (data[0] << 8) | data[1];
+                senselen = be16_to_cpu(*(uint16_t *)data);
                if (datalen < senselen)
                        goto invalid_datalen;
                memcpy(sc->sense_buffer, data + 2,
-                       min(senselen, SCSI_SENSE_BUFFERSIZE));
+                       min_t(uint16_t, senselen, SCSI_SENSE_BUFFERSIZE));
                debug_scsi("copied %d bytes of sense\n",
                           min(senselen, SCSI_SENSE_BUFFERSIZE));
        }
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 066292d3995a..ec3bbbde6f7a 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -56,6 +56,9 @@ lpfc_mem_alloc(struct lpfc_hba * phba)
        pool->elements = kmalloc(sizeof(struct lpfc_dmabuf) *
                                         LPFC_MBUF_POOL_SIZE, GFP_KERNEL);
+        if (!pool->elements)
+                goto fail_free_lpfc_mbuf_pool;
        pool->max_count = 0;
        pool->current_count = 0;
        for ( i = 0; i < LPFC_MBUF_POOL_SIZE; i++) {
@@ -82,10 +85,11 @@ lpfc_mem_alloc(struct lpfc_hba * phba)
 fail_free_mbox_pool:
        mempool_destroy(phba->mbox_mem_pool);
 fail_free_mbuf_pool:
-        while (--i)
+        while (i--)
                pci_pool_free(phba->lpfc_mbuf_pool, pool->elements[i].virt,
                                                 pool->elements[i].phys);
        kfree(pool->elements);
+ fail_free_lpfc_mbuf_pool:
        pci_pool_destroy(phba->lpfc_mbuf_pool);
 fail_free_dma_buf_pool:
        pci_pool_destroy(phba->lpfc_scsi_dma_buf_pool);
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 046223b4ae57..b5bdd0d7a8bf 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -13,8 +13,8 @@
 * Version      : v00.00.03.05
 *
 * Authors:
- *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsil.com>
+ *      Sreenivas Bagalkote     <Sreenivas.Bagalkote@lsi.com>
- *      Sumant Patro            <Sumant.Patro@lsil.com>
+ *      Sumant Patro            <Sumant.Patro@lsi.com>
 *
 * List of supported controllers
 *
@@ -45,7 +45,7 @@
 MODULE_LICENSE("GPL");
 MODULE_VERSION(MEGASAS_VERSION);
-MODULE_AUTHOR("sreenivas.bagalkote@lsil.com");
+MODULE_AUTHOR("megaraidlinux@lsi.com");
 MODULE_DESCRIPTION("LSI Logic MegaRAID SAS Driver");
 /*
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 16af5b79e587..1548d42a3b43 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -1341,7 +1341,7 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
        int host_status = DID_ERROR;
        uint16_t comp_status = le16_to_cpu(sts->comp_status);
        uint16_t state_flags = le16_to_cpu(sts->state_flags);
-        uint16_t residual_length = le32_to_cpu(sts->residual_length);
+        uint32_t residual_length = le32_to_cpu(sts->residual_length);
        uint16_t scsi_status = le16_to_cpu(sts->scsi_status);
 #if DEBUG_QLA1280_INTR
        static char *reason[] = {
@@ -1413,8 +1413,10 @@ qla1280_return_status(struct response * sts, struct scsi_cmnd *cp)
                               "scsi: Underflow detected - retrying "
                               "command.\n");
                        host_status = DID_ERROR;
-                } else
+                } else {
+                        cp->resid = residual_length;
                        host_status = DID_OK;
+                }
                break;
        default:
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index c4fc40f8e8ca..2c10130d9e03 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1602,6 +1602,7 @@ typedef struct fc_port {
 #define CT_REJECT_RESPONSE      0x8001
 #define CT_ACCEPT_RESPONSE      0x8002
+#define CT_REASON_INVALID_COMMAND_CODE  0x01
 #define CT_REASON_CANNOT_PERFORM        0x09
 #define CT_EXPL_ALREADY_REGISTERED      0x10
@@ -2079,6 +2080,7 @@ typedef struct scsi_qla_host {
                uint32_t        msi_enabled             :1;
                uint32_t        msix_enabled            :1;
                uint32_t        disable_serdes          :1;
+                uint32_t        gpsc_supported          :1;
        } flags;
        atomic_t        loop_state;
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
index 32ebeec45ff0..e4dd12f4b80e 100644
--- a/drivers/scsi/qla2xxx/qla_gbl.h
+++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -45,7 +45,6 @@ extern void qla2x00_update_fcports(scsi_qla_host_t *);
 extern int qla2x00_abort_isp(scsi_qla_host_t *);
 extern void qla2x00_update_fcport(scsi_qla_host_t *, fc_port_t *);
-extern void qla2x00_reg_remote_port(scsi_qla_host_t *, fc_port_t *);
 extern void qla2x00_alloc_fw_dump(scsi_qla_host_t *);
 extern void qla2x00_try_to_stop_firmware(scsi_qla_host_t *);
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 97fbc62ec669..ec5b2dd90d6a 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -127,8 +127,8 @@ qla2x00_chk_ms_status(scsi_qla_host_t *ha, ms_iocb_entry_t *ms_pkt,
                    ha->host_no, routine, ms_pkt->entry_status));
        } else {
                if (IS_QLA24XX(ha) || IS_QLA54XX(ha))
-                        comp_status =
+                        comp_status = le16_to_cpu(
-                            ((struct ct_entry_24xx *)ms_pkt)->comp_status;
+                            ((struct ct_entry_24xx *)ms_pkt)->comp_status);
                else
                        comp_status = le16_to_cpu(ms_pkt->status);
                switch (comp_status) {
@@ -143,6 +143,7 @@ qla2x00_chk_ms_status(scsi_qla_host_t *ha, ms_iocb_entry_t *ms_pkt,
                                DEBUG2_3(qla2x00_dump_buffer(
                                    (uint8_t *)&ct_rsp->header,
                                    sizeof(struct ct_rsp_hdr)));
+                                rval = QLA_INVALID_COMMAND;
                        } else
                                rval = QLA_SUCCESS;
                        break;
@@ -1683,7 +1684,7 @@ qla2x00_gfpn_id(scsi_qla_host_t *ha, sw_info_t *list)
                memset(list[i].fabric_port_name, 0, WWN_SIZE);
                /* Prepare common MS IOCB */
-                ms_pkt = qla2x00_prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
+                ms_pkt = ha->isp_ops.prep_ms_iocb(ha, GFPN_ID_REQ_SIZE,
                    GFPN_ID_RSP_SIZE);
                /* Prepare CT request */
@@ -1784,6 +1785,8 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
        if (!IS_QLA24XX(ha) && !IS_QLA54XX(ha))
                return QLA_FUNCTION_FAILED;
+        if (!ha->flags.gpsc_supported)
+                return QLA_FUNCTION_FAILED;
        rval = qla2x00_mgmt_svr_login(ha);
        if (rval)
@@ -1813,8 +1816,19 @@ qla2x00_gpsc(scsi_qla_host_t *ha, sw_info_t *list)
                        /*EMPTY*/
                        DEBUG2_3(printk("scsi(%ld): GPSC issue IOCB "
                            "failed (%d).\n", ha->host_no, rval));
-                } else if (qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp,
+                } else if ((rval = qla2x00_chk_ms_status(ha, ms_pkt, ct_rsp,
-                    "GPSC") != QLA_SUCCESS) {
+                    "GPSC")) != QLA_SUCCESS) {
+                        /* FM command unsupported? */
+                        if (rval == QLA_INVALID_COMMAND &&
+                            ct_rsp->header.reason_code ==
+                            CT_REASON_INVALID_COMMAND_CODE) {
+                                DEBUG2(printk("scsi(%ld): GPSC command "
+                                    "unsupported, disabling query...\n",
+                                    ha->host_no));
+                                ha->flags.gpsc_supported = 0;
+                                rval = QLA_FUNCTION_FAILED;
+                                break;
+                        }
                        rval = QLA_FUNCTION_FAILED;
                } else {
                        /* Save portname */
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index a823f0bc519d..b3dac26ddba3 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2103,40 +2103,7 @@ qla2x00_iidma_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
        }
 }
-/*
+static void
- * qla2x00_update_fcport
- *      Updates device on list.
- *
- * Input:
- *      ha = adapter block pointer.
- *      fcport = port structure pointer.
- *
- * Return:
- *      0  - Success
- *  BIT_0 - error
- *
- * Context:
- *      Kernel context.
- */
-void
-qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
-{
-        fcport->ha = ha;
-        fcport->login_retry = 0;
-        fcport->port_login_retry_count = ha->port_down_retry_count *
-            PORT_RETRY_TIME;
-        atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *
-            PORT_RETRY_TIME);
-        fcport->flags &= ~FCF_LOGIN_NEEDED;
-        qla2x00_iidma_fcport(ha, fcport);
-        atomic_set(&fcport->state, FCS_ONLINE);
-        qla2x00_reg_remote_port(ha, fcport);
-}
-void
 qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
 {
        struct fc_rport_identifiers rport_ids;
@@ -2179,6 +2146,39 @@ qla2x00_reg_remote_port(scsi_qla_host_t *ha, fc_port_t *fcport)
 }
 /*
+ * qla2x00_update_fcport
+ *      Updates device on list.
+ *
+ * Input:
+ *      ha = adapter block pointer.
+ *      fcport = port structure pointer.
+ *
+ * Return:
+ *      0  - Success
+ *  BIT_0 - error
+ *
+ * Context:
+ *      Kernel context.
+ */
+void
+qla2x00_update_fcport(scsi_qla_host_t *ha, fc_port_t *fcport)
+{
+        fcport->ha = ha;
+        fcport->login_retry = 0;
+        fcport->port_login_retry_count = ha->port_down_retry_count *
+            PORT_RETRY_TIME;
+        atomic_set(&fcport->port_down_timer, ha->port_down_retry_count *
+            PORT_RETRY_TIME);
+        fcport->flags &= ~FCF_LOGIN_NEEDED;
+        qla2x00_iidma_fcport(ha, fcport);
+        atomic_set(&fcport->state, FCS_ONLINE);
+        qla2x00_reg_remote_port(ha, fcport);
+}
+/*
 * qla2x00_configure_fabric
 *      Setup SNS devices with loop ID's.
 *
@@ -3476,9 +3476,11 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
        /* Set host adapter parameters. */
        ha->flags.disable_risc_code_load = 0;
-        ha->flags.enable_lip_reset = 1;
+        ha->flags.enable_lip_reset = 0;
-        ha->flags.enable_lip_full_login = 1;
+        ha->flags.enable_lip_full_login =
-        ha->flags.enable_target_reset = 1;
+            le32_to_cpu(nv->host_p) & BIT_10 ? 1: 0;
+        ha->flags.enable_target_reset =
+            le32_to_cpu(nv->host_p) & BIT_11 ? 1: 0;
        ha->flags.enable_led_scheme = 0;
        ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d3b6df4d55c8..39fd17b05be5 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -134,11 +134,11 @@ qla2300_intr_handler(int irq, void *dev_id)
                if (stat & HSR_RISC_PAUSED) {
                        hccr = RD_REG_WORD(&reg->hccr);
                        if (hccr & (BIT_15 | BIT_13 | BIT_11 | BIT_8))
-                                qla_printk(KERN_INFO, ha,
+                                qla_printk(KERN_INFO, ha, "Parity error -- "
-                                    "Parity error -- HCCR=%x.\n", hccr);
+                                    "HCCR=%x, Dumping firmware!\n", hccr);
                        else
-                                qla_printk(KERN_INFO, ha,
+                                qla_printk(KERN_INFO, ha, "RISC paused -- "
-                                    "RISC paused -- HCCR=%x.\n", hccr);
+                                    "HCCR=%x, Dumping firmware!\n", hccr);
                        /*
                         * Issue a "HARD" reset in order for the RISC
@@ -147,6 +147,8 @@ qla2300_intr_handler(int irq, void *dev_id)
                         */
                        WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);
                        RD_REG_WORD(&reg->hccr);
+                        ha->isp_ops.fw_dump(ha, 1);
                        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                        break;
                } else if ((stat & HSR_RISC_INT) == 0)
@@ -475,6 +477,8 @@ qla2x00_async_event(scsi_qla_host_t *ha, uint16_t *mb)
                        set_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
                }
                set_bit(REGISTER_FC4_NEEDED, &ha->dpc_flags);
+                ha->flags.gpsc_supported = 1;
                break;
        case MBA_CHG_IN_CONNECTION:     /* Change in connection mode */
@@ -1440,8 +1444,7 @@ qla24xx_intr_handler(int irq, void *dev_id)
                        qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
                            "Dumping firmware!\n", hccr);
-                        qla24xx_fw_dump(ha, 1);
+                        ha->isp_ops.fw_dump(ha, 1);
                        set_bit(ISP_ABORT_NEEDED, &ha->dpc_flags);
                        break;
                } else if ((stat & HSRX_RISC_INT) == 0)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 4cde76c85cb3..077e5789beeb 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1339,9 +1339,9 @@ qla2x00_lip_reset(scsi_qla_host_t *ha)
        if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) {
                mcp->mb[0] = MBC_LIP_FULL_LOGIN;
-                mcp->mb[1] = BIT_0;
+                mcp->mb[1] = BIT_6;
-                mcp->mb[2] = 0xff;
+                mcp->mb[2] = 0;
-                mcp->mb[3] = 0;
+                mcp->mb[3] = ha->loop_reset_delay;
                mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
        } else {
                mcp->mb[0] = MBC_LIP_RESET;
@@ -1823,8 +1823,8 @@ qla2x00_full_login_lip(scsi_qla_host_t *ha)
            ha->host_no));
        mcp->mb[0] = MBC_LIP_FULL_LOGIN;
-        mcp->mb[1] = 0;
+        mcp->mb[1] = IS_QLA24XX(ha) || IS_QLA54XX(ha) ? BIT_3: 0;
-        mcp->mb[2] = 0xff;
+        mcp->mb[2] = 0;
        mcp->mb[3] = 0;
        mcp->out_mb = MBX_3|MBX_2|MBX_1|MBX_0;
        mcp->in_mb = MBX_0;
@@ -2486,7 +2486,7 @@ qla2x00_trace_control(scsi_qla_host_t *ha, uint16_t ctrl, dma_addr_t eft_dma,
                mcp->mb[4] = LSW(MSD(eft_dma));
                mcp->mb[5] = MSW(MSD(eft_dma));
                mcp->mb[6] = buffers;
-                mcp->mb[7] = buffers;
+                mcp->mb[7] = 0;
                mcp->out_mb |= MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2;
        }
        mcp->tov = 30;
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index d03523d3bf38..d6445ae841ba 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1037,48 +1037,49 @@ eh_host_reset_lock:
 static int
 qla2x00_loop_reset(scsi_qla_host_t *ha)
 {
-        int status = QLA_SUCCESS;
+        int ret;
        struct fc_port *fcport;
+        if (ha->flags.enable_lip_full_login) {
+                ret = qla2x00_full_login_lip(ha);
+                if (ret != QLA_SUCCESS) {
+                        DEBUG2_3(printk("%s(%ld): bus_reset failed: "
+                            "full_login_lip=%d.\n", __func__, ha->host_no,
+                            ret));
+                }
+                atomic_set(&ha->loop_state, LOOP_DOWN);
+                atomic_set(&ha->loop_down_timer, LOOP_DOWN_TIME);
+                qla2x00_mark_all_devices_lost(ha, 0);
+                qla2x00_wait_for_loop_ready(ha);
+        }
        if (ha->flags.enable_lip_reset) {
-                status = qla2x00_lip_reset(ha);
+                ret = qla2x00_lip_reset(ha);
+                if (ret != QLA_SUCCESS) {
+                        DEBUG2_3(printk("%s(%ld): bus_reset failed: "
+                            "lip_reset=%d.\n", __func__, ha->host_no, ret));
+                }
+                qla2x00_wait_for_loop_ready(ha);
        }
-        if (status == QLA_SUCCESS && ha->flags.enable_target_reset) {
+        if (ha->flags.enable_target_reset) {
                list_for_each_entry(fcport, &ha->fcports, list) {
                        if (fcport->port_type != FCT_TARGET)
                                continue;
-                        status = qla2x00_device_reset(ha, fcport);
+                        ret = qla2x00_device_reset(ha, fcport);
-                        if (status != QLA_SUCCESS)
+                        if (ret != QLA_SUCCESS) {
-                                break;
+                                DEBUG2_3(printk("%s(%ld): bus_reset failed: "
+                                    "target_reset=%d d_id=%x.\n", __func__,
+                                    ha->host_no, ret, fcport->d_id.b24));
+                        }
                }
        }
-        if (status == QLA_SUCCESS &&
-                ((!ha->flags.enable_target_reset &&
-                  !ha->flags.enable_lip_reset) ||
-                ha->flags.enable_lip_full_login)) {
-                status = qla2x00_full_login_lip(ha);
-        }
        /* Issue marker command only when we are going to start the I/O */
        ha->marker_needed = 1;
-        if (status) {
+        return QLA_SUCCESS;
-                /* Empty */
-                DEBUG2_3(printk("%s(%ld): **** FAILED ****\n",
-                                __func__,
-                                ha->host_no));
-        } else {
-                /* Empty */
-                DEBUG3(printk("%s(%ld): exiting normally.\n",
-                                __func__,
-                                ha->host_no));
-        }
-        return(status);
 }
 /*
@@ -1413,7 +1414,9 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
        sht = &qla2x00_driver_template;
        if (pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2422 ||
-            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432)
+            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP2432 ||
+            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5422 ||
+            pdev->device == PCI_DEVICE_ID_QLOGIC_ISP5432)
                sht = &qla24xx_driver_template;
        host = scsi_host_alloc(sht, sizeof(scsi_qla_host_t));
        if (host == NULL) {
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 1fa0bce6b24e..459e0d6bd2b4 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
 * Driver version
 */
-#define QLA2XXX_VERSION      "8.01.07-k3"
+#define QLA2XXX_VERSION      "8.01.07-k4"
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 14e635aa44ce..b83d03c4deef 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -133,12 +133,10 @@ struct async_scan_data {
 /**
 * scsi_complete_async_scans - Wait for asynchronous scans to complete
 *
- * Asynchronous scans add themselves to the scanning_hosts list.  Once
+ * When this function returns, any host which started scanning before
- * that list is empty, we know that the scans are complete.  Rather than
+ * this function was called will have finished its scan.  Hosts which
- * waking up periodically to check the state of the list, we pretend to be
+ * started scanning after this function was called may or may not have
- * a scanning task by adding ourselves at the end of the list and going to
+ * finished.
- * sleep.  When the task before us wakes us up, we take ourselves off the
- * list and return.
 */
 int scsi_complete_async_scans(void)
 {
@@ -171,6 +169,11 @@ int scsi_complete_async_scans(void)
        spin_lock(&async_scan_lock);
        list_del(&data->list);
+        if (!list_empty(&scanning_hosts)) {
+                struct async_scan_data *next = list_entry(scanning_hosts.next,
+                                struct async_scan_data, list);
+                complete(&next->prev_finished);
+        }
 done:
        spin_unlock(&async_scan_lock);
@@ -739,6 +742,14 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
                sdev->no_uld_attach = 1;
        switch (sdev->type = (inq_result[0] & 0x1f)) {
+        case TYPE_RBC:
+                /* RBC devices can return SCSI-3 compliance and yet
+                 * still not support REPORT LUNS, so make them act as
+                 * BLIST_NOREPORTLUN unless BLIST_REPORTLUN2 is
+                 * specifically set */
+                if ((*bflags & BLIST_REPORTLUN2) == 0)
+                        *bflags |= BLIST_NOREPORTLUN;
+                /* fall through */
        case TYPE_TAPE:
        case TYPE_DISK:
        case TYPE_PRINTER:
@@ -749,11 +760,17 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
        case TYPE_ENCLOSURE:
        case TYPE_COMM:
        case TYPE_RAID:
-        case TYPE_RBC:
                sdev->writeable = 1;
                break;
-        case TYPE_WORM:
        case TYPE_ROM:
+                /* MMC devices can return SCSI-3 compliance and yet
+                 * still not support REPORT LUNS, so make them act as
+                 * BLIST_NOREPORTLUN unless BLIST_REPORTLUN2 is
+                 * specifically set */
+                if ((*bflags & BLIST_REPORTLUN2) == 0)
+                        *bflags |= BLIST_NOREPORTLUN;
+                /* fall through */
+        case TYPE_WORM:
                sdev->writeable = 0;
                break;
        default:
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 9c22f1342715..ce0d14af33c8 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1416,7 +1416,7 @@ static __init int iscsi_transport_init(void)
 {
        int err;
-        printk(KERN_INFO "Loading iSCSI transport class v%s.",
+        printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
                ISCSI_TRANSPORT_VERSION);
        err = class_register(&iscsi_transport_class);
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index 3fded4831460..014d7fea1ff3 100644
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -122,7 +122,7 @@ static int spi_execute(struct scsi_device *sdev, const void *cmd,
                        if (!sshdr)
                                sshdr = &sshdr_tmp;
-                        if (scsi_normalize_sense(sense, sizeof(*sense),
+                        if (scsi_normalize_sense(sense, SCSI_SENSE_BUFFERSIZE,
                                                 sshdr)
                            && sshdr->sense_key == UNIT_ATTENTION)
                                continue;
diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 5ffec2721b28..ff62e9708e1c 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -114,6 +114,7 @@
 #define DPRINTK( when, msg... ) do { if ( (DEBUG & (when)) == (when) ) printk( msg ); } while (0)
 #else
 #define DPRINTK( when, msg... ) do { } while (0)
+#define DEBUG 0
 #endif
 #define DANY( msg... ) DPRINTK( 0xffff, msg );
@@ -523,7 +524,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
 #ifdef ARBITRATE
                " ARBITRATE"
 #endif
-#ifdef DEBUG
+#if DEBUG
                " DEBUG"
 #endif
 #ifdef FAST
@@ -733,7 +734,7 @@ static int internal_command (unsigned char target, unsigned char lun,
        unsigned char *data = NULL;
        struct scatterlist *buffer = NULL;
        int clock, temp, nobuffs = 0, done = 0, len = 0;
-#ifdef DEBUG
+#if DEBUG
        int transfered = 0, phase = 0, newphase;
 #endif
        register unsigned char status_read;
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fae6e95a6298..89e9b36b1788 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -468,7 +468,7 @@ static int sr_block_ioctl(struct inode *inode, struct file *file, unsigned cmd,
        }
        ret = cdrom_ioctl(file, &cd->cdi, inode, cmd, arg);
-        if (ret != ENOSYS)
+        if (ret != -ENOSYS)
                return ret;
        /*
diff --git a/drivers/usb/core/Kconfig b/drivers/usb/core/Kconfig
index f8324d8d06ac..3e66b2a9974a 100644
--- a/drivers/usb/core/Kconfig
+++ b/drivers/usb/core/Kconfig
@@ -72,22 +72,6 @@ config USB_SUSPEND
          If you are unsure about this, say N here.
-config USB_MULTITHREAD_PROBE
-        bool "USB Multi-threaded probe (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
-        default n
-        help
-          Say Y here if you want the USB core to spawn a new thread for
-          every USB device that is probed.  This can cause a small speedup
-          in boot times on systems with a lot of different USB devices.
-          This option should be safe to enable, but if any odd probing
-          problems are found, please disable it, or dynamically turn it
-          off in the /sys/module/usbcore/parameters/multithread_probe
-          file
-          When in doubt, say N.
 config USB_OTG
        bool
        depends on USB && EXPERIMENTAL
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 2651c2e2a89f..1988224b362b 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -88,14 +88,7 @@ static DECLARE_WAIT_QUEUE_HEAD(khubd_wait);
 static struct task_struct *khubd_task;
 /* multithreaded probe logic */
-static int multithread_probe =
+static int multithread_probe = 0;
-#ifdef CONFIG_USB_MULTITHREAD_PROBE
-        1;
-#else
-        0;
-#endif
-module_param(multithread_probe, bool, S_IRUGO);
-MODULE_PARM_DESC(multithread_probe, "Run each USB device probe in a new thread");
 /* cycle leds on hubs that aren't blinking for attention */
 static int blinkenlights = 0;
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index 43ae696b2ec2..3348b07f0fe5 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -169,7 +169,7 @@ static int ohci_hcd_ep93xx_drv_remove(struct platform_device *pdev)
 static int ohci_hcd_ep93xx_drv_suspend(struct platform_device *pdev, pm_message_t state)
 {
        struct usb_hcd *hcd = platform_get_drvdata(pdev);
-        struct ochi_hcd *ohci = hcd_to_ohci(hcd);
+        struct ohci_hcd *ohci = hcd_to_ohci(hcd);
        if (time_before(jiffies, ohci->next_statechange))
                msleep(5);
diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 258a5d09d3dc..c7d887540d8d 100644
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -7,7 +7,7 @@ comment "USB Input Devices"
 config USB_HID
        tristate "USB Human Interface Device (full HID) support"
        default y
-        depends on USB
+        depends on USB && INPUT
        select HID
        ---help---
          Say Y here if you want full HID support to connect USB keyboards,
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 89fa6885709b..ea3636d96e1b 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -106,18 +106,18 @@ static void hid_reset(struct work_struct *work)
        if (test_bit(HID_CLEAR_HALT, &usbhid->iofl)) {
                dev_dbg(&usbhid->intf->dev, "clear halt\n");
-                rc = usb_clear_halt(to_usb_device(hid->dev), usbhid->urbin->pipe);
+                rc = usb_clear_halt(hid_to_usb_dev(hid), usbhid->urbin->pipe);
                clear_bit(HID_CLEAR_HALT, &usbhid->iofl);
                hid_start_in(hid);
        }
        else if (test_bit(HID_RESET_PENDING, &usbhid->iofl)) {
                dev_dbg(&usbhid->intf->dev, "resetting device\n");
-                rc = rc_lock = usb_lock_device_for_reset(to_usb_device(hid->dev), usbhid->intf);
+                rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf);
                if (rc_lock >= 0) {
-                        rc = usb_reset_composite_device(to_usb_device(hid->dev), usbhid->intf);
+                        rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf);
                        if (rc_lock)
-                                usb_unlock_device(to_usb_device(hid->dev));
+                                usb_unlock_device(hid_to_usb_dev(hid));
                }
                clear_bit(HID_RESET_PENDING, &usbhid->iofl);
        }
@@ -129,8 +129,8 @@ static void hid_reset(struct work_struct *work)
                break;
        default:
                err("can't reset device, %s-%s/input%d, status %d",
-                                to_usb_device(hid->dev)->bus->bus_name,
+                                hid_to_usb_dev(hid)->bus->bus_name,
-                                to_usb_device(hid->dev)->devpath,
+                                hid_to_usb_dev(hid)->devpath,
                                usbhid->ifnum, rc);
                /* FALLTHROUGH */
        case -EHOSTUNREACH:
@@ -217,8 +217,8 @@ static void hid_irq_in(struct urb *urb)
                clear_bit(HID_IN_RUNNING, &usbhid->iofl);
                if (status != -EPERM) {
                        err("can't resubmit intr, %s-%s/input%d, status %d",
-                                        to_usb_device(hid->dev)->bus->bus_name,
+                                        hid_to_usb_dev(hid)->bus->bus_name,
-                                        to_usb_device(hid->dev)->devpath,
+                                        hid_to_usb_dev(hid)->devpath,
                                        usbhid->ifnum, status);
                        hid_io_error(hid);
                }
@@ -251,7 +251,7 @@ static int hid_submit_out(struct hid_device *hid)
        hid_output_report(report, usbhid->outbuf);
        usbhid->urbout->transfer_buffer_length = ((report->size - 1) >> 3) + 1 + (report->id > 0);
-        usbhid->urbout->dev = to_usb_device(hid->dev);
+        usbhid->urbout->dev = hid_to_usb_dev(hid);
        dbg("submitting out urb");
@@ -276,13 +276,13 @@ static int hid_submit_ctrl(struct hid_device *hid)
        len = ((report->size - 1) >> 3) + 1 + (report->id > 0);
        if (dir == USB_DIR_OUT) {
                hid_output_report(report, usbhid->ctrlbuf);
-                usbhid->urbctrl->pipe = usb_sndctrlpipe(to_usb_device(hid->dev), 0);
+                usbhid->urbctrl->pipe = usb_sndctrlpipe(hid_to_usb_dev(hid), 0);
                usbhid->urbctrl->transfer_buffer_length = len;
        } else {
                int maxpacket, padlen;
-                usbhid->urbctrl->pipe = usb_rcvctrlpipe(to_usb_device(hid->dev), 0);
+                usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);
-                maxpacket = usb_maxpacket(to_usb_device(hid->dev), usbhid->urbctrl->pipe, 0);
+                maxpacket = usb_maxpacket(hid_to_usb_dev(hid), usbhid->urbctrl->pipe, 0);
                if (maxpacket > 0) {
                        padlen = (len + maxpacket - 1) / maxpacket;
                        padlen *= maxpacket;
@@ -292,7 +292,7 @@ static int hid_submit_ctrl(struct hid_device *hid)
                        padlen = 0;
                usbhid->urbctrl->transfer_buffer_length = padlen;
        }
-        usbhid->urbctrl->dev = to_usb_device(hid->dev);
+        usbhid->urbctrl->dev = hid_to_usb_dev(hid);
        usbhid->cr->bRequestType = USB_TYPE_CLASS | USB_RECIP_INTERFACE | dir;
        usbhid->cr->bRequest = (dir == USB_DIR_OUT) ? HID_REQ_SET_REPORT : HID_REQ_GET_REPORT;
@@ -582,6 +582,8 @@ void usbhid_init_reports(struct hid_device *hid)
 }
 #define USB_VENDOR_ID_GTCO              0x078c
+#define USB_VENDOR_ID_GTCO_IPANEL_1     0x08ca
+#define USB_VENDOR_ID_GTCO_IPANEL_2     0x5543
 #define USB_DEVICE_ID_GTCO_90           0x0090
 #define USB_DEVICE_ID_GTCO_100          0x0100
 #define USB_DEVICE_ID_GTCO_101          0x0101
@@ -627,6 +629,9 @@ void usbhid_init_reports(struct hid_device *hid)
 #define USB_DEVICE_ID_GTCO_1004         0x1004
 #define USB_DEVICE_ID_GTCO_1005         0x1005
 #define USB_DEVICE_ID_GTCO_1006         0x1006
+#define USB_DEVICE_ID_GTCO_10           0x0010
+#define USB_DEVICE_ID_GTCO_8            0x0008
+#define USB_DEVICE_ID_GTCO_d            0x000d
 #define USB_VENDOR_ID_WACOM             0x056a
@@ -791,6 +796,9 @@ void usbhid_init_reports(struct hid_device *hid)
 #define USB_VENDOR_ID_LOGITECH          0x046d
 #define USB_DEVICE_ID_LOGITECH_USB_RECEIVER     0xc101
+#define USB_VENDOR_ID_IMATION           0x0718
+#define USB_DEVICE_ID_DISC_STAKKA       0xd000
 /*
 * Alphabetically sorted blacklist by quirk type.
 */
@@ -875,6 +883,10 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1004, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1005, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_1006, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO_IPANEL_1, USB_DEVICE_ID_GTCO_10, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_8, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_GTCO_IPANEL_2, USB_DEVICE_ID_GTCO_d, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_IMATION, USB_DEVICE_ID_DISC_STAKKA, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_KBGEAR, USB_DEVICE_ID_KBGEAR_JAMSTUDIO, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_CASSY, HID_QUIRK_IGNORE },
        { USB_VENDOR_ID_LD, USB_DEVICE_ID_LD_POCKETCASSY, HID_QUIRK_IGNORE },
@@ -951,7 +963,7 @@ static const struct hid_blacklist {
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER3_JIS, HID_QUIRK_POWERBOOK_HAS_FN },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ANSI, HID_QUIRK_POWERBOOK_HAS_FN },
-        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN },
+        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_ISO, HID_QUIRK_POWERBOOK_HAS_FN | HID_QUIRK_POWERBOOK_ISO_KEYBOARD},
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER4_JIS, HID_QUIRK_POWERBOOK_HAS_FN },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
        { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_POWERBOOK_HAS_FN },
@@ -1187,7 +1199,7 @@ static struct hid_device *usb_hid_configure(struct usb_interface *intf)
        hid->version = le16_to_cpu(hdesc->bcdHID);
        hid->country = hdesc->bCountryCode;
-        hid->dev = &dev->dev;
+        hid->dev = &intf->dev;
        usbhid->intf = intf;
        usbhid->ifnum = interface->desc.bInterfaceNumber;
@@ -1282,7 +1294,7 @@ static void hid_disconnect(struct usb_interface *intf)
        usb_free_urb(usbhid->urbctrl);
        usb_free_urb(usbhid->urbout);
-        hid_free_buffers(to_usb_device(hid->dev), hid);
+        hid_free_buffers(hid_to_usb_dev(hid), hid);
        hid_free_device(hid);
 }
diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c
index f8f660ee3fac..59ed65e7a621 100644
--- a/drivers/usb/input/hid-ff.c
+++ b/drivers/usb/input/hid-ff.c
@@ -33,6 +33,7 @@
 #include <linux/usb.h>
 #include <linux/hid.h>
+#include "usbhid.h"
 /*
 * This table contains pointers to initializers. To add support for new
@@ -70,8 +71,8 @@ static struct hid_ff_initializer inits[] = {
 int hid_ff_init(struct hid_device* hid)
 {
        struct hid_ff_initializer *init;
-        int vendor = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idVendor);
+        int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);
-        int product = le16_to_cpu(to_usb_device(hid->dev)->descriptor.idProduct);
+        int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);
        for (init = inits; init->idVendor; init++)
                if (init->idVendor == vendor && init->idProduct == product)
diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 114d6c9f64b1..a8b3d66cd498 100644
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -384,7 +384,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
        struct hiddev_list *list = file->private_data;
        struct hiddev *hiddev = list->hiddev;
        struct hid_device *hid = hiddev->hid;
-        struct usb_device *dev = to_usb_device(hid->dev);
+        struct usb_device *dev = hid_to_usb_dev(hid);
        struct hiddev_collection_info cinfo;
        struct hiddev_report_info rinfo;
        struct hiddev_field_info finfo;
diff --git a/drivers/usb/input/usbhid.h b/drivers/usb/input/usbhid.h
index 830107e5251f..0023f96d4294 100644
--- a/drivers/usb/input/usbhid.h
+++ b/drivers/usb/input/usbhid.h
@@ -80,5 +80,8 @@ struct usbhid_device {
 };
+#define hid_to_usb_dev(hid_dev) \
+        container_of(hid_dev->dev->parent, struct usb_device, dev)
 #endif
diff --git a/drivers/usb/input/usbtouchscreen.c b/drivers/usb/input/usbtouchscreen.c
index 7f3c57da9bc0..86e37a20f8e5 100644
--- a/drivers/usb/input/usbtouchscreen.c
+++ b/drivers/usb/input/usbtouchscreen.c
@@ -66,7 +66,7 @@ struct usbtouch_device_info {
        void (*process_pkt) (struct usbtouch_usb *usbtouch, unsigned char *pkt, int len);
        int  (*get_pkt_len) (unsigned char *pkt, int len);
-        int  (*read_data)   (unsigned char *pkt, int *x, int *y, int *touch, int *press);
+        int  (*read_data)   (struct usbtouch_usb *usbtouch, unsigned char *pkt);
        int  (*init)        (struct usbtouch_usb *usbtouch);
 };
@@ -85,6 +85,9 @@ struct usbtouch_usb {
        struct usbtouch_device_info *type;
        char name[128];
        char phys[64];
+        int x, y;
+        int touch, press;
 };
@@ -161,14 +164,14 @@ static struct usb_device_id usbtouch_devices[] = {
 #define EGALAX_PKT_TYPE_REPT            0x80
 #define EGALAX_PKT_TYPE_DIAG            0x0A
-static int egalax_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int egalax_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT)
                return 0;
-        *x = ((pkt[3] & 0x0F) << 7) | (pkt[4] & 0x7F);
+        dev->x = ((pkt[3] & 0x0F) << 7) | (pkt[4] & 0x7F);
-        *y = ((pkt[1] & 0x0F) << 7) | (pkt[2] & 0x7F);
+        dev->y = ((pkt[1] & 0x0F) << 7) | (pkt[2] & 0x7F);
-        *touch = pkt[0] & 0x01;
+        dev->touch = pkt[0] & 0x01;
        return 1;
 }
@@ -195,11 +198,11 @@ static int egalax_get_pkt_len(unsigned char *buf, int len)
 * PanJit Part
 */
 #ifdef CONFIG_USB_TOUCHSCREEN_PANJIT
-static int panjit_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int panjit_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
-        *x = ((pkt[2] & 0x0F) << 8) | pkt[1];
+        dev->x = ((pkt[2] & 0x0F) << 8) | pkt[1];
-        *y = ((pkt[4] & 0x0F) << 8) | pkt[3];
+        dev->y = ((pkt[4] & 0x0F) << 8) | pkt[3];
-        *touch = pkt[0] & 0x01;
+        dev->touch = pkt[0] & 0x01;
        return 1;
 }
@@ -215,11 +218,11 @@ static int panjit_read_data(unsigned char *pkt, int *x, int *y, int *touch, int
 #define MTOUCHUSB_RESET                 7
 #define MTOUCHUSB_REQ_CTRLLR_ID         10
-static int mtouch_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int mtouch_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
-        *x = (pkt[8] << 8) | pkt[7];
+        dev->x = (pkt[8] << 8) | pkt[7];
-        *y = (pkt[10] << 8) | pkt[9];
+        dev->y = (pkt[10] << 8) | pkt[9];
-        *touch = (pkt[2] & 0x40) ? 1 : 0;
+        dev->touch = (pkt[2] & 0x40) ? 1 : 0;
        return 1;
 }
@@ -260,14 +263,32 @@ static int mtouch_init(struct usbtouch_usb *usbtouch)
 * ITM Part
 */
 #ifdef CONFIG_USB_TOUCHSCREEN_ITM
-static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int itm_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
-        *x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);
+        int touch;
-        *y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
+        /*
-        *press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);
+         * ITM devices report invalid x/y data if not touched.
-        *touch = ~pkt[7] & 0x20;
+         * if the screen was touched before but is not touched any more
+         * report touch as 0 with the last valid x/y data once. then stop
+         * reporting data until touched again.
+         */
+        dev->press = ((pkt[2] & 0x01) << 7) | (pkt[5] & 0x7F);
+        touch = ~pkt[7] & 0x20;
+        if (!touch) {
+                if (dev->touch) {
+                        dev->touch = 0;
+                        return 1;
+                }
-        return *touch;
+                return 0;
+        }
+        dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[3] & 0x7F);
+        dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[4] & 0x7F);
+        dev->touch = touch;
+        return 1;
 }
 #endif
@@ -276,7 +297,7 @@ static int itm_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *pr
 * eTurboTouch part
 */
 #ifdef CONFIG_USB_TOUCHSCREEN_ETURBO
-static int eturbo_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int eturbo_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        unsigned int shift;
@@ -285,9 +306,9 @@ static int eturbo_read_data(unsigned char *pkt, int *x, int *y, int *touch, int
                return 0;
        shift = (6 - (pkt[0] & 0x03));
-        *x = ((pkt[3] << 7) | pkt[4]) >> shift;
+        dev->x = ((pkt[3] << 7) | pkt[4]) >> shift;
-        *y = ((pkt[1] << 7) | pkt[2]) >> shift;
+        dev->y = ((pkt[1] << 7) | pkt[2]) >> shift;
-        *touch = (pkt[0] & 0x10) ? 1 : 0;
+        dev->touch = (pkt[0] & 0x10) ? 1 : 0;
        return 1;
 }
@@ -307,14 +328,14 @@ static int eturbo_get_pkt_len(unsigned char *buf, int len)
 * Gunze part
 */
 #ifdef CONFIG_USB_TOUCHSCREEN_GUNZE
-static int gunze_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int gunze_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
        if (!(pkt[0] & 0x80) || ((pkt[1] | pkt[2] | pkt[3]) & 0x80))
                return 0;
-        *x = ((pkt[0] & 0x1F) << 7) | (pkt[2] & 0x7F);
+        dev->x = ((pkt[0] & 0x1F) << 7) | (pkt[2] & 0x7F);
-        *y = ((pkt[1] & 0x1F) << 7) | (pkt[3] & 0x7F);
+        dev->y = ((pkt[1] & 0x1F) << 7) | (pkt[3] & 0x7F);
-        *touch = pkt[0] & 0x20;
+        dev->touch = pkt[0] & 0x20;
        return 1;
 }
@@ -383,11 +404,11 @@ static int dmc_tsc10_init(struct usbtouch_usb *usbtouch)
 }
-static int dmc_tsc10_read_data(unsigned char *pkt, int *x, int *y, int *touch, int *press)
+static int dmc_tsc10_read_data(struct usbtouch_usb *dev, unsigned char *pkt)
 {
-        *x = ((pkt[2] & 0x03) << 8) | pkt[1];
+        dev->x = ((pkt[2] & 0x03) << 8) | pkt[1];
-        *y = ((pkt[4] & 0x03) << 8) | pkt[3];
+        dev->y = ((pkt[4] & 0x03) << 8) | pkt[3];
-        *touch = pkt[0] & 0x01;
+        dev->touch = pkt[0] & 0x01;
        return 1;
 }
@@ -492,23 +513,22 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {
 static void usbtouch_process_pkt(struct usbtouch_usb *usbtouch,
                                 unsigned char *pkt, int len)
 {
-        int x, y, touch, press;
        struct usbtouch_device_info *type = usbtouch->type;
-        if (!type->read_data(pkt, &x, &y, &touch, &press))
+        if (!type->read_data(usbtouch, pkt))
                        return;
-        input_report_key(usbtouch->input, BTN_TOUCH, touch);
+        input_report_key(usbtouch->input, BTN_TOUCH, usbtouch->touch);
        if (swap_xy) {
-                input_report_abs(usbtouch->input, ABS_X, y);
+                input_report_abs(usbtouch->input, ABS_X, usbtouch->y);
-                input_report_abs(usbtouch->input, ABS_Y, x);
+                input_report_abs(usbtouch->input, ABS_Y, usbtouch->x);
        } else {
-                input_report_abs(usbtouch->input, ABS_X, x);
+                input_report_abs(usbtouch->input, ABS_X, usbtouch->x);
-                input_report_abs(usbtouch->input, ABS_Y, y);
+                input_report_abs(usbtouch->input, ABS_Y, usbtouch->y);
        }
        if (type->max_press)
-                input_report_abs(usbtouch->input, ABS_PRESSURE, press);
+                input_report_abs(usbtouch->input, ABS_PRESSURE, usbtouch->press);
        input_sync(usbtouch->input);
 }
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index f538013965b0..896449f0cf85 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -898,7 +898,7 @@ static int ax88772_link_reset(struct usbnet *dev)
 static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
 {
-        int ret;
+        int ret, embd_phy;
        void *buf;
        u16 rx_ctl;
        struct asix_data *data = (struct asix_data *)&dev->data;
@@ -919,13 +919,15 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
                        AX_GPIO_RSE | AX_GPIO_GPO_2 | AX_GPIO_GPO2EN, 5)) < 0)
                goto out2;
+        /* 0x10 is the phy id of the embedded 10/100 ethernet phy */
+        embd_phy = ((asix_get_phy_addr(dev) & 0x1f) == 0x10 ? 1 : 0);
        if ((ret = asix_write_cmd(dev, AX_CMD_SW_PHY_SELECT,
-                                1, 0, 0, buf)) < 0) {
+                                embd_phy, 0, 0, buf)) < 0) {
                dbg("Select PHY #1 failed: %d", ret);
                goto out2;
        }
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD)) < 0)
+        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL)) < 0)
                goto out2;
        msleep(150);
@@ -933,8 +935,14 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
                goto out2;
        msleep(150);
-        if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL | AX_SWRESET_PRL)) < 0)
+        if (embd_phy) {
-                goto out2;
+                if ((ret = asix_sw_reset(dev, AX_SWRESET_IPRL)) < 0)
+                        goto out2;
+        }
+        else {
+                if ((ret = asix_sw_reset(dev, AX_SWRESET_PRTE)) < 0)
+                        goto out2;
+        }
        msleep(150);
        rx_ctl = asix_read_rx_ctl(dev);
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c
index ea5f44de3de2..a322a16d9cf8 100644
--- a/drivers/usb/net/rndis_host.c
+++ b/drivers/usb/net/rndis_host.c
@@ -379,6 +379,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
 {
        int                     retval;
        struct net_device       *net = dev->net;
+        struct cdc_state        *info = (void *) &dev->data;
        union {
                void                    *buf;
                struct rndis_msg_hdr    *header;
@@ -397,7 +398,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
                return -ENOMEM;
        retval = usbnet_generic_cdc_bind(dev, intf);
        if (retval < 0)
-                goto done;
+                goto fail;
        net->hard_header_len += sizeof (struct rndis_data_hdr);
@@ -412,10 +413,7 @@ static int rndis_bind(struct usbnet *dev, struct usb_interface *intf)
        if (unlikely(retval < 0)) {
                /* it might not even be an RNDIS device!! */
                dev_err(&intf->dev, "RNDIS init failed, %d\n", retval);
-fail:
+                goto fail_and_release;
-                usb_driver_release_interface(driver_of(intf),
-                        ((struct cdc_state *)&(dev->data))->data);
-                goto done;
        }
        dev->hard_mtu = le32_to_cpu(u.init_c->max_transfer_size);
        /* REVISIT:  peripheral "alignment" request is ignored ... */
@@ -431,7 +429,7 @@ fail:
        retval = rndis_command(dev, u.header);
        if (unlikely(retval < 0)) {
                dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval);
-                goto fail;
+                goto fail_and_release;
        }
        tmp = le32_to_cpu(u.get_c->offset);
        if (unlikely((tmp + 8) > (1024 - ETH_ALEN)
@@ -439,7 +437,7 @@ fail:
                dev_err(&intf->dev, "rndis ethaddr off %d len %d ?\n",
                        tmp, le32_to_cpu(u.get_c->len));
                retval = -EDOM;
-                goto fail;
+                goto fail_and_release;
        }
        memcpy(net->dev_addr, tmp + (char *)&u.get_c->request_id, ETH_ALEN);
@@ -455,11 +453,18 @@ fail:
        retval = rndis_command(dev, u.header);
        if (unlikely(retval < 0)) {
                dev_err(&intf->dev, "rndis set packet filter, %d\n", retval);
-                goto fail;
+                goto fail_and_release;
        }
        retval = 0;
-done:
+        kfree(u.buf);
+        return retval;
+fail_and_release:
+        usb_set_intfdata(info->data, NULL);
+        usb_driver_release_interface(driver_of(intf), info->data);
+fail:
        kfree(u.buf);
        return retval;
 }
diff --git a/drivers/usb/serial/funsoft.c b/drivers/usb/serial/funsoft.c
index 31501c9361b9..2bebd63d5ed1 100644
--- a/drivers/usb/serial/funsoft.c
+++ b/drivers/usb/serial/funsoft.c
@@ -27,7 +27,7 @@ MODULE_DEVICE_TABLE(usb, id_table);
 static int funsoft_ioctl(struct usb_serial_port *port, struct file *file,
                         unsigned int cmd, unsigned long arg)
 {
-        struct termios t;
+        struct ktermios t;
        dbg("%s - port %d, cmd 0x%04x", __FUNCTION__, port->number, cmd);
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5ca04e82ea19..0fed43a96871 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -78,6 +78,7 @@ static int  option_send_setup(struct usb_serial_port *port);
 #define OPTION_PRODUCT_FUSION2          0x6300
 #define OPTION_PRODUCT_COBRA            0x6500
 #define OPTION_PRODUCT_COBRA2           0x6600
+#define OPTION_PRODUCT_GTMAX36          0x6701
 #define HUAWEI_PRODUCT_E600             0x1001
 #define HUAWEI_PRODUCT_E220             0x1003
 #define AUDIOVOX_PRODUCT_AIRCARD        0x0112
@@ -90,6 +91,7 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
@@ -104,6 +106,7 @@ static struct usb_device_id option_ids1[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_FUSION2) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COBRA2) },
+        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTMAX36) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
        { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220) },
        { USB_DEVICE(AUDIOVOX_VENDOR_ID, AUDIOVOX_PRODUCT_AIRCARD) },
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index cddef3efba0a..b49f2a78189e 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -197,6 +197,13 @@ UNUSUAL_DEV(  0x0421, 0x047c, 0x0370, 0x0370,
                US_SC_DEVICE, US_PR_DEVICE, NULL,
                US_FL_MAX_SECTORS_64 ),
+/* Reported by Manuel Osdoba <manuel.osdoba@tu-ilmenau.de> */
+UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x0452,
+                "Nokia",
+                "Nokia 6233",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_MAX_SECTORS_64 ),
 /* Reported by Alex Corcoles <alex@corcoles.net> */
 UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x0370,
                "Nokia",
@@ -254,6 +261,18 @@ UNUSUAL_DEV(  0x045a, 0x5210, 0x0101, 0x0101,
                US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0),
 #endif
+/*
+ * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.)
+ * Reported by Pete Zaitcev <zaitcev@redhat.com>
+ * This device chokes on both version of MODE SENSE which we have, so
+ * use_10_for_ms is not effective, and we use US_FL_NO_WP_DETECT.
+ */
+UNUSUAL_DEV(  0x046b, 0xff40, 0x0100, 0x0100,
+                "AMI",
+                "Virtual Floppy",
+                US_SC_DEVICE, US_PR_DEVICE, NULL,
+                US_FL_NO_WP_DETECT),
 /* Patch submitted by Philipp Friedrich <philipp@void.at> */
 UNUSUAL_DEV(  0x0482, 0x0100, 0x0100, 0x0100,
                "Kyocera",