8 files changed, 282 insertions, 116 deletions

diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig
index ce278e060aca..94b6d676c5cb 100644
--- a/drivers/message/i2o/Kconfig
+++ b/drivers/message/i2o/Kconfig
@@ -24,6 +24,24 @@ config I2O
 
           If unsure, say N.
 
+config I2O_EXT_ADAPTEC
+        bool "Enable Adaptec extensions"
+        depends on I2O
+        default y
+        ---help---
+          Say Y for support of raidutils for Adaptec I2O controllers. You also
+          have to say Y to "I2O Configuration support", "I2O SCSI OSM" below
+          and to "SCSI generic support" under "SCSI device configuration".
+
+config I2O_EXT_ADAPTEC_DMA64
+        bool "Enable 64-bit DMA"
+        depends on I2O_EXT_ADAPTEC && ( 64BIT || HIGHMEM64G )
+        default y
+        ---help---
+          Say Y for support of 64-bit DMA transfer mode on Adaptec I2O
+          controllers.
+          Note: You need at least firmware version 3709.
+
 config I2O_CONFIG
         tristate "I2O Configuration support"
         depends on PCI && I2O
diff --git a/drivers/message/i2o/i2o_block.h b/drivers/message/i2o/i2o_block.h
index 9e1a95fb0833..e45cc40ce384 100644
--- a/drivers/message/i2o/i2o_block.h
+++ b/drivers/message/i2o/i2o_block.h
@@ -56,6 +56,12 @@
 #define I2O_BLOCK_RETRY_TIME HZ/4
 #define I2O_BLOCK_MAX_OPEN_REQUESTS 50
 
+/* request queue sizes */
+#define I2O_BLOCK_REQ_MEMPOOL_SIZE              32
+
+#define KERNEL_SECTOR_SHIFT 9
+#define KERNEL_SECTOR_SIZE (1 << KERNEL_SECTOR_SHIFT)
+
 /* I2O Block OSM mempool struct */
 struct i2o_block_mempool {
         kmem_cache_t    *slab;
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 849d90aad779..7636833b4623 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -515,6 +515,7 @@ static int i2o_cfg_evt_get(unsigned long arg, struct file *fp)
         return 0;
 }
 
+#ifdef CONFIG_I2O_EXT_ADAPTEC
 #ifdef CONFIG_COMPAT
 static int i2o_cfg_passthru32(struct file *file, unsigned cmnd, unsigned long arg)
 {
@@ -964,6 +965,7 @@ static int i2o_cfg_passthru(unsigned long arg)
         kfree(reply);
         return rcode;
 }
+#endif
 
 /*
  * IOCTL Handler
@@ -1018,9 +1020,11 @@ static int i2o_cfg_ioctl(struct inode *inode, struct file *fp, unsigned int cmd,
                 ret = i2o_cfg_evt_get(arg, fp);
                 break;
 
+#ifdef CONFIG_I2O_EXT_ADAPTEC
         case I2OPASSTHRU:
                 ret = i2o_cfg_passthru(arg);
                 break;
+#endif
 
         default:
                 osm_debug("unknown ioctl called!\n");
diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index c3b0c29ac02d..fef53b509a61 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -55,6 +55,7 @@
 #include <linux/pci.h>
 #include <linux/blkdev.h>
 #include <linux/i2o.h>
+#include <linux/scatterlist.h>
 
 #include <asm/dma.h>
 #include <asm/system.h>
@@ -65,19 +66,23 @@
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
+#include <scsi/scsi_request.h>
+#include <scsi/sg.h>
+#include <scsi/sg_request.h>
 
 #define OSM_NAME        "scsi-osm"
-#define OSM_VERSION     "$Rev$"
+#define OSM_VERSION     "1.282"
 #define OSM_DESCRIPTION "I2O SCSI Peripheral OSM"
 
 static struct i2o_driver i2o_scsi_driver;
 
-static int i2o_scsi_max_id = 16;
-static int i2o_scsi_max_lun = 8;
+static unsigned int i2o_scsi_max_id = 16;
+static unsigned int i2o_scsi_max_lun = 255;
 
 struct i2o_scsi_host {
         struct Scsi_Host *scsi_host;    /* pointer to the SCSI host */
         struct i2o_controller *iop;     /* pointer to the I2O controller */
+        unsigned int lun;       /* lun's used for block devices */
         struct i2o_device *channel[0];  /* channel->i2o_dev mapping table */
 };
 
@@ -100,12 +105,17 @@ static struct i2o_scsi_host *i2o_scsi_host_alloc(struct i2o_controller *c)
         u8 type;
         int i;
         size_t size;
-        i2o_status_block *sb;
+        u16 body_size = 6;
+
+#ifdef CONFIG_I2O_EXT_ADAPTEC
+        if (c->adaptec)
+                body_size = 8;
+#endif
 
         list_for_each_entry(i2o_dev, &c->devices, list)
             if (i2o_dev->lct_data.class_id == I2O_CLASS_BUS_ADAPTER) {
                 if (i2o_parm_field_get(i2o_dev, 0x0000, 0, &type, 1)
-                   && (type == 0x01))   /* SCSI bus */
+                    && (type == 0x01))  /* SCSI bus */
                         max_channel++;
         }
 
@@ -127,20 +137,18 @@ static struct i2o_scsi_host *i2o_scsi_host_alloc(struct i2o_controller *c)
         scsi_host->max_id = i2o_scsi_max_id;
         scsi_host->max_lun = i2o_scsi_max_lun;
         scsi_host->this_id = c->unit;
-
-        sb = c->status_block.virt;
-
-        scsi_host->sg_tablesize = (sb->inbound_frame_size -
-                                   sizeof(struct i2o_message) / 4 - 6) / 2;
+        scsi_host->sg_tablesize = i2o_sg_tablesize(c, body_size);
 
         i2o_shost = (struct i2o_scsi_host *)scsi_host->hostdata;
         i2o_shost->scsi_host = scsi_host;
         i2o_shost->iop = c;
+        i2o_shost->lun = 1;
 
         i = 0;
         list_for_each_entry(i2o_dev, &c->devices, list)
             if (i2o_dev->lct_data.class_id == I2O_CLASS_BUS_ADAPTER) {
-                if (i2o_parm_field_get(i2o_dev, 0x0000, 0, &type, 1) || (type == 1))    /* only SCSI bus */
+                if (i2o_parm_field_get(i2o_dev, 0x0000, 0, &type, 1)
+                    && (type == 0x01))  /* only SCSI bus */
                         i2o_shost->channel[i++] = i2o_dev;
 
                 if (i >= max_channel)
@@ -212,8 +220,8 @@ static int i2o_scsi_probe(struct device *dev)
         struct Scsi_Host *scsi_host;
         struct i2o_device *parent;
         struct scsi_device *scsi_dev;
-        u32 id;
-        u64 lun;
+        u32 id = -1;
+        u64 lun = -1;
         int channel = -1;
         int i;
 
@@ -223,8 +231,56 @@ static int i2o_scsi_probe(struct device *dev)
 
         scsi_host = i2o_shost->scsi_host;
 
-        if (i2o_parm_field_get(i2o_dev, 0, 3, &id, 4) < 0)
+        switch (i2o_dev->lct_data.class_id) {
+        case I2O_CLASS_RANDOM_BLOCK_STORAGE:
+        case I2O_CLASS_EXECUTIVE:
+#ifdef CONFIG_I2O_EXT_ADAPTEC
+                if (c->adaptec) {
+                        u8 type;
+                        struct i2o_device *d = i2o_shost->channel[0];
+
+                        if (i2o_parm_field_get(d, 0x0000, 0, &type, 1)
+                            && (type == 0x01))  /* SCSI bus */
+                                if (i2o_parm_field_get(d, 0x0200, 4, &id, 4)) {
+                                        channel = 0;
+                                        if (i2o_dev->lct_data.class_id ==
+                                            I2O_CLASS_RANDOM_BLOCK_STORAGE)
+                                                lun = i2o_shost->lun++;
+                                        else
+                                                lun = 0;
+                                }
+                }
+#endif
+                break;
+
+        case I2O_CLASS_SCSI_PERIPHERAL:
+                if (i2o_parm_field_get(i2o_dev, 0x0000, 3, &id, 4) < 0)
+                        return -EFAULT;
+
+                if (i2o_parm_field_get(i2o_dev, 0x0000, 4, &lun, 8) < 0)
+                        return -EFAULT;
+
+                parent = i2o_iop_find_device(c, i2o_dev->lct_data.parent_tid);
+                if (!parent) {
+                        osm_warn("can not find parent of device %03x\n",
+                                 i2o_dev->lct_data.tid);
+                        return -EFAULT;
+                }
+
+                for (i = 0; i <= i2o_shost->scsi_host->max_channel; i++)
+                        if (i2o_shost->channel[i] == parent)
+                                channel = i;
+                break;
+
+        default:
+                return -EFAULT;
+        }
+
+        if (channel == -1) {
+                osm_warn("can not find channel of device %03x\n",
+                         i2o_dev->lct_data.tid);
                 return -EFAULT;
+        }
 
         if (id >= scsi_host->max_id) {
                 osm_warn("SCSI device id (%d) >= max_id of I2O host (%d)", id,
@@ -232,31 +288,12 @@ static int i2o_scsi_probe(struct device *dev)
                 return -EFAULT;
         }
 
-        if (i2o_parm_field_get(i2o_dev, 0, 4, &lun, 8) < 0)
-                return -EFAULT;
         if (lun >= scsi_host->max_lun) {
                 osm_warn("SCSI device id (%d) >= max_lun of I2O host (%d)",
                          (unsigned int)lun, scsi_host->max_lun);
                 return -EFAULT;
         }
 
-        parent = i2o_iop_find_device(c, i2o_dev->lct_data.parent_tid);
-        if (!parent) {
-                osm_warn("can not find parent of device %03x\n",
-                         i2o_dev->lct_data.tid);
-                return -EFAULT;
-        }
-
-        for (i = 0; i <= i2o_shost->scsi_host->max_channel; i++)
-                if (i2o_shost->channel[i] == parent)
-                        channel = i;
-
-        if (channel == -1) {
-                osm_warn("can not find channel of device %03x\n",
-                         i2o_dev->lct_data.tid);
-                return -EFAULT;
-        }
-
         scsi_dev =
             __scsi_add_device(i2o_shost->scsi_host, channel, id, lun, i2o_dev);
 
@@ -266,7 +303,8 @@ static int i2o_scsi_probe(struct device *dev)
                 return PTR_ERR(scsi_dev);
         }
 
-        sysfs_create_link(&i2o_dev->device.kobj, &scsi_dev->sdev_gendev.kobj, "scsi");
+        sysfs_create_link(&i2o_dev->device.kobj, &scsi_dev->sdev_gendev.kobj,
+                          "scsi");
 
         osm_info("device added (TID: %03x) channel: %d, id: %d, lun: %d\n",
                  i2o_dev->lct_data.tid, channel, id, (unsigned int)lun);
@@ -542,9 +580,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
                                  void (*done) (struct scsi_cmnd *))
 {
         struct i2o_controller *c;
-        struct Scsi_Host *host;
         struct i2o_device *i2o_dev;
-        struct device *dev;
         int tid;
         struct i2o_message __iomem *msg;
         u32 m;
@@ -554,20 +590,16 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
          * RETURN_SENSE_DATA_IN_REPLY_MESSAGE_FRAME
          */
         u32 scsi_flags = 0x20a00000;
-        u32 sg_flags;
+        u32 sgl_offset;
         u32 __iomem *mptr;
-        u32 __iomem *lenptr;
-        u32 len;
-        int i;
+        u32 cmd = I2O_CMD_SCSI_EXEC << 24;
+        int rc = 0;
 
         /*
          *      Do the incoming paperwork
          */
-
         i2o_dev = SCpnt->device->hostdata;
-        host = SCpnt->device->host;
         c = i2o_dev->iop;
-        dev = &c->pdev->dev;
 
         SCpnt->scsi_done = done;
 
@@ -575,7 +607,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
                 osm_warn("no I2O device in request\n");
                 SCpnt->result = DID_NO_CONNECT << 16;
                 done(SCpnt);
-                return 0;
+                goto exit;
         }
 
         tid = i2o_dev->lct_data.tid;
@@ -584,46 +616,85 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
         osm_debug("Real scsi messages.\n");
 
         /*
-         *      Obtain an I2O message. If there are none free then
-         *      throw it back to the scsi layer
-         */
-
-        m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_MESSAGE_GET);
-        if (m == I2O_QUEUE_EMPTY)
-                return SCSI_MLQUEUE_HOST_BUSY;
-
-        mptr = &msg->body[0];
-
-        /*
          *      Put together a scsi execscb message
          */
-
         switch (SCpnt->sc_data_direction) {
         case PCI_DMA_NONE:
                 /* DATA NO XFER */
-                sg_flags = 0x00000000;
+                sgl_offset = SGL_OFFSET_0;
                 break;
 
         case PCI_DMA_TODEVICE:
                 /* DATA OUT (iop-->dev) */
                 scsi_flags |= 0x80000000;
-                sg_flags = 0x14000000;
+                sgl_offset = SGL_OFFSET_10;
                 break;
 
         case PCI_DMA_FROMDEVICE:
                 /* DATA IN  (iop<--dev) */
                 scsi_flags |= 0x40000000;
-                sg_flags = 0x10000000;
+                sgl_offset = SGL_OFFSET_10;
                 break;
 
         default:
                 /* Unknown - kill the command */
                 SCpnt->result = DID_NO_CONNECT << 16;
                 done(SCpnt);
-                return 0;
+                goto exit;
         }
 
-        writel(I2O_CMD_SCSI_EXEC << 24 | HOST_TID << 12 | tid, &msg->u.head[1]);
+        /*
+         *      Obtain an I2O message. If there are none free then
+         *      throw it back to the scsi layer
+         */
+
+        m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_MESSAGE_GET);
+        if (m == I2O_QUEUE_EMPTY) {
+                rc = SCSI_MLQUEUE_HOST_BUSY;
+                goto exit;
+        }
+
+        mptr = &msg->body[0];
+
+#ifdef CONFIG_I2O_EXT_ADAPTEC
+        if (c->adaptec) {
+                u32 adpt_flags = 0;
+
+                if (SCpnt->sc_request && SCpnt->sc_request->upper_private_data) {
+                        i2o_sg_io_hdr_t __user *usr_ptr =
+                            ((Sg_request *) (SCpnt->sc_request->
+                                             upper_private_data))->header.
+                            usr_ptr;
+
+                        if (usr_ptr)
+                                get_user(adpt_flags, &usr_ptr->flags);
+                }
+
+                switch (i2o_dev->lct_data.class_id) {
+                case I2O_CLASS_EXECUTIVE:
+                case I2O_CLASS_RANDOM_BLOCK_STORAGE:
+                        /* interpret flag has to be set for executive */
+                        adpt_flags ^= I2O_DPT_SG_FLAG_INTERPRET;
+                        break;
+
+                default:
+                        break;
+                }
+
+                /*
+                 * for Adaptec controllers we use the PRIVATE command, because
+                 * the normal SCSI EXEC doesn't support all SCSI commands on
+                 * all controllers (for example READ CAPACITY).
+                 */
+                if (sgl_offset == SGL_OFFSET_10)
+                        sgl_offset = SGL_OFFSET_12;
+                cmd = I2O_CMD_PRIVATE << 24;
+                writel(I2O_VENDOR_DPT << 16 | I2O_CMD_SCSI_EXEC, mptr++);
+                writel(adpt_flags | tid, mptr++);
+        }
+#endif
+
+        writel(cmd | HOST_TID << 12 | tid, &msg->u.head[1]);
         writel(i2o_scsi_driver.context, &msg->u.s.icntxt);
 
         /* We want the SCSI control block back */
@@ -655,55 +726,30 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
         /* Write SCSI command into the message - always 16 byte block */
         memcpy_toio(mptr, SCpnt->cmnd, 16);
         mptr += 4;
-        lenptr = mptr++;        /* Remember me - fill in when we know */
-
-        /* Now fill in the SGList and command */
-        if (SCpnt->use_sg) {
-                struct scatterlist *sg;
-                int sg_count;
-
-                sg = SCpnt->request_buffer;
-                len = 0;
 
-                sg_count = dma_map_sg(dev, sg, SCpnt->use_sg,
-                                      SCpnt->sc_data_direction);
-
-                if (unlikely(sg_count <= 0))
-                        return -ENOMEM;
-
-                for (i = SCpnt->use_sg; i > 0; i--) {
-                        if (i == 1)
-                                sg_flags |= 0xC0000000;
-                        writel(sg_flags | sg_dma_len(sg), mptr++);
-                        writel(sg_dma_address(sg), mptr++);
-                        len += sg_dma_len(sg);
-                        sg++;
-                }
-
-                writel(len, lenptr);
-        } else {
-                len = SCpnt->request_bufflen;
-
-                writel(len, lenptr);
-
-                if (len > 0) {
-                        dma_addr_t dma_addr;
-
-                        dma_addr = dma_map_single(dev, SCpnt->request_buffer,
-                                                  SCpnt->request_bufflen,
-                                                  SCpnt->sc_data_direction);
-                        if (!dma_addr)
-                                return -ENOMEM;
-
-                        SCpnt->SCp.ptr = (void *)(unsigned long)dma_addr;
-                        sg_flags |= 0xC0000000;
-                        writel(sg_flags | SCpnt->request_bufflen, mptr++);
-                        writel(dma_addr, mptr++);
+        if (sgl_offset != SGL_OFFSET_0) {
+                /* write size of data addressed by SGL */
+                writel(SCpnt->request_bufflen, mptr++);
+
+                /* Now fill in the SGList and command */
+                if (SCpnt->use_sg) {
+                        if (!i2o_dma_map_sg(c, SCpnt->request_buffer,
+                                            SCpnt->use_sg,
+                                            SCpnt->sc_data_direction, &mptr))
+                                goto nomem;
+                } else {
+                        SCpnt->SCp.dma_handle =
+                            i2o_dma_map_single(c, SCpnt->request_buffer,
+                                               SCpnt->request_bufflen,
+                                               SCpnt->sc_data_direction, &mptr);
+                        if (dma_mapping_error(SCpnt->SCp.dma_handle))
+                                goto nomem;
                 }
         }
 
         /* Stick the headers on */
-        writel((mptr - &msg->u.head[0]) << 16 | SGL_OFFSET_10, &msg->u.head[0]);
+        writel(I2O_MESSAGE_SIZE(mptr - &msg->u.head[0]) | sgl_offset,
+               &msg->u.head[0]);
 
         /* Queue the message */
         i2o_msg_post(c, m);
@@ -711,6 +757,13 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
         osm_debug("Issued %ld\n", SCpnt->serial_number);
 
         return 0;
+
+      nomem:
+        rc = -ENOMEM;
+        i2o_msg_nop(c, m);
+
+      exit:
+        return rc;
 };
 
 /**
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index a499af096a68..964fe481849e 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -362,11 +362,33 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
                 c->promise = 1;
         }
 
+        if (pdev->subsystem_vendor == PCI_VENDOR_ID_DPT)
+                c->adaptec = 1;
+
         /* Cards that go bananas if you quiesce them before you reset them. */
         if (pdev->vendor == PCI_VENDOR_ID_DPT) {
                 c->no_quiesce = 1;
                 if (pdev->device == 0xa511)
                         c->raptor = 1;
+
+                if (pdev->subsystem_device == 0xc05a) {
+                        c->limit_sectors = 1;
+                        printk(KERN_INFO
+                               "%s: limit sectors per request to %d\n", c->name,
+                               I2O_MAX_SECTORS_LIMITED);
+                }
+#ifdef CONFIG_I2O_EXT_ADAPTEC_DMA64
+                if (sizeof(dma_addr_t) > 4) {
+                        if (pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                                printk(KERN_INFO "%s: 64-bit DMA unavailable\n",
+                                       c->name);
+                        else {
+                                c->pae_support = 1;
+                                printk(KERN_INFO "%s: using 64-bit DMA\n",
+                                       c->name);
+                        }
+                }
+#endif
         }
 
         if ((rc = i2o_pci_alloc(c))) {
diff --git a/include/linux/i2o-dev.h b/include/linux/i2o-dev.h
index 90c984ecd521..d4a08d29e36d 100644
--- a/include/linux/i2o-dev.h
+++ b/include/linux/i2o-dev.h
@@ -33,6 +33,13 @@ typedef unsigned int u32;
 #endif                          /* __KERNEL__ */
 
 /*
+ *      Software module types
+ */
+#define I2O_SOFTWARE_MODULE_IRTOS               0x11
+#define I2O_SOFTWARE_MODULE_IOP_PRIVATE         0x22
+#define I2O_SOFTWARE_MODULE_IOP_CONFIG          0x23
+
+/*
  *      Vendors
  */
 #define I2O_VENDOR_DPT                          0x001b
@@ -125,6 +132,10 @@ struct i2o_evt_get {
         int lost;
 };
 
+typedef struct i2o_sg_io_hdr {
+        unsigned int flags;     /* see I2O_DPT_SG_IO_FLAGS */
+} i2o_sg_io_hdr_t;
+
 /**************************************************************************
  * HRT related constants and structures
  **************************************************************************/
@@ -403,4 +414,15 @@ typedef struct _i2o_status_block {
 #define ADAPTER_STATE_FAILED                    0x10
 #define ADAPTER_STATE_FAULTED                   0x11
 
+
+/*
+ * DPT / Adaptec specific values for i2o_sg_io_hdr flags.
+ */
+#define I2O_DPT_SG_FLAG_INTERPRET               0x00010000
+#define I2O_DPT_SG_FLAG_PHYSICAL                0x00020000
+
+#define I2O_DPT_FLASH_FRAG_SIZE                 0x10000
+#define I2O_DPT_FLASH_READ                      0x0101
+#define I2O_DPT_FLASH_WRITE                     0x0102
+
 #endif                          /* _I2O_DEV_H */
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index 497ea574f96b..2039a87c2b91 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -147,10 +147,13 @@ struct i2o_controller {
 
         struct pci_dev *pdev;   /* PCI device */
 
-        unsigned int short_req:1;       /* use small block sizes */
-        unsigned int no_quiesce:1;      /* dont quiesce before reset */
-        unsigned int raptor:1;          /* split bar */
         unsigned int promise:1;         /* Promise controller */
+        unsigned int adaptec:1;         /* DPT / Adaptec controller */
+        unsigned int raptor:1;  /* split bar */
+        unsigned int no_quiesce:1;      /* dont quiesce before reset */
+        unsigned int short_req:1;       /* use small block sizes */
+        unsigned int limit_sectors:1;   /* limit number of sectors / request */
+        unsigned int pae_support:1;     /* controller has 64-bit SGL support */
 
         struct list_head devices;       /* list of I2O devices */
         struct list_head list;  /* Controller list */
@@ -746,7 +749,21 @@ static inline struct i2o_message __iomem *i2o_msg_in_to_virt(struct i2o_controll
 static inline int i2o_dma_alloc(struct device *dev, struct i2o_dma *addr,
                                 size_t len, unsigned int gfp_mask)
 {
+        struct pci_dev *pdev = to_pci_dev(dev);
+        int dma_64 = 0;
+
+        if ((sizeof(dma_addr_t) > 4) && (pdev->dma_mask == DMA_64BIT_MASK)) {
+                        dma_64 = 1;
+                        if(pci_set_dma_mask(pdev, DMA_32BIT_MASK))
+                                return -ENOMEM;
+        }
+
         addr->virt = dma_alloc_coherent(dev, len, &addr->phys, gfp_mask);
+
+        if ((sizeof(dma_addr_t) > 4) && dma_64)
+                if(pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+                        printk(KERN_WARNING "i2o: unable to set 64-bit DMA");
+
         if (!addr->virt)
                 return -ENOMEM;
 
@@ -946,7 +963,7 @@ extern void i2o_debug_state(struct i2o_controller *c);
 #define I2O_CMD_BLOCK_MEJECT            0x43
 #define I2O_CMD_BLOCK_POWER             0x70
 
-#define I2O_PRIVATE_MSG                 0xFF
+#define I2O_CMD_PRIVATE                 0xFF
 
 /* Command status values  */
 
@@ -1095,9 +1112,9 @@ extern void i2o_debug_state(struct i2o_controller *c);
 #define SGL_OFFSET_8    (0x0080 | I2OVERSION)
 #define SGL_OFFSET_9    (0x0090 | I2OVERSION)
 #define SGL_OFFSET_10   (0x00A0 | I2OVERSION)
-
-#define TRL_OFFSET_5    (0x0050 | I2OVERSION)
-#define TRL_OFFSET_6    (0x0060 | I2OVERSION)
+#define SGL_OFFSET_11   (0x00B0 | I2OVERSION)
+#define SGL_OFFSET_12   (0x00C0 | I2OVERSION)
+#define SGL_OFFSET(x)   (((x)<<4) | I2OVERSION)
 
 /* Transaction Reply Lists (TRL) Control Word structure */
 #define TRL_SINGLE_FIXED_LENGTH         0x00
@@ -1130,7 +1147,6 @@ extern void i2o_debug_state(struct i2o_controller *c);
 #define HOST_TID                1
 
 #define MSG_FRAME_SIZE          128     /* i2o_scsi assumes >= 32 */
-#define REPLY_FRAME_SIZE        17
 #define SG_TABLESIZE            30
 #define NMBR_MSG_FRAMES         128
 
@@ -1155,11 +1171,10 @@ extern void i2o_debug_state(struct i2o_controller *c);
 #define I2O_HRT_GET_TRIES               3
 #define I2O_LCT_GET_TRIES               3
 
-/* request queue sizes */
+/* defines for max_sectors and max_phys_segments */
 #define I2O_MAX_SECTORS                 1024
+#define I2O_MAX_SECTORS_LIMITED         256
 #define I2O_MAX_PHYS_SEGMENTS           MAX_PHYS_SEGMENTS
 
-#define I2O_REQ_MEMPOOL_SIZE            32
-
 #endif                          /* __KERNEL__ */
 #endif                          /* _I2O_H */
diff --git a/include/scsi/sg_request.h b/include/scsi/sg_request.h
new file mode 100644
index 000000000000..57ff525bdd3b
--- /dev/null
+++ b/include/scsi/sg_request.h
@@ -0,0 +1,26 @@
+typedef struct scsi_request Scsi_Request;
+
+static Scsi_Request *dummy_cmdp;        /* only used for sizeof */
+
+typedef struct sg_scatter_hold { /* holding area for scsi scatter gather info */
+        unsigned short k_use_sg; /* Count of kernel scatter-gather pieces */
+        unsigned short sglist_len; /* size of malloc'd scatter-gather list ++ */
+        unsigned bufflen;       /* Size of (aggregate) data buffer */
+        unsigned b_malloc_len;  /* actual len malloc'ed in buffer */
+        void *buffer;           /* Data buffer or scatter list (k_use_sg>0) */
+        char dio_in_use;        /* 0->indirect IO (or mmap), 1->dio */
+        unsigned char cmd_opcode; /* first byte of command */
+} Sg_scatter_hold;
+
+typedef struct sg_request {     /* SG_MAX_QUEUE requests outstanding per file */
+        Scsi_Request *my_cmdp;  /* != 0  when request with lower levels */
+        struct sg_request *nextrp;      /* NULL -> tail request (slist) */
+        struct sg_fd *parentfp; /* NULL -> not in use */
+        Sg_scatter_hold data;   /* hold buffer, perhaps scatter list */
+        sg_io_hdr_t header;     /* scsi command+info, see <scsi/sg.h> */
+        unsigned char sense_b[sizeof (dummy_cmdp->sr_sense_buffer)];
+        char res_used;          /* 1 -> using reserve buffer, 0 -> not ... */
+        char orphan;            /* 1 -> drop on sight, 0 -> normal */
+        char sg_io_owned;       /* 1 -> packet belongs to SG_IO */
+        volatile char done;     /* 0->before bh, 1->before read, 2->read */
+} Sg_request;